luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
11,353 Commits 29 Branches 314 Tags 76 MiB
Commit Graph

11353 Commits

Author SHA1 Message Date
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
Dale Wijnand bef5c9c996
Merge pull request #3833 from eed3si9n/wip/jna 
try to set jna.nosys to true programmatically
 2017-12-21 08:24:17 +00:00
Eugene Yokota 13e1862c2f set jna.nosys to true programmatically 
Previously I was seeing the error upon the first scripted test. I thought it was because Main was somehow not early enough. It might just be because scripted technically runs as part of the build.

Ref sbt/io#110
 2017-12-21 00:08:56 -05:00
Eugene Yokota d8609ced7f formatting 2017-12-20 22:36:07 -05:00
eugene yokota eace6c0aed
Merge pull request #3828 from eed3si9n/wip/double_server 
warn about multiple instances once
 2017-12-20 15:38:40 -05:00
eugene yokota 16244f9be6
Merge pull request #3830 from dwijnand/catch-DeserializationException 
Replace Throwable catching with DeserializationException catching
 2017-12-20 10:22:21 -05:00
Eugene Yokota 06ffb4f440 warn about multiple instance once 
Fixes #3823

When you launch a second instance of sbt on a build, prior to this change it was displaying `java.io.IOException: sbt server is already running` on every command. This make it a bit less aggressive, and just display a warning once.

```
[warn] Is another instance of sbt is running on this build?
[warn] Running multiple instances is unsupported
```
 2017-12-20 10:09:03 -05:00
Dale Wijnand 6e09c660fe
Replace Throwable catching with DeserializationException catching 2017-12-20 11:50:02 +00:00
Eugene Yokota 4c3b770b27 bump to sbt 1.0.4 2017-12-19 20:57:09 -05:00
eugene yokota 96c88a4291
Merge pull request #138 from dwijnand/houserules 
Upgrade to sbt-houserules 0.3.5
 2017-12-19 14:35:58 -05:00
eugene yokota 34d311f9ce
Merge pull request #3807 from dwijnand/remove-warnings 
Remove warnings
 2017-12-19 13:18:59 -05:00
Dale Wijnand 257712c052
Merge pull request #3824 from eed3si9n/wip/windows 
Add Windows testing
 2017-12-19 17:01:13 +00:00
Dale Wijnand eed3d21c86
Merge pull request #3825 from dwijnand/houserules 
Upgrade to sbt-houserules 0.3.5
 2017-12-19 16:51:21 +00:00
Dale Wijnand 4420a9bdd4
Merge pull request #3826 from dwijnand/disable-project/unique-settings-computation 
Disable project/unique-settings-computation
 2017-12-19 16:50:57 +00:00
Dale Wijnand 29c15e4e2e
Disable project/unique-settings-computation 
I've seen this fail Travis CI too many times.

Here's two examples:
* https://travis-ci.org/sbt/sbt/jobs/318632919
* https://travis-ci.org/sbt/sbt/jobs/313847550
 2017-12-19 15:19:12 +00:00
Dale Wijnand ad2d71cae4
Upgrade to sbt-houserules 0.3.5 2017-12-19 13:25:58 +00:00
Dale Wijnand 28bcc6c602
Upgrade to sbt-houserules 0.3.5 2017-12-19 13:22:48 +00:00
Eugene Yokota bc4d3d5031 just scripted actions/* 2017-12-19 03:24:51 -05:00
Eugene Yokota 3507403a36 -Djna.nosys=true 2017-12-19 02:46:46 -05:00
Dale Wijnand cb6bae6c45
Merge pull request #202 from sbt/wip/windows2 
Remove double quotes around rtexport
 2017-12-19 07:20:45 +00:00
Eugene Yokota 294110e2b8 Remove JNA from sbt/sbt 
There's a conflict in JNA version difference between sbt and IO.

Fixes #3821
 2017-12-19 00:44:31 -05:00
Eugene Yokota c920919c2c Fix build so it works on Windows 2017-12-19 00:17:46 -05:00
Eugene Yokota ec5bdc2381 Add Windows testing 2017-12-18 23:24:20 -05:00
Eugene Yokota 0e59118ded Remove double quotes around rtexport 
See https://github.com/sbt/sbt/issues/3804#issuecomment-352602666
 2017-12-18 22:27:19 -05:00
eugene yokota bff933aceb
Merge pull request #3815 from dwijnand/drop-0.14-references 
Drop 0.14.0 references
 2017-12-18 20:55:34 -05:00
eugene yokota de4af16434
Merge pull request #3818 from sbt/1.1.x 
Merge 1.1.x to 1.x
 2017-12-18 20:55:11 -05:00
eugene yokota b21d0e11fb
Merge pull request #3813 from dwijnand/add-project-id-to-watching-message 
Add project id to watching message
 2017-12-18 20:06:14 -05:00
eugene yokota 6b102af836
Merge pull request #137 from dwijnand/mima 
Add 1.1.1 to mimaPreviousArtifacts, & backfill
 2017-12-18 19:57:10 -05:00
Dale Wijnand 2ee0a1e19a
Add 1.1.1 to mimaPreviousArtifacts, & backfill 2017-12-18 16:01:01 +00:00
eugene yokota db2c54d11d
Merge pull request #3817 from eed3si9n/wip/notes 
notes
 2017-12-16 19:17:07 -05:00
Eugene Yokota 87bb0f48a6 notes 2017-12-16 19:16:22 -05:00
eugene yokota e40ab026c0
Merge pull request #3816 from eed3si9n/wip/bump 
Convert lastModified() calls to the more precise getModifiedTime() + modules bump
 2017-12-16 13:19:02 -05:00
Eugene Yokota 40b86ae412 bump modules and plugins 2017-12-16 12:22:42 -05:00