Commit Graph

7202 Commits

Author SHA1 Message Date
Antonio Cunei 295bcff851 Hash calculation may throw exception w/ getModifiedTime(); fix
In Eval there is a calculation of hashes by scanning the elements
of classpath, and getting the last modification time of each
directory. When lastModified() was in use, non-existent elements
would return 0L, but getModifiedTime() will throw an exception
instead (like getLastModifiedTime(), incidentally).
So, we catch the FileNotFoundException and return 0L now as well.
2017-12-16 12:22:42 -05:00
Antonio Cunei 2129f8ceb5 Use IO.copyModifiedTime() in place of IO.copyLastModified() 2017-12-16 12:22:42 -05:00
Antonio Cunei 8c7b781d3f Moved Milli._ to IO. 2017-12-16 12:22:42 -05:00
Antonio Cunei 699b53262a Convert lastModified() to sbt.io.Milli.getModifiedTime(), more precise 2017-12-16 12:22:42 -05: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
Antonio Cunei ab2dfc7ec5 Restore test run/error
This reverts commit 4ac231dd49.
2017-12-14 12:17:41 +01: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 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 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
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
kenji yoshida 8323609053 update mimaPreviousArtifacts 2017-12-05 16:43:40 +09:00
eugene yokota 4c435a5adb
Merge pull request #3791 from eed3si9n/wip/serverLog
Fixes server log hardcoded to debug level
2017-12-04 13:33:27 -05:00
Ethan Atkins ca7171ed17 Cache watch service
I noticed that my custom WatchService was never cleaned up by sbt and
realized that after every build we were making a new WatchService. At
the same time, we were reusing the WatchState from the previous run,
which was using the original WatchService. This was particularly
problematic because it prevented us from registering any paths with the
new watch service. This may have prevented some of the file updates
from being seen by the watch service. Moreover, because we lost the
reference to the original WatchService, there was no way to clean it up,
which was a resource leak.

May be related to #3775, #3695
2017-12-02 18:23:19 -08:00
Eugene Yokota 93b3391167 Fixes server log hardcoded to debug level
Fixes #3786

To configure the log level of the server, this introduces a new task key named `serverLog`. The idea is to set this using `Global / serverLog / logLevel`. It will also check the global log level, and if all else fails, fallback to Warn.

```
    lazy val level: Level.Value = (s get serverLogLevel) orElse (s get logLevel) match {
      case Some(x) => x
      case None    => Level.Warn
    }
```
2017-12-02 15:20:54 -05:00
eugene yokota 8db6cd7a9e
Merge pull request #3785 from eed3si9n/wip/vscode-bump
Bump vscode-sbt-scala version to 0.1.0
2017-11-30 12:37:47 -05:00
Eugene Yokota 62ecd417da Bump vscode-sbt-scala version to 0.1.0 2017-11-30 12:35:40 -05:00
eugene yokota 74ddddc8e5
Merge pull request #3782 from eed3si9n/wip/bump
Merge 1.0.x + bump modules
2017-11-30 10:23:14 -05:00
Eugene Yokota 6ed3c0f534 more notes 2017-11-30 00:01:33 -05:00
Eugene Yokota 8031bb0f83 notes 2017-11-29 23:45:28 -05:00