Commit Graph
5389 Commits
Author SHA1 Message Date
eugene yokota 108fc67b7d Merge pull request #33 from sbt/wip/fixthread
Don't inject thread sleep by default
2017-07-07 09:50:14 +01:00
eugene yokota 657c10f9d3 Merge pull request #31 from sbt/wip/thread
Inject thread.sleep, which allows thread interruption during readLine
2017-07-07 09:50:13 +01:00
Eugene Yokota 5811e8a257 Fixes #32. Don't inject thread sleep by default.
Thread sleeping interferes with scripted test when the build cannot be
loaded. The scripted test gets stuck, and jstack shows

    java.lang.Thread.State: TIMED_WAITING (sleeping)
      at java.lang.Thread.sleep(Native Method)
      at sbt.internal.util.InputStreamWrapper.read(LineReader.scala:138)
      at
jline.internal.NonBlockingInputStream.read(NonBlockingInputStream.java:2
45)
      ....
      at sbt.internal.util.JLine$.withJLine(LineReader.scala:118)
      at sbt.internal.util.JLine.readLine(LineReader.scala:18)
      at
sbt.BuiltinCommands$.sbt$BuiltinCommands$$doLoadFailed(Main.scala:460)
2017-07-07 09:50:13 +01:00
Eugene Yokota 1dfd9db2c7 Inject Thread.sleep periodically during read() to allow thread interruption 2017-07-07 09:50:12 +01:00
Eugene Yokota 972450db5d Refactor nulls to Option 2017-07-07 09:50:12 +01:00
eugene yokota 4787081532 Merge pull request #30 from dwijnand/bump-sbt-houserules-for-mima
Bump sbt-houserules to add MiMa
2017-07-07 09:50:11 +01:00
eugene yokota ef03c0295c Merge pull request #19 from sbt/wip/existentials
Fixes sbt/util#14
2017-07-07 09:50:10 +01:00
Dale Wijnand db08c77660 Unexecute Positions 2017-07-07 09:50:10 +01:00
eugene yokota 25cbae2b2e Merge pull request #18 from sbt/wip/fileinfo
Adds picklers to FileInfo, also new house rules
2017-07-07 09:50:09 +01:00
Eugene Yokota 7a6253a5c3 Fixes sbt/util#14 by rolling back 6175d92338 2017-07-07 09:50:09 +01:00
Eugene Yokota 2cefe315f2 New house rules 2017-07-07 09:50:08 +01:00
eugene yokota af53ad1598 Merge pull request #16 from Duhemm/jline-access
Make `sbt.internal.util.JLine` private to sbt package
2017-07-07 09:50:07 +01:00
Martin Duhem 6eed17ad4e Make sbt.internal.util.JLine private to sbt package
It was private to `sbt.internal.util`, but it is used in sbt's codebase.
2017-07-07 09:50:07 +01:00
eugene yokota ac8c3aefdd Merge pull request #13 from sbt/wip/packagenames2
package name change and test migration
2017-07-07 09:50:06 +01:00
Eugene Yokota 3bb53ae4fc sbt.util.internal -> sbt.internal.util package 2017-07-07 09:50:05 +01:00
Eugene Yokota d93db4a634 migrate to scalatest 2.2.4 2017-07-07 09:50:05 +01:00
eugene yokota dd6286044b Merge pull request #11 from sbt/wip/packagenames
Move util into sbt.util.internal package
2017-07-07 09:50:04 +01:00
Eugene Yokota 53e719656f Move util into sbt.util.internal package 2017-07-07 09:50:03 +01:00
eugene yokota 9d2abb3cac Merge pull request #10 from sbt/wip/patmatchwarning
Removes a warning. Ref #4
2017-07-07 09:50:03 +01:00
eugene yokota 3b9d0a891a Merge pull request #4 from Duhemm/cleaning
Clean the build and the warnings
2017-07-07 09:50:02 +01:00
Eugene Yokota 7e3ad3631c Removes a warning. Ref #4
Exhaustion check was not picking up StaticScopes, which is an object.
2017-07-07 09:50:02 +01:00
Josh Suereth 7e349f1e1b Merge pull request #3 from sbt/wip/bintray
Publish artifacts to Bintray
2017-07-07 09:50:01 +01:00
Martin Duhem bad46a7707 Merge branch '1.0' of github.com:sbt/util into cleaning 2017-07-07 09:50:01 +01:00
Eugene Yokota dc29953fe8 Add sbt-house-rules and bintray-sbt 2017-07-07 09:50:00 +01:00
Martin Duhem 6c7e69497f Add recommended compiler flags, fix most of the warnings 2017-07-07 09:50:00 +01:00
eugene yokota d7b4c00999 Merge pull request #1 from Duhemm/setup-travis
Setup travis, public tests in utilLogging
2017-07-07 09:49:59 +01:00
Martin Duhem c0f55127db Add sbt-houserules, formatting. 2017-07-07 09:49:59 +01:00
Eugene Yokota 7f57853f23 move modules around. 2017-07-07 09:49:58 +01:00
Martin Duhem 39d66c4602 Update IO library to sbt/IO v1.0.0-M1 2017-07-07 09:49:58 +01:00
Dale Wijnand 4cbad9eab1 Bring back collection, complete & logic
Recovers these as they were at the time of their deletion:

    git checkout 4053ea92ba \
      util/collection util/complete util/logic
2017-07-07 09:48:53 +01:00
Dale Wijnand f63306140e Format the build 2017-07-07 09:48:48 +01:00
Dale Wijnand 58956d1c58 Drop util-apply-macro dep, given it was brought back 2017-07-07 09:48:42 +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
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 25d393bd8b Merge pull request #3281 from dwijnand/no-eval
Get rid of Eval
2017-06-28 16:32:31 -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 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