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

11969 Commits

Author SHA1 Message Date
Martin Duhem 763effd337 Adapt Zinc to use the new LibraryManagement API 2017-07-06 15:35:34 +02: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
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 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 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 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
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 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
Dale Wijnand 1193a48542
Get rid of Eval 2017-06-21 13:16:36 +01:00
Dale Wijnand 03213f84c8
Get rid of Eval 2017-06-21 11:36:02 +01:00
Dale Wijnand 68b47a9dd1
Finish getting rid of delegates 2017-06-20 16:27:15 +01:00
Dale Wijnand 1247431a71
Format Eval-related code 2017-06-20 16:22:32 +01:00
Dale Wijnand 53f1e2a4da
Fixes due to universal equality and the introduction of the Exec wrapper 2017-06-20 14:03:56 +01:00
Dale Wijnand 73b45f6d30
Cleanup code paths related to "last" 2017-06-20 14:03:56 +01:00
Dale Wijnand c85fbbf215 Merge pull request #3279 from sbt/wip/testlogger 
Fixes test content logger dropping out, or displaying twice
 2017-06-20 10:53:23 +01:00
Eugene Yokota f81598c6e9 Fixes test content logger dropping out, or displaying twice 
Fixes #3117
 2017-06-20 03:04:53 -04:00
eugene yokota 42dd5117e8 Merge pull request #3263 from eed3si9n/wip/bump_sbt 
bump to using sbt 1.0.0-M6
 2017-06-16 17:31:48 -04:00
Eugene Yokota 04f2a04fa4 sbt-scalafmt 1.3 2017-06-16 16:12:37 -04:00
eugene yokota 7909052513 Merge pull request #3262 from dwijnand/test-spam 
Drop test spam.
 2017-06-16 11:06:32 -04:00
Dale Wijnand 54cf4a43bb Merge pull request #81 from Rogach/1.0 
Upgrade to jline 2.14.4
 2017-06-16 14:13:42 +01:00
Dale Wijnand bed9ec8b59 Merge pull request #82 from eed3si9n/wip/sbt_bump 
Bump to using sbt 1.0.0-M6
 2017-06-14 11:15:52 +01:00
Dale Wijnand 689ef7920e Merge pull request #3268 from scalacenter/issue/3245 
Fix #3245: Add deprecated scripted `run` back
 2017-06-14 11:12:43 +01:00
Eugene Yokota 244bf0f6e1 Bump to using sbt 1.0.0-M6 2017-06-14 01:39:49 -04:00
eugene yokota c250e4c82c Merge pull request #3269 from eed3si9n/wip/notes2 
notes change
 2017-06-13 18:37:30 -04:00
Eugene Yokota 94ec0af21a notes change 2017-06-13 18:36:50 -04:00
jvican d33985d219
Fix #3245: Add deprecated scripted `run` back 2017-06-14 00:10:44 +02:00
Rogach 44e64437b0 Upgrade to jline 2.14.4 
A recent ncurses upgrade breaks older jlines.

https://github.com/sbt/sbt/issues/3240
 2017-06-13 15:19:45 +03:00
Dale Wijnand a08a84145b
Drop test spam. 
Fixes #3116
 2017-06-13 12:35:27 +01:00
Dale Wijnand 33212d2331
Cleanup test logging related code 2017-06-13 12:34:59 +01:00
Eugene Yokota bcc74a962e bump to using sbt 1.0.0-M6 
We are missing the plugin for Scalafmt but I think we need to use beta2 ourselves.
 2017-06-13 01:09:19 -04:00