Commit Graph

11353 Commits

Author SHA1 Message Date
Eugene Yokota b8ac05aa7f IO 1.0.0 2017-08-09 19:14:10 -04:00
eugene yokota bb54beee8c Merge pull request #115 from dwijnand/deprecated-changed
Deprecated Changed
2017-08-08 22:31:59 -04:00
eugene yokota 6ea9dab99e Merge pull request #3407 from sbt/1.0.0
Merge the 1.0.0 branch into 1.x
2017-08-08 12:19:49 -04:00
Dale Wijnand ad4afa0a18
Deprecated Changed
Fixes #114
2017-08-08 15:32:26 +01:00
Dale Wijnand c592b2f542 Merge pull request #3396 from dwijnand/rc3
Upgrade to sbt 1.0.0-RC3
2017-08-01 15:53:10 +01:00
Dale Wijnand 2c6cda24ff Merge pull request #112 from dwijnand/rc3
Upgrade to sbt 1.0.0-RC3
2017-08-01 14:36:19 +01:00
Dale Wijnand a495aa7cb0
Upgrade to sbt 1.0.0-RC3 2017-08-01 14:35:27 +01:00
Dale Wijnand bb2b4fc961
Upgrade to sbt 1.0.0-RC3 2017-08-01 14:13:57 +01:00
Dale Wijnand 2f9029c623 Merge pull request #3395 from dwijnand/mima
Bump mimaPreviousArtifacts to 1.0.0-RC3
2017-07-31 14:45:21 +01:00
Dale Wijnand 1d6b8d7c03 Merge pull request #111 from dwijnand/mima
Bump mimaPreviousArtifacts to 1.0.0-RC3
2017-07-31 14:44:56 +01:00
Dale Wijnand deae720bf1
Bump mimaPreviousArtifacts to 1.0.0-RC3 2017-07-31 11:50:27 +01:00
Dale Wijnand 2a7226dffb
Bump mimaPreviousArtifacts to 1.0.0-RC3 2017-07-31 11:38:09 +01:00
eugene yokota 1d3d29cdab Merge pull request #3387 from eed3si9n/wip/notes
notes
2017-07-28 19:41:53 -04:00
Eugene Yokota dcff4dd5eb notes 2017-07-28 19:41:19 -04:00
eugene yokota 07879e26e1 Merge pull request #3385 from eed3si9n/wip/contraband2
Bump modules, and use LM API
2017-07-28 18:47:04 -04:00
eugene yokota b38dbc3618 Merge pull request #3380 from eed3si9n/wip/skipinpublish
implement `skip in publish`
2017-07-28 18:46:03 -04:00
Eugene Yokota d1a950868f Use LM API for cached update task
Fixes sbt/sbt#3326
2017-07-28 17:55:49 -04:00
Eugene Yokota 4d8d5f5df0 IO, Util, LM, Zinc 1.0.0-RC3 2017-07-28 15:45:59 -04:00
Eugene Yokota 0850df67e8 Contraband 0.3.0 2017-07-28 15:40:30 -04:00
Dale Wijnand 716203fefa Merge pull request #3383 from dwijnand/2123
Upgrade to Scala 2.12.3
2017-07-28 16:53:37 +01:00
eugene yokota 43041a5fcb Merge pull request #110 from eed3si9n/wip/contraband
Bump Contraband, Scala, and IO
2017-07-28 11:43:51 -04:00
Eugene Yokota 5fe8128906 Bump Scala to 2.12.3 and IO to 1.0.0-RC3 2017-07-28 11:22:52 -04:00
Eugene Yokota 867cd3fa8f Contraband 0.3.0 2017-07-28 11:21:22 -04:00
eugene yokota 518a905d35 Merge pull request #3382 from eed3si9n/wip/slf4j
Log4j 2 SLF4J Binding
2017-07-28 03:45:40 -04:00
Dale Wijnand 0f48990c49 Merge pull request #108 from sbt/no-log4j-slf4j-impl
Remove undeclared log4j-slf4j-impl dependency
2017-07-28 08:31:35 +01:00
Dale Wijnand 56d7d400b0
Upgrade to Scala 2.12.3 2017-07-28 07:56:08 +01:00
Dale Wijnand 5f5a70cca7 Remove undeclared log4j-slf4j-impl dependency 2017-07-28 07:34:48 +01:00
Eugene Yokota 5768ad2468 Log4j 2 SLF4J Binding
Fixes sbt/sbt#3333
2017-07-28 01:00:47 -04:00
Eugene Yokota 5e8bbf8d0d implement `skip in publish`
`skip in publish` when set to `true` will skip publish, publishLocal, and publishM2. (sbt-pgp already skips publishSigned).

Fixes sbt/sbt#3136
2017-07-27 22:04:42 -04:00
jvican 57d25161dc Use Scala 2.12.3
We have to look into the reason why the shaded version of the compiler
plugin reports the following error and halts the build:

```
protoc-jar: executing: [/tmp/protocjar2818613521400194680/bin/protoc.exe, --plugin=protoc-gen-scala=/tmp/protocbridge4921434211196915044, --scala_out=grpc:/data/rw/code/scala/zinc/internal/zinc-persist/target/scala-2.12/src_managed/main, -I/data/rw/code/scala/zinc/internal/zinc-persist/src/main/protobuf, -I/data/rw/code/scala/zinc/internal/zinc-persist/target/protobuf_external, /data/rw/code/scala/zinc/internal/zinc-persist/src/main/protobuf/schema.proto]
java.lang.AbstractMethodError: Method scalapb/ScalaPbCodeGenerator$.run(Lcom/google/protobuf/compiler/PluginProtos$CodeGeneratorRequest;)Lcom/google/protobuf/compiler/PluginProtos$CodeGeneratorResponse; is abstract
	at scalapb.ScalaPbCodeGenerator$.run(ScalaPbCodeGenerator.scala)
	at protocbridge.frontend.PluginFrontend$.$anonfun$runWithBytes$1(PluginFrontend.scala:56)
	at scala.util.Try$.apply(Try.scala:209)
	at protocbridge.frontend.PluginFrontend$.runWithBytes(PluginFrontend.scala:54)
	at protocbridge.frontend.PluginFrontend$.runWithInputStream(PluginFrontend.scala:67)
	at protocbridge.frontend.PosixPluginFrontend$.$anonfun$prepare$1(PosixPluginFrontend.scala:25)
	at scala.runtime.java8.JFunction0$mcV$sp.apply(JFunction0$mcV$sp.java:12)
	at scala.concurrent.Future$.$anonfun$apply$1(Future.scala:653)
	at scala.util.Success.$anonfun$map$1(Try.scala:251)
	at scala.util.Success.map(Try.scala:209)
	at scala.concurrent.Future.$anonfun$map$1(Future.scala:287)
	at scala.concurrent.impl.Promise.liftedTree1$1(Promise.scala:29)
	at scala.concurrent.impl.Promise.$anonfun$transform$1(Promise.scala:29)
	at scala.concurrent.impl.CallbackRunnable.run(Promise.scala:60)
	at scala.concurrent.impl.ExecutionContextImpl$AdaptedForkJoinTask.exec(ExecutionContextImpl.scala:140)
	at java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:289)
	at java.util.concurrent.ForkJoinPool$WorkQueue.runTask(ForkJoinPool.java:1056)
	at java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1692)
	at java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:157)
```
2017-07-27 11:34:52 +02:00
Dale Wijnand 2b35107a02 Merge pull request #3376 from eed3si9n/fport/3370
[fport] Fix ^^ and don't inject scalaVersion by default
2017-07-27 07:11:46 +01:00
Eugene Yokota 9a26f7ba1c Fix ^^ and don't inject scalaVersion by default
This no longer injects scalaVersion at the project level, which was interfering with crossScalaVersions delegation to ThisBuild scope.

Fixes sbt/sbt#3353
2017-07-26 23:14:37 -04:00
Eugene Yokota 38e4fa9b7b 0.13.16 build id 2017-07-26 18:00:14 -04:00
Dale Wijnand 3eb9443856 Merge pull request #3335 from Duhemm/topic/inspect-help
Show `actual` as potential option of `inspect`
2017-07-26 16:34:26 +01:00
eugene yokota 051d0e5673 Merge pull request #107 from dwijnand/mima
Upgrade to mima 0.1.15 & exclude a false positive
2017-07-26 11:10:59 -04:00
eugene yokota c9f9f5ca3c Merge pull request #3349 from dwijnand/mima
Add, configure & enable MiMa
2017-07-26 10:20:49 -04:00
Dale Wijnand c103950b10
Add, configure & enable MiMa 2017-07-26 14:14:04 +01:00
Dale Wijnand 96b9d27c73
Upgrade to mima 0.1.15 & exclude a false positive 2017-07-26 10:52:35 +01:00
Dale Wijnand 3a14bd8094 Merge pull request #3367 from eed3si9n/wip/keys
Unify to camel cased setting key
2017-07-26 09:07:05 +01:00
Dale Wijnand cc69023585 Merge pull request #172 from retronym/ticket/170-java-version-sed
Fix java version detection in bash script
2017-07-26 09:06:33 +01:00
Dale Wijnand 3104ae0d57 Merge pull request #106 from eed3si9n/wip/stacktrace
Fix ConsoleAppender to show full stack trace
2017-07-26 09:01:11 +01:00
Dale Wijnand aefbbae6ec Merge pull request #105 from eed3si9n/wip/success
Use event logging to send success
2017-07-26 08:52:33 +01:00
Jason Zaugg c487e3166e Fix java version detection in bash script
`java -version` can include an extra line of output
if `_JAVA_OPTTIONS` is set.

This commit adds a grep step before sed to harden
against this possibility.

Before:
```
 (export _JAVA_OPTIONS=-Dfoo.bar; java -version 2>&1 | sed 's/.*version "\([0-9]*\)\(\.[0-9]*\)\{0,1\}\(.*\)*"/\1\2/; 1q')
Picked up _JAVA_OPTIONS: -Dfoo.bar
```

After:
```
 (export _JAVA_OPTIONS=-Dfoo.bar; java -version 2>&1 | grep ' version "' | sed 's/.*version "\([0-9]*\)\(\.[0-9]*\)\{0,1\}\(.*\)*"/\1\2/; 1q')
1.8
```
2017-07-26 14:57:58 +10:00
Eugene Yokota 930489eba3 Fix ConsoleAppender to show full stack trace
This is modification of crash log event logging that was added in sbt/util#85.

Instead of using the hardcoded 0 as the default value, this introduces `setTrace(..)` to `ConsoleAppender` like `BasicLogger`. Also the default value is set to `Int.MaxValue` that will display the full stack trace.

Fixes sbt/sbt#3343
2017-07-26 00:03:07 -04:00
Eugene Yokota 5183f7ef81 Use event logging to send success
Fixes sbt/sbt#3213
2017-07-25 16:16:21 -04:00
eugene yokota 996b760a9e Merge pull request #3365 from sbt/wip/terminalwidth
InteractionService#terminalWidth
2017-07-25 05:16:08 -04:00
Dale Wijnand 4b57f852b1 Merge pull request #104 from eed3si9n/wip/logging
Filter out color in CosoleAppender only
2017-07-25 09:06:56 +01:00
Eugene Yokota b27ff9ace7 Unify to camel cased setting key
Fixes #3146
2017-07-25 03:06:17 -04:00
Dale Wijnand 57b34f56d2 Merge pull request #3364 from sbt/wip/newfix
Fix new command
2017-07-25 07:52:50 +01:00
Eugene Yokota 467617a4b9 Implement withRank 2017-07-25 01:50:53 -04:00