Commit Graph

4854 Commits

Author SHA1 Message Date
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 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
eugene yokota b9170010ef Merge pull request #3194 from dwijnand/deprecate-removed-toError
Deprecate BuildCommon's toError
2017-05-16 16:42:21 -04:00
Dale Wijnand d3fa1e06c6
Deprecate BuildCommon's toError
Removed in sbt 1
2017-05-16 10:15:09 +01:00
eugene yokota 9ecc7db8f7 Merge pull request #3179 from eed3si9n/wip/zero
[sbt 0.13] Add an alias for Global called Zero
2017-05-10 16:48:26 -04:00
Eugene Yokota e80caa20a2 Add an alias for Global called Zero
Ref sbt/sbt#3178
2017-05-07 23:36:09 -04:00
eugene yokota 762a0e72dd Merge pull request #3155 from jameskoch/bug-fix
Fixes Issue #3154 - "It is not a test" in JUnit XML reports.
2017-05-05 11:03:35 -04:00
James Koch 84fc133e16 Merge branch '0.13' into bug-fix 2017-05-03 11:54:20 -04:00
eugene yokota 87db0e1bec Merge pull request #3152 from smarter/fix/dotty-scalaBinaryVersion
Fix default scalaBinaryVersion for Dotty
2017-05-03 11:49:16 -04:00
James Koch b75b7f3bbb Merge branch '0.13' into bug-fix 2017-04-30 13:19:47 -04:00
James Koch ecf14d6ad5 Issue #3154 - ScalaTest nested suites reported in JUnit XML reports as "(It is not a test)". 2017-04-30 13:16:23 -04:00
Dale Wijnand 3ea9bbba92 Merge pull request #3153 from dwijnand/kill-enter-to-stay-in-shell
Remove the "hit [ENTER] to switch to interactive mode" feature
2017-04-28 18:07:58 +01:00
Dale Wijnand f4cc3d2938
Remove the "hit [ENTER] to switch to interactive mode" feature
In sbt 0.13.15, in addition to notifying the user about the existence of
sbt's shell, a feature was added to allow the user to switch to sbt's
shell - a more pro-active approach to just displaying a message.

Unfortunately sbt is often unintentionally invoked in shell scripts in
"interactive mode" when no interaction is expected by, for exmaple,
invoking `sbt package` instead of `sbt package < /dev/null`. In that
case hitting [ENTER] would silently trigger sbt to run its shell,
easily wrecking the script. In addition to that I was unhappy with the
implementation as it created a tight coupling between sbt's command
processing abstraction to sbt's shell command.

If you want to stay in sbt's shell after running a task like `package`
then invoke sbt like so:

    sbt package shell

Fixes #3091
2017-04-28 11:00:16 +01:00
Guillaume Martres 629a04937f Fix default scalaBinaryVersion for Dotty
Dotty is versioned as 0.*, but `CrossVersionUtil#binaryScalaVersion`
will return the full version instead of just `major.minor` for all
compiler versions < 2.10, add a special case for Dotty to avoid this.

Note: I used tabs in this commit to match the style of the surrounding code.
2017-04-28 11:45:43 +02:00
Dale Wijnand 684e78cf19 notes 2017-04-28 09:41:53 +01:00
Eugene Yokota d15c051559 notes 2017-04-27 18:41:08 -04:00
Dale Wijnand f9c0187870 Merge pull request #3147 from dwijnand/warn-less
Improvements & bug fixes to the new startup messages
2017-04-27 18:21:30 +01:00
Dale Wijnand 5b808ee38e
Notes for changes to startup messages 2017-04-27 16:38:22 +01:00
Dale Wijnand 54055835be
Notify users about shell only if compile is present
This is a change in strategy.

The motivation is the need to find a good balance between:

  + informing the uninformed that would benefit from this information, &
  + not spamming the already informed

Making it dependent on "compile" being present in remainingCommands will
probably make it trigger for, for example, Maven users who are used to
running "mvn compile" and always run "sbt compile", and who therefore
are unneccesarily suffering terribly slow compile speeds by starting up
the jvm and sbt every time.

Fixes #3091
2017-04-27 16:37:52 +01:00
Dale Wijnand 1c1be9a597
Introduce suppressSbtShellNotification
This requires moving the notification to after LoadProject, so much
later in time, sadly..

Refs #3091
2017-04-27 16:34:32 +01:00
Dale Wijnand a6af8c50c8
Notify users at info level & in 1 line
Refs #3091
2017-04-27 16:34:32 +01:00
Dale Wijnand 2ee0b3c064
Exclude "new" from startup messages
Fixes #3097
2017-04-27 16:34:27 +01:00
Dale Wijnand fdd3f56694
Allow --error to suppress warning messages
Specifically:

* Make them both commands, so they run after early commands (--error).
* Make notifyUsersAboutShell aware of "iflast shell" instead of "boot".
* Make writeSbtShell use a logger and tweak the message

Refs #3091
2017-04-27 16:32:48 +01:00
Dale Wijnand a4e0d9a932
Refactor State#process for clarity 2017-04-27 15:35:36 +01:00
Dale Wijnand 4ab11d7948 Merge pull request #3133 from eed3si9n/wip/sbtcrossbuilding
[sbt 0.13] Port sbt-cross-building's ^ and ^^ commands
2017-04-24 13:06:03 +01:00
Dale Wijnand f64ce4ede1 Merge pull request #3135 from eed3si9n/wip/plusequals
[sbt 0.13] Fix += interference with sbt-buildinfo
2017-04-23 12:39:56 +01:00