Commit Graph

10242 Commits

Author SHA1 Message Date
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
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
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