Commit Graph

5046 Commits

Author SHA1 Message Date
Dale Wijnand 5ec8aac18b Merge pull request #3080 from dwijnand/artefact-classifier-and-configurations
Stop defining the artifact configuration based on the classifier
2017-04-05 21:44:44 +01:00
Dale Wijnand cd5c36a11f
Stop defining the artifact configuration based on the classifier
I believe this was accidentally not forward-ported from the 0.14 branch
to the 1.0.x branch.  Notice the change was present in #1016:

  https://github.com/sbt/sbt/pull/1016/files#diff-6373e7f7122325e753b75fe1cc76ff5fL576

and missing in #2478:

  https://github.com/sbt/sbt/pull/2478/files#diff-6373e7f7122325e753b75fe1cc76ff5fR680
2017-04-05 14:14:18 +01:00
eugene yokota 1f02e61819 Merge pull request #3077 from eed3si9n/fport/3008
[fport] Notify & enable users to stay in the warm shell
2017-04-04 20:33:05 -07:00
eugene yokota 42b8da18c3 Merge pull request #3076 from eed3si9n/fport/2908
[fport] Fix triggeredBy/storeAs/etc using :=
2017-04-04 20:08:05 -07:00
eugene yokota f0a16b927a Merge pull request #3072 from eed3si9n/fport/2993
[fport] Add local-preloaded repo
2017-04-04 19:43:20 -07:00
eugene yokota 43d0013bf7 Merge pull request #3075 from eed3si9n/fport/3025
[fport] Write sbt.version to project/build.properties
2017-04-04 18:21:11 -07:00
eugene yokota e2a1f02be9 Merge pull request #3074 from eed3si9n/fport/3015
[fport] ScriptedPlugin: Add support for paginated tests
2017-04-04 18:08:47 -07:00
eugene yokota de0faf446f Merge pull request #3073 from eed3si9n/fport/3001
[fport] Avoid missleading, link the syntax migration guide
2017-04-04 17:03:59 -07:00
Eugene Yokota 15255c15b0 Don't warn on server command 2017-04-04 20:00:56 -04:00
Eugene Yokota 7ffae0f7df Fix patch error 2017-04-04 19:59:25 -04:00
Dale Wijnand c41d428dbc Handle non-shell sbt startup warning
The sbt/sbt-launcher-package doesn't invoke sbt with the "shell"
command. sbt has a mechanism for handling this in its "boot" command
that adds an "iflast shell" to the commands. Handle this when displaying
the "Executing in batch mode" warning.

Fixes #3004
2017-04-04 19:45:24 -04:00
Dale Wijnand 6d3129dcb7 Try communicating in actual English 2017-04-04 19:44:26 -04:00
Dale Wijnand 7b4a349d5b Instruct how to get into interactive mode directly 2017-04-04 19:44:18 -04:00
Dale Wijnand f5d7c384a4 Switch from log.info and !!! to log.warn
Good idea, Lars. Thanks.
2017-04-04 19:43:55 -04:00
Dale Wijnand 1a2bfc546b Notify & enable users to stay in the warm shell
Notify & enable users to stay in sbt's shell on the warm JVM by hitting
[ENTER] while sbt is running.

Looks like this; first I run 'sbt about', then I hit [ENTER]:

    $ sbt about
    [info] !!! Executing in batch mode !!! For better performance, hit [ENTER] to remain in the sbt shell

    [info] Loading global plugins from /Users/dnw/.dotfiles/.sbt/0.13/plugins
    [info] Loading project definition from /s/t/project
    [info] Set current project to t (in build file:/s/t/)
    [info] This is sbt 0.13.14-SNAPSHOT
    [info] The current project is {file:/s/t/}t 0.1.0-SNAPSHOT
    [info] The current project is built against Scala 2.12.1
    [info] Available Plugins: sbt.plugins.IvyPlugin, sbt.plugins.JvmPlugin, sbt.plugins.CorePlugin, sbt.plugins.JUnitXmlReportPlugin, sbt.plugins.Giter8TemplatePlugin
    [info] sbt, sbt plugins, and build definitions are using Scala 2.10.6
    >
    >

Fixes #2987
2017-04-04 19:43:28 -04:00
Eugene Yokota 9dac6e910d Split dependency-management tests 2017-04-04 19:22:09 -04:00
Eugene Yokota cac2d5ad7b Add local-preloaded repo 2017-04-04 19:20:25 -04:00
Eugene Yokota 690f1c4470 Adjust actions/task-map 2017-04-04 19:12:00 -04:00
Eugene Yokota 6606958d40 Add { for readability 2017-04-04 18:49:37 -04:00
Dale Wijnand 7ac43c5e59 Tell the user we're setting sbt.version 2017-04-04 18:47:52 -04:00
Dale Wijnand cd63c1f844 Add -Dsbt.skip.version.write=true opt-out 2017-04-04 18:47:43 -04:00
Dale Wijnand a974ce7bb4 Write sbt.version to project/build.properties
Have sbt.version set in project/build.properties is a best practice
because it makes the build more deterministic and reproducible.

With this change sbt, after ensuring that the base directory is probably
an sbt project, writes out sbt.version in project/build.properties if it
is missing.

Fixes #754
2017-04-04 18:46:24 -04:00
eugene yokota a2b0037f64 Merge pull request #3071 from eed3si9n/fport/3014
[fport] Check for regular file in Package.makeJar
2017-04-04 15:23:43 -07:00
Guillaume Martres 334517aba8 Fix #3013: ScriptedPlugin: Add support for paginated tests
This was already supported in the internal Scripted used by sbt but not
in the ScriptedPlugin. This is fixed by just copy-pasting the modified
parser. We will have to wait for sbt itself to be built using an sbt
with the upgraded ScriptedPlugin to be able to avoid the code duplication.
2017-04-04 17:05:17 -04:00
Dale Wijnand f77eeed77e Avoid missleading, link the syntax migration guide
Fixes #2818
2017-04-04 16:52:31 -04:00
eugene yokota 075c3281b1 Merge pull request #3070 from eed3si9n/fport/2902
[fport] Automatically choose proper compiler bridge for dotty
2017-04-04 13:33:53 -07:00
Eugene Yokota f5cf8ef4a8 Adjust scripted test to sbt 1 2017-04-04 16:32:02 -04:00
Lars Hupel b20b8a0b18 test case for package target check 2017-04-04 16:29:06 -04:00
Lars Hupel da7d03ed48 avoid deleting the target of `makeJar` if it's not a file 2017-04-04 16:28:50 -04:00
Guillaume Martres 2283c68031 Automatically choose proper compiler bridge for dotty
Before this commit, using dotty in your sbt project required to add:
  scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" %
    scalaVersion.value % "component").sources()
in your build.sbt. We might as well automatically do this, this reduces
the boilerplate for using dotty in your project to:
  scalaOrganization := "ch.epfl.lamp"
  scalaVersion := "0.1.1-SNAPSHOT"
  scalaBinaryVersion := "2.11" // dotty itself is only published as a
                               // 2.11 artefact currently
2017-04-04 14:49:32 -04:00
eugene yokota 0a9dd9678d Merge pull request #3069 from dwijnand/rollback-runnerTask
Switch Defaults.runnerTask back to a setting
2017-04-04 09:50:17 -07:00
Dale Wijnand c9ba9502a7
Work-around actions/depends-on failure 2017-04-04 13:41:11 +01:00
Dale Wijnand 4a6feb2b23
Switch Defaults.runnerTask back to a setting
I believe this was an unintentional change in
74cfbd4a9c.
2017-04-04 11:48:45 +01:00
Dale Wijnand 1020405d64 Merge pull request #3068 from dwijnand/kill-settingsSet
Kill settingsSets
2017-04-04 11:32:37 +01:00
eugene yokota 40f6c4d01b Merge pull request #3066 from eed3si9n/wip/testing
[sbt 1.0] Proof-of-concept testing events
2017-04-04 03:31:33 -07:00
Eugene Yokota 2a1d8fb9e7 Expose TestResult 2017-04-04 05:22:23 -04:00
Dale Wijnand 101187a3be
Kill settingsSets
Fixes #2617
2017-04-04 08:38:44 +01:00
Eugene Yokota 596dc62d7e util 1.0.0-M21 2017-04-04 02:39:33 -04:00
Dale Wijnand 7ca327fc08
Migrate actions/depends-on to fix it
Seems following the deprecation warning info and the website
documentation and avoiding the BuildCommon inputTask method avoids
whatever problem was causing it to fail... Strange.. but ok?
2017-04-03 17:34:18 +01:00
Dale Wijnand 7d5dd9999d
Remove some code duplication between TaskInstance and MultiInTask 2017-04-03 17:34:17 +01:00
Dale Wijnand 7cd285f1b0
Copy all attributes for all methods in SingleInTask
For when := is used over <<= for 'triggeredBy', 'runBefore', etc..
2017-04-03 17:34:17 +01:00
Dale Wijnand 570ef0a379
Fix runBefore with := 2017-04-03 17:34:16 +01:00
Dale Wijnand 88ded6cb21
Fix triggeredBy with :=
Fixes #1444
2017-04-03 17:34:15 +01:00
Eugene Yokota 622ebfd000 Switch to using util's JValueFormats 2017-04-03 03:41:45 -04:00
Eugene Yokota 304d167813 Send ObjectEvent as JSON 2017-04-03 03:17:57 -04:00
Eugene Yokota 093fc061cc Send testing events to logger 2017-04-01 17:19:45 -04:00
Eugene Yokota d6e0fd2f0d Sort the import alphabetically in Defaults 2017-04-01 17:13:28 -04:00
eugene yokota 4e267e5cb5 Merge pull request #3055 from dwijnand/build-warnings
Remove warnings in the build setup
2017-03-29 18:34:30 -07:00
Dale Wijnand 0dcb57b587
Remove warnings in the build setup 2017-03-29 14:43:41 +01:00
eugene yokota 1adce0a656 Merge pull request #3049 from dwijnand/scripted-crossed-note
Add a note that the scripted plugin is cross-versioned now
2017-03-28 20:49:20 -07:00