Commit Graph

11744 Commits

Author SHA1 Message Date
eugene yokota 3d9eab1bf8
IO 1.1.2 2017-12-15 12:51:29 -05:00
Antonio Cunei d2338ff287 Removed a couple more direct imports of getModifiedTime() 2017-12-15 17:23:39 +01:00
cunei d17245344d
Merge pull request #1 from dwijnand/wip-milli
Use IO.getModified over importing the method
2017-12-15 17:20:38 +01:00
Dale Wijnand fa2c48ed84
Drop 0.14.0 references
Fixes #3411
2017-12-15 15:44:21 +00:00
eugene yokota 487d94d856
Merge pull request #3814 from dwijnand/avoid-log4j2-error-warning
Make CaffeineCache a lazy val
2017-12-15 08:16:11 -05:00
Michael Pollmeier 4668faff7c
don't require publishTo specified if publishArtifact is `false`
Even with `publishArtifact := false` the user is still forced to define a (dummy) resolver that's never used, e.g. `publishTo := { Some("publishMeNot" at "https://publish/me/not") }`

Otherwise the following error is thrown:
```
publish
[error] java.lang.RuntimeException: Repository for publishing is not specified.
[error]         at scala.sys.package$.error(package.scala:27)
[error]         at sbt.Classpaths$.$anonfun$getPublishTo$1(Defaults.scala:2436)
[error]         at scala.Option.getOrElse(Option.scala:121)
[error]         at sbt.Classpaths$.getPublishTo(Defaults.scala:2436)
[error]         at sbt.Classpaths$.$anonfun$ivyBaseSettings$48(Defaults.scala:1917)
```
2017-12-15 10:53:29 +00:00
Dale Wijnand 8bd522511d
Make CaffeineCache a lazy val
This is to avoid it initialising Log4J2 (via SLF4J), which we initialise
ourselves programmatically in LogExchange. Also there's no need to
removeAll in initialState.

Fixes #3787
2017-12-15 08:55:55 +00:00
Dale Wijnand 5f0852818b
Add project id to watching message
We redefine watchingMessage in project scope so we can use
thisProjectRef to make the watching message more precise.

Fixes #2038
2017-12-15 01:49:14 +00:00
Dale Wijnand 43a9bd25f0
Remove all warnings from scriptedPluginProj 2017-12-14 15:41:00 +00:00
Dale Wijnand b8bb8fe185
Remove all warnings from sbtProj 2017-12-14 15:41:00 +00:00
Dale Wijnand 657ff56011
Remove all warnings from scriptedSbtProj 2017-12-14 15:41:00 +00:00
Dale Wijnand a90832b593
Remove all warnings from mainProj 2017-12-14 15:40:03 +00:00
Dale Wijnand f50260218d
Remove all warnings from actionsProj 2017-12-14 13:19:23 +00:00
Dale Wijnand 072366d48e
Remove all warnings from testingProj 2017-12-14 13:19:23 +00:00
Dale Wijnand 2390fdfac6
Remove all warnings from mainSettingsProj 2017-12-14 13:16:23 +00:00
eugene yokota aeb09fcbf4
Merge pull request #3810 from dwijnand/no-contraband-diff
Exclude contraband generated files from diff by default
2017-12-14 08:09:20 -05:00
Dale Wijnand 843210598b
Exclude contraband generated files from diff by default
In both local git diff and GitHub diff you can still see the diff if you
want. This is just to remove the noise by default.
2017-12-14 12:25:49 +00:00
Dale Wijnand 8ef10aecf5
Merge pull request #201 from sbt/wip/windows
Fix "Error: Unable to access jarfile" on Windows + JDK 9
2017-12-14 12:05:34 +00:00
Antonio Cunei ab2dfc7ec5 Restore test run/error
This reverts commit 4ac231dd49.
2017-12-14 12:17:41 +01:00
Eugene Yokota f9b9d082f6 use delayed expansion
Fixes sbt/sbt#3804

Inside the if, it seems like bunch of variables were set to blank.
Using delayed expansion seems to fix this. This is confirmed by the newly added test.
2017-12-14 02:30:02 -05:00
Eugene Yokota 49d85750af add test 2017-12-14 02:03:47 -05:00
Eugene Yokota 73bd7a5284 Add AppVeyor settings 2017-12-13 23:40:10 -05:00
eugene yokota 4188199965
Merge pull request #200 from sbt/bat-no-quotes
Drop quotes in bat script
2017-12-13 18:56:52 -05:00
Dale Wijnand 6dbf7eb527
Drop quotes in bat script 2017-12-13 23:22:39 +00:00
Dale Wijnand 4248f5a0af
Merge pull request #3809 from dwijnand/update-mimaPreviousArtifacts-1.1.x
update mimaPreviousArtifacts (in the 1.1.x branch)
2017-12-13 22:06:46 +00:00
Dale Wijnand fca9c85546 Merge branch '1.0.x' into merge-1.0.x-into-1.1.x
* 1.0.x:
  Make PositionImpl thread-safe
  Support scala 2.13.0-pre-* & 2.13.0-M1
2017-12-13 16:06:14 +00:00
Dale Wijnand 13a8d53369
Use IO.getModified over importing the method
.. and make getModifiedTimeOrZero private.
2017-12-13 15:47:15 +00:00
Dale Wijnand 2e5aabb222
Merge pull request #3805 from eed3si9n/wip/file_uri
Encode POSIX file path to URI using u3 (file:///)
2017-12-12 17:32:42 +00:00
Eugene Yokota 06b85919ba
Encode POSIX file path to URI using u3 (file:///)
Ref https://github.com/sbt/io/pull/96

Under RFC 8089, both u1 and u3 are legal, but many of the other platforms expect traditional u3.
This will increase the compatibility/usability of sbt server, for example to integrate with Vim.
2017-12-12 16:27:14 +00:00
Dale Wijnand 7a8c89effc
Update version to 1.1.0-SNAPSHOT
.. & fix project/cross-plugins-defaults.
2017-12-12 16:27:11 +00:00
Dale Wijnand 5d99bea89f
Remove all warnings from coreMacrosProj 2017-12-12 13:02:20 +00:00
Dale Wijnand d99147d18c
Remove all warnings from commandProj 2017-12-12 13:02:20 +00:00
Dale Wijnand b4c5d9de31
Remove all warnings from protocolProj 2017-12-12 13:02:20 +00:00
Dale Wijnand 87dfb2c0f5
Remove all warnings from stdTaskProj 2017-12-12 13:02:19 +00:00
Dale Wijnand f274aaa811
Remove all warnings from taskProj 2017-12-12 13:02:19 +00:00
Dale Wijnand 4a5ff4fc0d
Remove all warnings from completeProj 2017-12-12 13:02:19 +00:00
Dale Wijnand 34136fb70b
Remove all warnings from logicProj 2017-12-12 13:02:19 +00:00
Dale Wijnand b80a6b217b
Remove all warnings from collectionProj 2017-12-12 13:02:18 +00:00
Dale Wijnand 1f1806a4f1
Re-enable unused warnings 2017-12-12 13:02:18 +00:00
Dale Wijnand bbddb26224
2.12.4 2017-12-12 13:02:18 +00:00
PanAeon 184390fed2
Merge branch '1.x' into help-sbt-new 2017-12-11 16:57:40 +00:00
eugene yokota 609329b19e
Merge pull request #3802 from cunei/wip-templateStats-2
Revert "Alt scala parser sync workaround"
2017-12-09 00:45:26 -05:00
Antonio Cunei cd4346c5d7 Allow FileInfo for non-existent files with the new timestamps
FileInfo is used to wrap information like last modified time on
files that may or may not exist. Arguably, that does not make
much sense: the non-existent files should not lead to modification
file information, hashes, and a persistent serialized version of
the resulting meaningless information. However, considering that
the FileInfo information is serialized and saved, it is necessary
to preserve compatibility at this stage. Therefore the modification
time is explicitly set to zero for those files that do not exist
when each FileInfo is built.
2017-12-08 23:50:40 +01:00
Antonio Cunei 5c72c3b487 Revert "Alt scala parser sync workaround"
Although in theory the fix in #3776 should be preferable to
synchronize templateStats() manually, it turns out that we
still get errors in some tests. So, reverting to a
synchronized section while we investigate.

This reverts commit ee90917cc4.
2017-12-08 19:21:14 +01:00
Antonio Cunei d03dfb3981 Moved Milli._ to IO. 2017-12-06 20:29:41 +01:00
Antonio Cunei ccf149e8bf Convert lastModified() calls to sbt.io.Milli.getModifiedTime() 2017-12-06 20:29:41 +01:00
eugene yokota 3d45f82e75
Merge pull request #3794 from xuwei-k/mimaPreviousArtifacts
update mimaPreviousArtifacts
2017-12-06 05:34:33 -05:00
eugene yokota 30fd81edf6
Merge pull request #3795 from eed3si9n/wip/checksocket
Only the first session starts the server
2017-12-05 17:59:06 -05:00
Eugene Yokota 322f9b31cd Only the first session starts the server
Currently the server will try to start even if there are existing sbt sessions. This causes the second session to take over the server for Unix domain socket.

This adds a check before the server comes up and make sure that the socket is not taken.
2017-12-05 09:14:18 -05:00
Eugene Yokota 2b2c1f0568 prevent "shutdown" when server didn't come up 2017-12-05 08:04:59 -05:00