luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,153 Commits 23 Branches 320 Tags 104 MiB
Commit Graph

9153 Commits

Author SHA1 Message Date
Martin Duhem 5815f1db0a
`Append` instance to add `File` to `Seq[Source]` 2017-08-14 15:47:17 +02:00
Dale Wijnand ec54269467 Merge pull request #3428 from SethTisue/be-2.13-friendly 
be 2.13 friendly
 2017-08-14 10:39:08 +01:00
eugene yokota 7d390b3309 Merge pull request #3433 from eed3si9n/wip/scalafmt 
Add back, re-configure & re-enable Scalafmt
 2017-08-14 01:23:56 -04:00
Eugene Yokota c16a3b6ffa Merge branch '1.0.0' into wip/scalafmt 2017-08-13 21:46:37 -04:00
eugene yokota 51570a3771 Merge pull request #3418 from dwijnand/scalafmt 
Add back, re-configure & re-enable Scalafmt
 2017-08-13 20:29:46 -04:00
eugene yokota 70a117515c Merge pull request #3417 from sbt/1.0.0 
Merge 1.0.0 into 1.x
 2017-08-13 19:56:37 -04:00
Seth Tisue f5d51bf387 be 2.13 friendly 
for the Scala 2.13 community build
 2017-08-12 07:35:26 -07:00
eugene yokota f4479a1027 Merge pull request #3426 from eed3si9n/wip/notes 
Cleans up notes
 2017-08-12 01:50:20 -04:00
Eugene Yokota b4f7312171 Cleans up notes 2017-08-12 01:49:49 -04:00
Dale Wijnand 805b76f3d4
Add back, re-configure & re-enable Scalafmt 2017-08-10 16:35:23 +01:00
Dale Wijnand 7dcb6d4dbb Merge pull request #3416 from eed3si9n/wip/1.0.0 
launchconfig
 2017-08-10 12:17:39 +01:00
Dale Wijnand 1527acc6c1 Merge pull request #118 from dwijnand/scalafmt 
Add, configure & enable Scalafmt
 2017-08-10 11:52:57 +01:00
Dale Wijnand d31b9c5093
Add, configure & enable Scalafmt 2017-08-10 11:44:24 +01:00
Dale Wijnand 615c2e652f Merge pull request #117 from sbt/1.0.0 
Merge 1.0.0 into 1.x
 2017-08-10 09:43:26 +01:00
Eugene Yokota a100b47fcc 1.0.1-SNAPSHOT 2017-08-10 01:27:24 -04:00
Eugene Yokota 23fa8e9e82 launchconfig 2017-08-10 01:26:58 -04:00
eugene yokota 816958d8c8 Merge pull request #3415 from eed3si9n/wip/bump 
IO 1.0.0, Util 1.0.0, LM 1.0.0, Zinc 1.0.0
 2017-08-10 00:48:02 -04:00
Eugene Yokota ffacc62b86 IO 1.0.0, Util 1.0.0, LM 1.0.0, Zinc 1.0.0 2017-08-09 23:56:59 -04:00
eugene yokota 93b9937894 Merge pull request #116 from eed3si9n/wip/bumpio 
IO 1.0.0
 2017-08-09 20:38:59 -04:00
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