luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,878 Commits 29 Branches 318 Tags 94 MiB
Commit Graph

4878 Commits

Author SHA1 Message Date
Eugene Yokota d06e63ded1 Bump Scala for JDK 9 support 
Ref https://github.com/scala/scala/pull/6113
 2017-11-06 01:16:27 -05:00
Eugene Yokota faa77e8fbe Bump Ivy for JDK 9 support 2017-11-06 01:16:27 -05:00
eugene yokota a5bd564307
Merge pull request #3701 from retronym/ticket/bootclasspath 
Fix over-compilation bug with Java 9, scala.ext.dir
 2017-11-05 22:33:45 -05:00
Jason Zaugg d9df8835e6 Add comment about reason for underlying source hack 2017-11-05 13:54:29 +11:00
Jason Zaugg aac97476ce Refactor createBootClasspath to avoid work when sun.boot.class.path is present 2017-11-01 13:38:03 +10:00
Jason Zaugg 5a1e832a13 Ignore directories that scalac reports as underlying source on Java 9 2017-11-01 11:20:31 +10:00
Jason Zaugg bf36f824fd Generalize handling of ext.dirs 2017-11-01 09:09:25 +10:00
Jason Zaugg 3cd4815fe4 More general boot classpath discovery 2017-11-01 08:48:12 +10:00
eugene yokota e3c4db5ae8 Merge pull request #3408 from dwijnand/01316 
sbt 0.13.16
 2017-09-08 16:42:26 -04:00
Dale Wijnand d864b066a3
sbt 0.13.16 
Tweaked the dependencies due to #3458.

Also workaround a brand-new Travis CI issue.

And mark fork-parellel/test pending.. to merge this thing
 2017-09-08 17:06:23 +01:00
eugene yokota b5f9fe215e Merge pull request #3455 from olafurpg/tuple-enrichments-are-staying 
Change the tuple enrichment deprecation warning messages
 2017-08-24 12:42:49 -04:00
eugene yokota 6a04e0e168 Merge branch '0.13' into tuple-enrichments-are-staying 2017-08-24 06:02:48 -04:00
Dale Wijnand c77b7af5b8 Merge pull request #3470 from eed3si9n/wip/use_precise 
[0.13] Use precise machines for Travis CI
 2017-08-24 07:15:45 +01:00
Eugene Yokota dce514bda5 Use precise machines for Travis CI 
PR validation to 0.13 branch is failing because Travis now defaults to Trusty, which does not seem to support openjdk6.

Ref travis-ci/travis-ci#8199
 2017-08-23 20:24:44 -04:00
Ólafur Páll Geirsson dfe2932bc8 Update tuple enrichment deprecation warning messages. 
Following discussions in https://github.com/sbt/sbt/issues/3454
 2017-08-17 12:56:41 +02:00
eugene yokota 96ddc33a3e Merge pull request #3397 from dwijnand/sbt-plugin-cross-version 
Fix addSbtPlugin to use the correct version of sbt
 2017-08-08 13:09:56 -04:00
eugene yokota a2142fbb12 Merge pull request #3409 from dwijnand/bintray 
sbt-bintray 0.5.1
 2017-08-08 11:25:03 -04:00
Dale Wijnand 2fc0a6a571
Fix addSbtPlugin to use the correct version of sbt 
Fixes #3393
 2017-08-08 15:09:12 +01:00
Dale Wijnand a93970c8ec
Dedup check task in project/cross-plugins-defaults 2017-08-08 15:09:11 +01:00
Dale Wijnand 0424fefe7d
sbt-bintray 0.5.1 2017-08-08 13:30:49 +01:00
eugene yokota b2b02a1dd7 Merge pull request #3403 from dwijnand/fix-doc-more 
Remove a series of warnings from running `doc`
 2017-08-04 17:39:32 -04:00
eugene yokota 5ae723c5fb Merge pull request #3400 from dwijnand/no-exec 
Drop the exec permission on random source files
 2017-08-04 17:28:03 -04:00
eugene yokota 3ef24be443 Merge pull request #3401 from dwijnand/fix-doc 
Fix doc erroring
 2017-08-04 17:27:20 -04:00
Dale Wijnand 47c4542a30
Remove a series of warnings from running `doc` 2017-08-04 11:34:27 +01:00
Dale Wijnand 1e851953c0
Fix doc erroring 
Scaladoc 2.10 struggles with FastTypeTag's macro.

Fixes #2812
 2017-08-04 11:21:56 +01:00
Dale Wijnand 684e2c3692
Drop the exec permission on random source files 2017-08-04 11:13:40 +01:00
Dale Wijnand 3d50ca2f6a Merge pull request #3375 from sbt/0.13.16 
Merge 0.13.16
 2017-07-27 07:09:54 +01:00
Dale Wijnand 2952a2b9b6 Merge pull request #3370 from eed3si9n/wip/crossfix 
[sbt 0.13] Fix ^^ and don't inject scalaVersion by default
 2017-07-26 08:48:33 +01:00
Eugene Yokota 23bfcf58a5 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-25 13:05:40 -04:00
Eugene Yokota c9fc72c610 Format enforcement 2017-07-25 13:02:24 -04:00
Dale Wijnand d0db2e2dd3 Merge pull request #3347 from dwijnand/sbtUnchecked 
Add `@sbtUnchecked` to sbt 0.13.16
 2017-07-24 15:56:46 +01:00
Dale Wijnand 5096c3a8c5 Merge pull request #3361 from eed3si9n/wip/apifix 
[bport] Fixes sbtApiVersion logic
 2017-07-24 15:22:54 +01:00
Eugene Yokota c3ebcd64d8 Fixes sbtApiVersion logic 
The NonRelease pattern matcher is ony checking for the third segment, but for sbt 1.x, we need to check both the second and third segment since 1.1.0-M1 would be bincompat with 1.0.

Fixes sbt/sbt#3360
 2017-07-23 13:16:34 -04:00
Eugene Yokota 63867968bb notes 2017-07-22 13:20:21 -04:00
eugene yokota 6c8964dfde Merge pull request #3356 from eed3si9n/wip/switch 
[sbt 0.13] Override current project's scalaVersion on ^^
 2017-07-22 12:08:04 -04:00
Eugene Yokota 92c46dd231 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-21 23:01:10 -04:00
Dale Wijnand 3cd2a979ca
Add `@sbtUnchecked` to sbt 0.13.16 
Fixes #3337
 2017-07-19 13:36:06 +01:00
eugene yokota 948ff29829 Merge pull request #3329 from dwijnand/fix-scripted 
Make scripted support sbt 1.0.0-RC1 or later
 2017-07-17 13:04:31 -04:00
Dale Wijnand d71678faa9
Make scripted support sbt 1.0.0-RC1 or later 
Fixes #3325
 2017-07-17 16:01:22 +01:00
eugene yokota 6ce09cfed6 Merge pull request #3265 from Rogach/0.13 
Update jline dependency to 2.14.4 (#3240)
 2017-06-13 14:12:12 -04:00
Rogach 94e11fa807 Update jline dependency to 2.14.4 (#3240) 2017-06-13 14:02:35 +03:00
eugene yokota 5c85acb17f Merge pull request #3215 from eed3si9n/wip/moduleid 
[sbt 0.13] backport withXXX for ModuleID and Artifact
 2017-05-25 21:10:28 -04:00
eugene yokota 77f85d6626 Merge pull request #3204 from eed3si9n/wip/eviction2 
Improve the eviction warning presentation.
 2017-05-25 18:16:00 -04:00
Eugene Yokota 9b944f74fa backport withXXX for ModuleID and Artifact 
Fixes sbt/sbt#3159

This helps keep source compat.
 2017-05-24 19:59:01 -04:00
Eugene Yokota 631b5c7c7a Improve the eviction warning presentation. 
Fixes sbt/sbt#2699

Before:

    [warn] There may be incompatibilities among your library dependencies.
    [warn] Here are some of the libraries that were evicted:
    [warn]  * com.google.code.findbugs:jsr305:2.0.1 -> 3.0.0
    [warn] Run 'evicted' to see detailed eviction warnings

After:

    [warn] Found version conflict(s) in library dependencies; some are suspected to be binary incompatible:
    [warn]
    [warn] 	* com.typesafe.akka:akka-actor_2.12:2.5.0 is selected over 2.4.17
    [warn] 	    +- de.heikoseeberger:akka-log4j_2.12:1.4.0            (depends on 2.5.0)
    [warn] 	    +- com.typesafe.akka:akka-parsing_2.12:10.0.6         (depends on 2.4.17)
    [warn] 	    +- com.typesafe.akka:akka-stream_2.12:2.4.17 ()       (depends on 2.4.17)
    [warn]
    [warn] Run 'evicted' to see detailed eviction warnings
 2017-05-23 14:30:27 -04:00
Dale Wijnand 0ca24b69a8 Merge pull request #3202 from eed3si9n/wip/eviction 
change EvictionWarningOptions.default to include callers and transitives
 2017-05-22 11:14:29 +01:00
Eugene Yokota b3850872ee update EvictionWarningSpec 2017-05-21 13:59:07 -04:00
Eugene Yokota 303ee137bd Scalariform changes 2017-05-21 13:18:53 -04:00
Eugene Yokota fa82807eee bump sbt 2017-05-21 13:18:29 -04:00
Eugene Yokota 90c102badc change EvictionWarningOptions.default 
Fixes sbt/sbt#3171

change EvictionWarningOptions.default to include transitive evictions and caller info.
 2017-05-21 13:18:11 -04:00