luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
970 Commits 29 Branches 312 Tags 69 MiB
Commit Graph

970 Commits

Author SHA1 Message Date
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 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
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 32d6bf38cf send TraceEvent on crash 
Fixes sbt/sbt#3234
 2017-06-28 02:18:03 -04:00
Dale Wijnand 03213f84c8
Get rid of Eval 2017-06-21 11:36:02 +01: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
Eugene Yokota 244bf0f6e1 Bump to using sbt 1.0.0-M6 2017-06-14 01:39:49 -04: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 471ee7fdc4 Merge pull request #80 from eed3si9n/wip/logging2 
Fixes buffered log appender
 2017-05-18 06:48:55 +01:00
Eugene Yokota f2cc5ee775 convert log4j async LogEvent to an immutable one 
This fixes the buffered log not showing up for tests.

Ref sbt/sbt#3198
 2017-05-18 00:36:24 -04:00
Eugene Yokota feeb6291cd Add toString for ObjectEvent 2017-05-18 00:34:41 -04:00
Eugene Yokota 122c738913 bump version 2017-05-17 00:18:24 -04:00
eugene yokota ecf3dd3ae8 Merge pull request #78 from eed3si9n/wip/cached 
Adds back overrides for File-based caching
 2017-04-17 12:40:23 -04:00
Eugene Yokota f48848e5d4 Adds overrides for File-based caching 
sbt/util#45 implemented caching using sjson-new. Now many of the functions take `CacheStore` that abstracts the caching ability.

sbt/sbt#3109 demonstrates that setting up CacheStore requires boilerplate involving concepts introduced in sbt 1.

This change adds back overrides using File by making assumption that majority of the time we would want standard JSON converter.
 2017-04-17 10:24:54 -04:00
Eugene Yokota 061b259d1d Fix build 2017-04-04 23:56:54 -04:00
Eugene Yokota ed8034f12d Bump IO 2017-04-04 23:55:39 -04:00
eugene yokota e9e6939c8f Merge pull request #77 from eed3si9n/fport/2999 
[fport] JLine 2.14.3
 2017-04-04 16:23:59 -07:00
Eugene Yokota 70a2b4c169 JLine 2.14.3 
Fixes sbt/sbt#1855
See also jline/jline2#127
 2017-04-04 16:49:18 -04:00
eugene yokota e4489a3923 Merge pull request #76 from dwijnand/drop-out-X 
Drop (out-X) from the log output
 2017-04-04 09:52:51 -07:00
Dale Wijnand d088d16d78
Drop (out-X) from the log output 
Fixes sbt/sbt#3056
 2017-04-04 14:15:01 +01:00
Dale Wijnand add9bd2f4d Merge pull request #74 from eed3si9n/wip/json 
Store JSON into ObjectEvent
 2017-04-03 08:35:56 +01:00
Eugene Yokota 069104b989 Bump up log4j2 to 2.8.1 2017-04-03 03:22:47 -04:00
Eugene Yokota 1dab826ffd Store JValue into ObjectEvent 2017-04-03 03:22:33 -04:00
Eugene Yokota e21c78ebb0 Move JValue format here 2017-04-03 03:22:04 -04:00
Eugene Yokota 94a2e6cb12 Fix directory name 2017-04-03 03:21:14 -04:00
Eugene Yokota 66f345a303 Cross publish utilCollection 
Fixes sbt/util#72
 2017-04-03 03:20:36 -04:00
eugene yokota 6c768a1ca3 Merge pull request #73 from dwijnand/self-serialisable-attrkeys 
Define OptJsonWriter & put it on AttributeKey
 2017-03-21 16:05:48 -07:00
Dale Wijnand d91c3de736
Rename to StrictMode 2017-03-21 21:50:45 +00:00
Dale Wijnand 6c7f99005e
Allow opting out of the fallback OptJsonWriter 
Simply

    import OptJsonWriter.OptOut._

And you'll get the implicit lift, but not the implicit fallback.

You get an ambiguous compile error like this:

    [error] /d/sbt-util/internal/util-collection/src/main/scala/sbt/util/OptJsonWriter.scala:28: ambiguous implicit values:
    [error]  both method conflictingFallback1 in trait OptOut0 of type [A]=> sbt.util.NoJsonWriter[A]
    [error]  and method conflictingFallback2 in trait OptOut0 of type [A]=> sbt.util.NoJsonWriter[A]
    [error]  match expected type sbt.util.OptJsonWriter[Foo]
    [error]     val x = implicitly[OptJsonWriter[Foo]]
    [error]                       ^
 2017-03-21 17:12:10 +00:00
Dale Wijnand e984875b77
Move OptJsonWriter to public API 2017-03-21 10:47:01 +00:00
Dale Wijnand bbeecae0b1
Define OptJsonWriter & put it on AttributeKey 2017-03-21 00:09:17 +00:00
Eugene Yokota a12045ed42 some change for Scala 2.10 2017-02-15 18:52:04 -05:00
Dale Wijnand b6cad50327 Merge pull request #71 from eed3si9n/wip/eventlogging 
event logging
 2017-02-08 16:37:10 +00:00
Eugene Yokota a9377ce4a6 Implements registerStringCodec 
Uses TypeTag to recover the full name of type parameter, which is calculated by StringTypeTag. This is sent along in ObjectEvent.
On the other end, we can lookup typeclass instances using the tag key.
 2017-02-08 05:35:49 -05:00
eugene yokota 5306e29290 Merge pull request #69 from eed3si9n/fport/2855 
[fport] Add build-level keys to the tab completion
 2017-01-26 10:31:41 -05:00
Eugene Yokota 6e2f77f852 ProblemFormats 2017-01-25 23:25:24 -05:00
Eugene Yokota 1320c96953 Rename log events 2017-01-25 23:15:31 -05:00
Eugene Yokota f76e3aa2bb use java.util.Optional in Position 2017-01-25 20:58:37 -05:00
Eugene Yokota c985d9cdc0 Switch Scripted tests to used ManagedLogger 2017-01-24 21:13:58 -05:00