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

5880 Commits

Author SHA1 Message Date
Dale Wijnand f2f44c738c
Merge pull request #3836 from dwijnand/projectToLocalProject 
Introduce projectToLocalProject to replace projectToRef
 2018-01-03 16:36:34 +00:00
Dale Wijnand 4752084f91
Introduce projectToLocalProject to replace projectToRef 
Fixes #3757
 2018-01-02 16:07:29 +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
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
Dale Wijnand 6e09c660fe
Replace Throwable catching with DeserializationException catching 2017-12-20 11:50:02 +00:00
eugene yokota 34d311f9ce
Merge pull request #3807 from dwijnand/remove-warnings 
Remove warnings
 2017-12-19 13:18:59 -05: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
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 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
Dale Wijnand ae99922101 Use IO.getModified over importing the method 2017-12-16 12:22:42 -05:00
Antonio Cunei 46d6b01f79 Use copyLastModified() in Sync.scala 
It turns out the code in Sync.scala activiely tries to transfer
the invalid modifed time of non-existent files in the source
directory over the time of the target file, which may or may
not exist. In case it exists, the modification time is set
to January 1, 1970. This is arguably a bug in Sync, which
should be adjusted to better handle mappings with source
files that do not exist. For now, however, we preserve the
current behavior, using the deprecated copyLastModified().
 2017-12-16 12:22:42 -05:00
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 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