Commit Graph

10242 Commits

Author SHA1 Message Date
Dale Wijnand 113656aed1
Remove compile warnings 2018-01-16 11:17:01 +00:00
Dale Wijnand 0885233281
Deprecates Extracted#append for appendWithSession.
.. and appendWithoutSession.
2018-01-15 14:48:58 +00:00
Eugene Yokota e58b303297 1.1.1-SNAPSHOT 2018-01-13 03:27:11 -05:00
Dale Wijnand d1071002be
Merge pull request #3790 from eatkins/cache-watch-service
Cache WatchService in continuous builds
2018-01-12 15:17:51 +00:00
Dale Wijnand c806a556ef
Merge pull request #3872 from dwijnand/whitesource
Add, configure & enforce sbt-whitesource
2018-01-11 17:00:48 +00:00
Dale Wijnand cdba3e6bea
Add, configure & enforce sbt-whitesource 2018-01-11 14:13:21 +00:00
Dale Wijnand 2022713ff5
Merge pull request #144 from dwijnand/whitesource
Add, configure & enforce sbt-whitesource
2018-01-11 14:12:43 +00:00
Dale Wijnand a21d7dec94
Add, configure & enforce sbt-whitesource 2018-01-11 13:57:15 +00:00
Dale Wijnand 6477d6146f
Merge pull request #3866 from dwijnand/mima
update mimaPreviousArtifacts. add sbt 1.1.0
2018-01-10 18:34:02 +00:00
Dale Wijnand 9c94c4ce1a
Merge pull request #3867 from dwijnand/11
Upgrade to sbt 1.1.0
2018-01-10 17:51:29 +00:00
Dale Wijnand 28164ca7e6
Merge pull request #143 from dwijnand/11
Upgrade to sbt 1.1.0
2018-01-10 17:02:38 +00:00
Dale Wijnand cb2042c283
Upgrade to sbt 1.1.0 2018-01-10 16:08:13 +00:00
Dale Wijnand 8e8e0747a8
Upgrade to sbt 1.1.0 2018-01-10 16:04:57 +00:00
Dale Wijnand 03b3d4fa72
Merge pull request #142 from dwijnand/mima
Add version 1.1.2 to mimaPreviousArtifacts
2018-01-10 15:58:43 +00:00
xuwei-k 57caee6152
update mimaPreviousArtifacts. add sbt 1.1.0 2018-01-10 15:46:14 +00:00
Dale Wijnand 8e717bda30
Add version 1.1.2 to mimaPreviousArtifacts 2018-01-10 15:42:04 +00:00
Dale Wijnand a52c3bbd9c
Merge pull request #3864 from xuwei-k/mimaPreviousArtifacts
update mimaPreviousArtifacts. add sbt 1.1.0
2018-01-10 14:27:12 +00:00
Dale Wijnand df74f78300
Merge pull request #141 from sbt/1.1.x
Merge 1.1.x into 1.x
2018-01-10 14:14:57 +00:00
xuwei-k afd214d4b0 update mimaPreviousArtifacts. add sbt 1.1.0 2018-01-10 12:48:07 +09:00
Dale Wijnand 907fc2615b
Merge pull request #3839 from xuwei-k/delete-build-info
delete "buildinfo.BuildInfo" from sbt main
2018-01-09 14:30:07 +00:00
Dale Wijnand a0b27d29b7
Merge pull request #3854 from sbt/1.1.x
1.1.x
2018-01-08 11:16:26 +00:00
xuwei-k 7ff88a3e51 delete buildinfo.BuildInfo from sbt main
sbt-buildinfo plugin have `buildInfoScopedSettings(Compile)` in default.
I think it is unnecessary. or we should set "buildinfoPackage in Compile" and "buildinfoObject in Compile"

https://github.com/sbt/sbt-buildinfo/blob/v0.7.0/src/main/scala/sbtbuildinfo/BuildInfoPlugin.scala#L11
2018-01-08 14:50:42 +09:00
eugene yokota 852d4ea37c
Merge pull request #3852 from eed3si9n/wip/notes
Zinc 1.1.0
2018-01-06 01:45:02 -05:00
Eugene Yokota 5a695b9761 launchconfig 2018-01-05 22:47:58 -05:00
Eugene Yokota 47d66eef0f Zinc 1.1.0 2018-01-05 14:07:04 -05:00
Eugene Yokota bd5cbc4fb3 notes 2018-01-05 14:06:46 -05:00
Dale Wijnand f2f44c738c
Merge pull request #3836 from dwijnand/projectToLocalProject
Introduce projectToLocalProject to replace projectToRef
2018-01-03 16:36:34 +00:00
eugene yokota 8ac280e094
Merge pull request #3835 from cunei/wip-disable-fork-parallel
Keep "tests/fork-parallel" disabled, but add an explanation
2018-01-02 15:09:36 -05:00
Dale Wijnand 365f5b6e78
Merge pull request #140 from xuwei-k/java9
add Java 9 test
2018-01-02 16:44:39 +00:00
Dale Wijnand 4752084f91
Introduce projectToLocalProject to replace projectToRef
Fixes #3757
2018-01-02 16:07:29 +00:00
Johannes Rudolph 5e3bbdb8c2
README: sbt 0.13 is only supported starting from 0.13.10
Fixes #148.
2018-01-02 13:55:48 +01:00
xuwei-k 966f3ebaad add Java 9 test 2017-12-23 20:07:14 +09:00
cunei c3c487c8ab
Merge branch '1.1.x' into wip-disable-fork-parallel 2017-12-23 06:08:55 +01:00
Antonio Cunei eb0bf30712 Adjustments to test file. Scripted can't cope with empty comments
Apparently an empty comment line, meaning a single '#' on a line,
cannot be fed to scripted, which will complain with an odd error
message.

This commit tweaks the comments in the tests/fork-parallel file
so that there are no empty comment lines.
2017-12-23 05:00:38 +01:00
eugene yokota a28381e93a
Merge pull request #3837 from eed3si9n/wip/windows2
Add Library interface
2017-12-22 16:56:03 -05:00
Eugene Yokota 0aebb92ef5 don't block the build when server can't get up 2017-12-22 16:14:05 -05:00
Eugene Yokota 0a3900f53d Add Library interface
Fixes #3821

Initially I missed why #3821 was failing.

Looking at it again, the error message reads:

```
Caused by: java.lang.IllegalArgumentException: Interface (NGWin32NamedPipeLibrary) of library=kernel32 does not extend Library
        at com.sun.jna.Native.loadLibrary(Native.java:566)
        at sbt.internal.NGWin32NamedPipeLibrary.<clinit>(NGWin32NamedPipeLibrary.java:38)
        ... 7 more
```

Inside `Native.loadLibrary`, it requires the "library" interface to extend `com.sun.jna.Library`, which this adds.
2017-12-22 16:10:46 -05:00
eugene yokota 22b7518d5d
Merge pull request #3822 from cunei/wip-milliBis
Use IO.getModifiedTimeOrZero(file) calls
2017-12-22 13:03:55 -05:00
Eugene Yokota 7f0ff7c90a IO 1.1.3, Zinc 1.1.0-RC4 2017-12-22 11:45:31 -05:00
eugene yokota d242fac409
Merge pull request #136 from cunei/wip-milliBis
Revert *ModifiedTime() calls to *lastModified*() calls
2017-12-22 08:03:55 -05:00
Eugene Yokota de54721fc3 IO 1.1.3 2017-12-21 22:43:53 -05:00
Eugene Yokota 2765e07add sbt 1.0.4 2017-12-21 22:43:38 -05:00
eugene yokota 0ed5cb6573
Merge pull request #139 from dwijnand/fix-EscHelpers.removeEscapeSequences
Make EscHelpers.removeEscapeSequences handle partial escape sequences
2017-12-21 22:38:51 -05:00
Antonio Cunei 94e36a14c8 Change modifiedTime definitions 2017-12-22 01:55:37 +01:00
Antonio Cunei ebff7919e9 Revert *ModifiedTime() calls to *lastModified*() calls
There are just too many instances in which sbt's code relies on
the `lastModified`/`setLastModified` semantics, so instead of moving
to `get`/`setModifiedTime`, we use new IO calls that offer the new
timestamp precision, but retain the old semantics.
2017-12-22 01:55:37 +01:00
Antonio Cunei 0a1bd5a3b2 Change modifiedTime definitions 2017-12-22 00:13:27 +01:00
Antonio Cunei 8ba68eedfd Revert *ModifiedTime() calls to *lastModified*() calls
There are just too many instances in which sbt's code relies on
the `lastModified`/`setLastModified` semantics, so instead of moving
to `get`/`setModifiedTime`, we use new IO calls that offer the new
timestamp precision, but retain the old semantics.
2017-12-22 00:13:27 +01:00
Dale Wijnand 5ed25cbc56
Make EscHelpers.removeEscapeSequences handle partial escape sequences
Fixes #67
2017-12-21 17:09:30 +00:00
Dale Wijnand fd8b422488
Merge pull request #3760 from mpollmeier/mpollmeier/resolver-not-needed-if-not-publishing
don't require publishTo specified if publishArtifact is `false`
2017-12-21 15:40:17 +00:00
Antonio Cunei 8c7f93d7a5 Keep tests/fork-parallel disabled, but add an explanation
See https://github.com/sbt/sbt/issues/3545#issuecomment-353247827
2017-12-21 15:25:24 +01:00