luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,940 Commits 22 Branches 334 Tags 97 MiB
Commit Graph

17940 Commits

Author SHA1 Message Date
Dale Wijnand 74d8a3835d Merge pull request #122 from dwijnand/detangle 
Detangle the dependencies
 2017-07-06 14:59:12 +01:00
Eugene Yokota e3891c8732
Bumping up the threshold for offline mode test 
Travis CI keeps failing on OfflineModeSpec, so I am going to bump up the threshold.
 2017-07-06 14:49:04 +01:00
Martin Duhem 763effd337 Adapt Zinc to use the new LibraryManagement API 2017-07-06 15:35:34 +02:00
Dale Wijnand 178b079f40
No sbt-doge in sbt 1, switch back to + 2017-07-06 14:30:06 +01:00
Dale Wijnand 22df64365b
Replace util-collection dep with util-position 
With Position being extracted to its own dependency we can drop this
dependency, allowing util-collection to move (back) to sbt/sbt!
 2017-07-06 14:30:06 +01:00
Dale Wijnand a375f57101
Mini cleanup JsonUtil 2017-07-06 14:30:06 +01:00
Dale Wijnand f255894413
Drop RepositoriesParser & therefore util-completion 
This code originates from a PR against sbt 0.13:
https://github.com/sbt/sbt/pull/2576

The sbt/librarymanagement part was forward-ported to
sbt/librarymanagement and merged, while the sbt/sbt part wasn't.

So let's get rid of this so we can drop the dependency on
util-completion.
 2017-07-06 14:30:05 +01:00
Dale Wijnand 85cfe4d78c
Drop util-testing 2017-07-06 14:30:05 +01:00
Dale Wijnand f5d66db0a6
Format the build 2017-07-06 14:02:04 +01:00
Dale Wijnand c76d2624f9
No need for util-collection on Scala 2.10 anymore 
We still publish parts of sbt for Scala 2.10 for compiler-bridge reasons
in Zinc.  However util-collection is now becoming an sbt-only module, so
it won't need to continue to cross-build to Scala 2.10!  Its new
dependency util-position which is used by lm also isn't a dependency of
the compiler-bridge, so also doesn't need to be cross-built to Scala
2.10.
 2017-07-06 13:30:15 +01:00
Dale Wijnand 8d0463e6e8
No sbt-doge in sbt 1, switch back to + 2017-07-06 13:25:05 +01:00
Dale Wijnand 2214f66f33 Merge pull request #86 from dwijnand/detangle 
Detangle the dependencies, particularly collection.
 2017-07-06 13:17:04 +01:00
Dale Wijnand d464383722 Merge pull request #3303 from sbt/wip/watchservice 
Adapt to use the new `WatchService`
 2017-07-06 13:14:39 +01:00
Eugene Yokota efa3b1d340
Bump to latest io, scalajson, sjsonnew, contraband, util, lm, zinc 2017-07-06 11:05:24 +01:00
Eugene Yokota 34d0dae6e2 Fix ScalaFmt wiring 2017-07-03 14:53:56 -04:00
Dale Wijnand 48d82f95c2
Breakout Position to drop lm->collection dep 2017-07-03 12:04:45 +01:00
Dale Wijnand 84180ec402
Move Showlines to logging to drop logging->collection dep 2017-07-03 12:04:45 +01:00
Dale Wijnand f8d67d6837
Move HListFormats to collection to drop cache->collection dep 
Looks like the reason that util-cache depended on util-collection was to
define the sjson-new formats (HListFormats) for util-collection's HList.
Given that util-collection already depends on sjsonnew, HListFormats can
also be defined in util-collection.

All that was left then was (a) HListFormatSpec requires
sjsonnewScalaJson, so that was added in test scope, and (b) HListFormats
had to be dropped from sbt.util.CacheImplicits - HListFormats will have
to be imported and/or mixed-in where required downstream. For importing
convenience I defined a companion object.
 2017-07-03 12:04:44 +01:00
Alexandre Archambault 9b1d329d0b Prevent downloading the same artifact concurrently multiple times 2017-07-03 12:59:26 +02:00
Alexandre Archambault 2929c47652 Revert "Ensure a same artifact isn't downloaded twice in the same iteration" 
This reverts commit d437cfb87d.
 2017-07-03 12:56:34 +02:00
Martin Duhem 0daca42c29 Adapt to use the new `WatchService` 
This commit adapts `Watched` so that it supports the new `WatchService`
infrastructure introduced in sbt/io. The goal of this infrastructure is
to provide and API for and several implementations of services that
monitor changes to the file system.

The service to use to monitor the file system can be configured with the
key `watchService`.
 2017-07-02 00:28:04 -04:00
eugene yokota 4074e283d3 Merge pull request #119 from eed3si9n/wip/bumputil3 
bump util and contraband to the latest
 2017-07-01 19:57:59 -04:00
Eugene Yokota 4ac724e529 bump to sbt-contraband 0.3.0-M7 and latest util 2017-07-01 19:44:49 -04:00
Eugene Yokota e8d5bcc600 bump sjson-new to latest 2017-07-01 19:16:16 -04:00
Eugene Yokota e4c1a1c559 Adjust to util bump 2017-07-01 19:16:16 -04:00
eugene yokota e1c0e5c045 Merge pull request #88 from eed3si9n/wip/contrabandbump 
Contraband 0.3.0-M7, and transitive ScalaJSON
 2017-07-01 16:57:38 -04:00
eugene yokota 11f9dc6534 Merge pull request #121 from dwijnand/cross-version-aliases 
Add CrossVersion val/type compat aliases & .disabled
 2017-07-01 16:44:52 -04:00
Eugene Yokota b912a58125 Fix tests 2017-07-01 08:00:19 -04:00
Eugene Yokota 2d777a85ee clean up warnings 2017-07-01 07:47:39 -04:00
Eugene Yokota 4e01a35917 Contraband update 2017-07-01 07:47:19 -04:00
eugene yokota 8077ead3b3 Merge pull request #87 from eed3si9n/wip/bumpio 
io 1.0.0-M12
 2017-07-01 03:55:48 -04:00
Eugene Yokota 4ff793645d io 1.0.0-M12 2017-07-01 03:10:38 -04:00
Iulian Dragos a616031ca3 Read last line of config files without EOL 
The last line in a configuration file may not have a terminating EOL character. This commit fixes the launcher script to read that line as well.

Inspiration: https://stackoverflow.com/questions/10929453/read-a-file-line-by-line-assigning-the-value-to-a-variable
 2017-06-30 16:31:28 +02:00
Dale Wijnand 9d9e8112df
Add CrossVersion val/type compat aliases & .disabled 
To ease migrating code from sbt 0.13 to sbt 1 this introduces val and
type aliases to CrossVersion's companion object (via
CrossVersionFunctions).

In addition, for consistency, it introduces CrossVersion.disabled.
 2017-06-30 14:55:08 +01:00
Dale Wijnand a99a99ce43 Merge pull request #85 from eed3si9n/wip/crashlog 
send TraceEvent on crash
 2017-06-30 12:23:18 +01:00
Dale Wijnand bc059ad7bb Merge pull request #83 from dwijnand/no-eval 
Get rid of Eval
 2017-06-30 12:21:51 +01:00
Dale Wijnand eef8c11ca8 Merge pull request #120 from eed3si9n/wip/fixtostring 
Fix toString
 2017-06-30 10:21:29 +01:00
Eugene Yokota 31d519a003 Fix toString 2017-06-30 04:46:54 -04:00
eugene yokota 25d393bd8b Merge pull request #3281 from dwijnand/no-eval 
Get rid of Eval
 2017-06-28 16:32:31 -04:00
Eugene Yokota 32d6bf38cf send TraceEvent on crash 
Fixes sbt/sbt#3234
 2017-06-28 02:18:03 -04:00
eugene yokota 249c1299a4 Merge pull request #3291 from dwijnand/import-tuple-enrichments 
Move the tuple enrichments to sbt.TupleSyntax
 2017-06-27 15:17:39 -04:00
eugene yokota 9d8bba31f8 Merge pull request #3293 from dwijnand/scala212FromSbtVersion1xx 
Use Scala 2.12 for all sbt 1.x, not just 1.0.x
 2017-06-27 15:15:06 -04:00
Dale Wijnand 7e87603b5f Merge pull request #6 from jozic/updateoptions-tostring 
add toString to UpdateOptions
 2017-06-27 15:55:05 +01:00
Dale Wijnand 8782c40a22 Merge pull request #117 from smarter/add-constant 
Add constant CrossVersion
 2017-06-27 15:52:59 +01:00
Dale Wijnand 27615b8fa8
Use Scala 2.12 for all sbt 1.x, not just 1.0.x 2017-06-27 14:13:16 +01:00
Dale Wijnand 0fe0de5fb3
Move the tuple enrichments into sbt.TupleSyntax 
This undeprecates the syntax, but at the same times moves it out of
implicit scope, therefore requiring a 'import TupleSyntax._' to opt-in
to the old syntax.
 2017-06-27 12:42:46 +01:00
eugene yokota 9c0e959bf6 Merge pull request #3280 from dwijnand/univ-eq-Exec 
Fixes due to universal equality and the introduction of the Exec wrapper
 2017-06-26 15:03:45 -04:00
Dale Wijnand c5b21ab9d9
Format Structure 2017-06-26 13:49:18 +01:00
Alexandre Archambault ed1e41baf9 Add release notes for 1.0.0-RC6 2017-06-25 15:23:09 +02:00
Alexandre Archambault ff228711ec Set version to 1.0.0-SNAPSHOT 2017-06-25 15:15:04 +02:00