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

5624 Commits

Author SHA1 Message Date
Eugene Yokota c72ca77c29 Fixes source-dependencies/trait-member-modified 2017-07-16 17:41:46 -04:00
Eugene Yokota c279995cdd Fixes source-dependencies / transitive-memberRef 2017-07-16 17:38:58 -04:00
Eugene Yokota baadd76544 Fixes project/extra 2017-07-16 17:30:20 -04:00
Eugene Yokota cc090344d9 Fixes project/auto-plugins 2017-07-16 17:22:33 -04:00
Eugene Yokota 96b5c3bb45 Disable compiler-project/macro-config 2017-07-16 17:08:02 -04:00
Eugene Yokota 5432756547 Fixes dependency-management/pom-scope 2017-07-16 17:05:46 -04:00
Eugene Yokota 1903f8c8b9 Fixes dependency-management/exclude-dependencies 2017-07-16 17:01:42 -04:00
Eugene Yokota 24ea928598 Fixes dependency-management/cached-resolution-classifier 2017-07-16 16:56:09 -04:00
Eugene Yokota bf4901f9ef Some helpful changes for update caching 
There's a bug in sbt/util#93
 2017-07-16 16:45:08 -04:00
Eugene Yokota 6a13287dba Merge branch 'wip/cached-update' into wip/integration 2017-07-16 16:12:06 -04:00
Eugene Yokota 2608009214 Fixes dependency-management/make-pom 2017-07-16 15:41:51 -04:00
Eugene Yokota d8929ae135 Fixes dependency-management/pom-advanced 2017-07-16 15:33:35 -04:00
Eugene Yokota 4e380d6055 Fixes dependency-management/cached-resolution-conflicts 2017-07-16 15:29:21 -04:00
Eugene Yokota ae93e6cb47 Mark compiler-project/macro-config pending 2017-07-16 15:21:44 -04:00
Eugene Yokota 170685f4e1 Fixes dependency-management/update-sbt-classifiers 2017-07-16 15:12:47 -04:00
Eugene Yokota 6107242c24 Fixes compiler-project/semantic-errors 2017-07-16 14:43:31 -04:00
Eugene Yokota e1dc83cf08 Fixes compiler-project/macro-config 2017-07-16 14:31:58 -04:00
Eugene Yokota 12ae6e66ff Fixes compiler-project/error-in-invalidated 2017-07-16 14:16:08 -04:00
Eugene Yokota fa67110143 Fixes compiler-project/separate-analysis-per-scala 2017-07-16 14:12:45 -04:00
Eugene Yokota a7bb39d3cb notes 2017-07-16 14:07:59 -04:00
Eugene Yokota 99be5b25f4 Roll back Vector changes in Keys.scala 
Keys should Seq type since it's fairly common to use List in build.sbt, and it would cause annoying build changes.
Fixes actions/cross
 2017-07-16 13:58:51 -04:00
Eugene Yokota b4e4a48208 Fixes actions/external-doc 2017-07-16 10:19:42 -04:00
Eugene Yokota f0ac6ae11c Adjust to upstream changes 2017-07-16 00:51:49 -04:00
Martin Duhem 347914191a Adapt to new library management API 2017-07-15 18:09:40 -04:00
Eugene Yokota 3cc49e49f4 Merge branch 'pr/3321' into wip/integration 2017-07-15 17:53:21 -04:00
Eugene Yokota c909de01b8 Merge branch 'pr/3317' into wip/integration 2017-07-15 17:52:41 -04:00
Eugene Yokota c2c1d0ff12 Merge branch 'pr/3316' into wip/integration 2017-07-15 17:52:15 -04:00
Eugene Yokota 850832a31c Bump modules 2017-07-15 17:50:00 -04:00
Martin Duhem 3fe068a4c1 Adapt to changes in ConsoleAppender 2017-07-15 17:15:42 +02:00
Eugene Yokota 49765c373d An attempt to reproduce the cache update 2017-07-15 09:35:22 -04:00
jvican 2da90fee03
Sync up with changes to `AnalysisContents` 2017-07-15 10:08:08 +02:00
jvican 32d8f47248
Add setting to switch to text analysis 
As per suggestions in https://github.com/sbt/zinc/pull/351.
 2017-07-15 09:54:21 +02:00
jvican 26cfe0cb7b
Remove any reference to `F0` and `F1` 
Syncs with https://github.com/sbt/zinc/pull/359 and
https://github.com/sbt/util/pull/84.
 2017-07-14 17:29:06 +02:00
jvican 0cc3cfb364
Synchronize with changes to Zinc logger API 
https://github.com/sbt/zinc/pull/325
 2017-07-14 14:32:53 +02:00
eugene yokota 716d664d64 Merge pull request #3315 from sbt/wip/prompt 
[sbt 1.0] Better prompt out of the box
 2017-07-13 18:02:02 -04:00
Eugene Yokota 42a1e2a291 Improve the default prompt 
Fixes #3313

This changes the default prompt to include "sbt:" + current project name.
See https://twitter.com/eed3si9n/status/884914670351659009
 2017-07-13 14:58:10 -04:00
eugene yokota 9429b76d67 Merge pull request #3312 from smarter/zinc-main 
Use the new Zinc main class detection
 2017-07-13 10:12:06 -04:00
Guillaume Martres cfc8a85fdf Use the new Zinc main class detection 
See https://github.com/sbt/zinc/pull/287 for details.
 2017-07-10 23:15:08 +02:00
Dale Wijnand 5f2e5cf10e Merge pull request #3302 from dwijnand/consume-util 
In-source the modules of sbt/util required in sbt/sbt
 2017-07-07 14:14:20 +01:00
Dale Wijnand dc2d4d613f
Format in-sourced util modules 2017-07-07 12:12:59 +01:00
Dale Wijnand 9494967e05
Upgrade util/lm/zinc & config build for util modules 
Welcome back home!
 2017-07-07 12:11:59 +01:00
Dale Wijnand 7322acc571
Merge pull request #86 from dwijnand/detangle 
Detangle the dependencies, particularly collection.
 2017-07-07 09:50:39 +01:00
Dale Wijnand a77d3146ab
Breakout Position to drop lm->collection dep 2017-07-07 09:50:39 +01:00
Dale Wijnand 2cc93f2382
Move Showlines to logging to drop logging->collection dep 2017-07-07 09:50:38 +01:00
Dale Wijnand cc3f46f996
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-07 09:50:38 +01:00
Dale Wijnand 068b46cbd1
Merge pull request #83 from dwijnand/no-eval 
Get rid of Eval
 2017-07-07 09:50:37 +01:00
eugene yokota 0c990a56d2
Merge pull request #73 from dwijnand/self-serialisable-attrkeys 
Define OptJsonWriter & put it on AttributeKey
 2017-07-07 09:50:36 +01:00
Dale Wijnand 090eab0736
Get rid of Eval 2017-07-07 09:50:36 +01:00
Dale Wijnand f0057fcdec
Rename to StrictMode 2017-07-07 09:50:35 +01:00
Dale Wijnand 0713e31cea
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-07-07 09:50:35 +01:00