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

5439 Commits

Author SHA1 Message Date
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 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
Dale Wijnand 9cfa17d09e
Move OptJsonWriter to public API 2017-07-07 09:50:34 +01:00
Dale Wijnand ae4e53ceb0
Define OptJsonWriter & put it on AttributeKey 2017-07-07 09:50:34 +01:00
Dale Wijnand c81b8de966
Merge pull request #71 from eed3si9n/wip/eventlogging 
event logging
 2017-07-07 09:50:33 +01:00
eugene yokota 408ff0d9a1
Merge pull request #69 from eed3si9n/fport/2855 
[fport] Add build-level keys to the tab completion
 2017-07-07 09:50:32 +01:00
Eugene Yokota 73b24681c5
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-07-07 09:50:32 +01:00
eugene yokota 52bb767bc8
Merge pull request #66 from eed3si9n/wip/212 
Scala 2.12
 2017-07-07 09:50:31 +01:00
Eugene Yokota 1b19c504a4
Revert "Merge pull request #41 from eed3si9n/wip/2469" 
This reverts commit 0da2f30ee8, reversing
changes made to 93418589b7.
 2017-07-07 09:50:31 +01:00
Eugene Yokota cfc5efe798
Work around Scala 2.12 init deadlock (SI-9824) 2017-07-07 09:50:30 +01:00
Eugene Yokota 58be28e399
Update Eval 
https://github.com/typelevel/cats/blob/e2335730a958ce605f0d75f1b0d838454
2336aaf/core/src/main/scala/cats/Eval.scala
 2017-07-07 09:50:30 +01:00
eugene yokota 7035be5107
Merge pull request #57 from dwijnand/deprecations 
Remove deprecated methods
 2017-07-07 09:50:29 +01:00
Dale Wijnand 95d52077db
Lazily concatenate failed errors for completion [forwardport] (#53) 
* Fixes [sbt/sbt#2781]
* When using `<TAB>` completion the failed errors were always
  computed for mathcing projects even if there was no failure,
  leading to excessive computation of Levenshtein distances
  and a large lag (seconds) on builds with many matching
  projects.
 2017-07-07 09:50:28 +01:00
Dale Wijnand 1526bf4f85
Remove deprecated methods 2017-07-07 09:50:28 +01:00
eugene yokota 5fe5ff4352
Merge pull request #52 from dwijnand/eval 
Really expose Eval. Fixes error in #50
 2017-07-07 09:50:27 +01:00
Dale Wijnand 042d3de956
Really expose Eval. Fixes error in #50 2017-07-07 09:50:27 +01:00
eugene yokota e762cae61e
Merge pull request #50 from dwijnand/eval 
Expose Eval. Fixes sbt/sbt#2616
 2017-07-07 09:50:26 +01:00
Dale Wijnand f6e4c7c85e
Expose Eval. Fixes sbt/sbt#2616 2017-07-07 09:50:25 +01:00
eugene yokota 39fefa9844
Merge pull request #48 from eed3si9n/wip/jline2 
Interruptible read line
 2017-07-07 09:50:24 +01:00
Eugene Yokota d059b2f486
Handle sleep interruption 2017-07-07 09:50:24 +01:00
eugene yokota 414a7bb5f7
Merge pull request #44 from dwijnand/cleanups 
Fix compilation warnings, migrate to blackbox.Context
 2017-07-07 09:50:23 +01:00
Eugene Yokota 43215db815
Trying to make readline timeout 2017-07-07 09:50:23 +01:00
Dale Wijnand 84af84c301
Un-deprecate now-private methods 2017-07-07 09:50:22 +01:00
Dale Wijnand c4e6caf0ed
Remove Attribute#rawLabel 2017-07-07 09:50:22 +01:00
Dale Wijnand 8cc4a54c40
Add -Ywarn-unused & -Ywarn-unused-import, & fix warnings 2017-07-07 09:50:21 +01:00
Dale Wijnand 5f2e56a5a8
Fix compilation warnings, migrate to blackbox.Context 2017-07-07 09:50:21 +01:00
Eugene Yokota b64e505746
Update dependencies 2017-07-07 09:50:20 +01:00
eugene yokota d4c83c2c3c
Merge pull request #41 from eed3si9n/wip/2469 
FPORT: Completion for build-level keys
 2017-07-07 09:50:20 +01:00
Martin Duhem 27dee66399
Address problems reported by Codacy 2017-07-07 09:50:19 +01:00
Dale Wijnand 39ed62ae82
Merge pull request #39 from eed3si9n/wip/jline 
FPORT: Workaround for Jline regression
 2017-07-07 09:50:18 +01:00
Martin Duhem dca7a109ac
Completion for build-level keys 
sbt's shell provided completion only for keys that were relative to a
defined project, but didn't provide completion for keys that belong to
the build definition only.

This commit fixes this issue by defining a new kind of `Parser` (from
which completions are generated) which runs its input simultaneously on
distinct parsers. We now define a parser for project-level keys and
another parser for build-level keys. These two parsers are eventually
combined, and we get the completions of both parsers.

Fixes sbt/sbt#2460
 2017-07-07 09:50:18 +01:00
eugene yokota ceca932026
Merge pull request #35 from eed3si9n/wip/warning 
Remove some warnings
 2017-07-07 09:50:17 +01:00
eugene yokota d4116b03f4
Fixes #2480. Workaround for Jline regression (#2570) 
Workaround jline/jline2#205
 2017-07-07 09:50:17 +01:00
eugene yokota 31fe561151
Merge pull request #34 from eed3si9n/wip/eval 
Eval from Cats
 2017-07-07 09:50:16 +01:00
Eugene Yokota d9bd056a29
Remove some warnings 2017-07-07 09:50:16 +01:00
Eugene Yokota 1361e4f18d
Rename Eval#value to get 2017-07-07 09:50:15 +01:00
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