Commit Graph

17940 Commits

Author SHA1 Message Date
eugene yokota a43947410e Merge branch '1.0.0' into wip/api_mod 2017-07-28 02:27:29 -04:00
eugene yokota a80ce86e65 Merge pull request #148 from dwijnand/fix-mima-failure
Fix MiMa failures
2017-07-28 02:26:14 -04:00
Dale Wijnand 749a1c9a9b
Fix MiMa failures 2017-07-28 07:18:27 +01:00
Eugene Yokota f976c6824b Name the reverse missing methods 2017-07-28 02:11:20 -04:00
Eugene Yokota 208b8e4279 Exclude ReversedMissingMethodProblem sbt.internal.librarymanagement.formats.* 2017-07-28 02:00:17 -04:00
Eugene Yokota d6e2720201 Let `ModuleDescriptor` declare cache inputs 2017-07-28 01:37:01 -04: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
eugene yokota 1a513b27ef Merge pull request #145 from dwijnand/mima
Upgrade to mima 0.1.15 & add exclusions
2017-07-27 10:43:31 -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 32bf842a5a Merge pull request #143 from eed3si9n/wip/formatsfix
Implement better fake formats than ???
2017-07-27 10:17:43 +01: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 93c06d29b1 Implement better fake formats than ???
Fixes sbt/librarymanagement#67
Fixes sbt/sbt#3288
2017-07-26 22:46:06 -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 1512d73a07
Upgrade to mima 0.1.15 & add exclusions 2017-07-26 11:40:54 +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 4ff4e109a0 Merge pull request #144 from eed3si9n/wip/will_be_removed_not
Change overwrite warning
2017-07-26 08:57:18 +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 22f47be292 Change overwrite warning
Previously the warning read:

    Attempting to overwrite $destination
    This usage is deprecated and will be removed in sbt 1.0.

This is an empty threat since we did not remove the feature.

I'm replacing it with:

    Attempting to overwrite $destination (non-SNAPSHOT)
    You need to remove it from the cache manually to take effect.

Fixes sbt/sbt#3271
2017-07-25 17:19:45 -04:00
Eugene Yokota 5183f7ef81 Use event logging to send success
Fixes sbt/sbt#3213
2017-07-25 16:16:21 -04:00
Dale Wijnand bf733e782b Merge pull request #142 from eed3si9n/wip/settingnoise
Filter out ":: loading settings"
2017-07-25 14:44:44 +01:00
eugene yokota 996b760a9e Merge pull request #3365 from sbt/wip/terminalwidth
InteractionService#terminalWidth
2017-07-25 05:16:08 -04:00
Eugene Yokota ace8d88f9f Filter out ":: loading settings"
Fixes sbt/sbt#3287

I'm not sure why we started to see these messages, but given that their info is mapped to our info, it kind of makes sense that it is surfacing. The fix is hacky, but it should work.
2017-07-25 04:09:44 -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
Eugene Yokota d796084ff4 Filter out color in CosoleAppender only
Fixes sbt/sbt#3348
Ref #101

The new logger, based on log4j separates the concern of the log producer (Logger) and the handlers that takes actions (Appender, e.g for displaying on Console). As such filtering of color should be performed only in the ConsoleAppender.
2017-07-24 23:54:25 -04:00
Eugene Yokota f6370063f4 Deprecate ansiCodesSupported from the logger 2017-07-24 23:20:05 -04:00
eugene yokota df18d79987 Merge pull request #101 from liff/issue/3336
Delegate ansiCodesSupported to ConsoleAppender
2017-07-24 22:57:06 -04:00
Eugene Yokota f96c8b9668 InteractionService#terminalWidth
Adds `def terminalWidth: Int` to InteractionService to wrap JLine 2 (or 3 in the future).

Fixes #3352
2017-07-24 22:44:18 -04:00
Eugene Yokota a68372fd52 Fix new command
This was caused by bad porting of lm API usage.

Fixes #3355
2017-07-24 22:23:37 -04:00
eugene yokota ac7b1498a9 Merge pull request #3363 from sbt/fport/3329
[fport] Make scripted support sbt 1.0.0-RC1 or later
2017-07-24 22:20:36 -04:00
Dale Wijnand 696aacb31f Make scripted support sbt 1.0.0-RC1 or later
Fixes #3325
2017-07-24 21:18:13 -04:00
eugene yokota 26954994e2 Merge pull request #3362 from sbt/fport/3356
[fport] Override current project's scalaVersion on ^^
2017-07-24 20:16:40 -04:00
Eugene Yokota 2c4e78f414 Override current project's scalaVersion on ^^
Both the default settings and ^^ together sets the correct scalaVersion based on `sbtVersion in pluginCrossBuild`, but frequently people set up `scalaVersion` on sbt plugin's subproject, which disables the feature.
This change appends the scalaVersionSetting on ^^ so scalaVersion gets switched to 2.12.2 on ^^ 1.0.0-RC2 etc.

Fixes #3205
2017-07-24 18:45:37 -04:00
eugene yokota ceadf9722a Merge pull request #141 from eed3si9n/wip/horsefix
Use IvyAuthenticator and JavaNetAuthenticator
2017-07-24 15:35:49 -04:00
eugene yokota 82a8ca87e1 Merge pull request #3358 from sbt/wip/linereader
Keep ConsoleChannel open
2017-07-24 13:47:07 -04:00
Dale Wijnand 2bb2cfd10e Merge pull request #103 from dwijnand/mima
Add, configure & enable MiMa
2017-07-24 15:56:10 +01:00
Dale Wijnand 80e8abc22d Merge pull request #169 from dragos/patch-1
Read last line of config files without EOL
2017-07-24 15:29:34 +01:00