Commit Graph

17940 Commits

Author SHA1 Message Date
eugene yokota 70ad35ebb6 Minor Windows fixes 2017-04-07 22:13:12 -07:00
Dale Wijnand 153f3837f1 Merge pull request #82 from dwijnand/default-ScmInfo-devConnection
Make ScmInfo devConnection default to None
2017-04-07 17:15:32 +01:00
Eugene Yokota 0f8b3b0ffb Fix bash script 2017-04-07 04:13:13 -04:00
Dale Wijnand 7ac685831c Merge pull request #148 from sbt/wip/mkdir2
Make full installer optional
2017-04-07 07:44:54 +01:00
Eugene Yokota 04bc5a9dd2 Publish full installers to lightbend organization
Offline installation exceeds 50MB file limit for OSS organization.
2017-04-07 01:40:05 -04:00
Eugene Yokota 2fad446e67 Make offline installer optional 2017-04-07 00:56:55 -04:00
Eugene Yokota d3ca77a95d mkdir before rsync
Fixes sbt/sbt#3005
2017-04-07 00:32:16 -04:00
Alexandre Archambault d629f8f7b9 Merge pull request #487 from coursier/topic/tweak-optional-config
Tweak optional pseudo-configuration
2017-04-06 15:45:29 +02:00
Dale Wijnand 31b1be2f3b Merge pull request #3081 from dwijnand/kill-project-delegation
Kill project delegation
2017-04-06 07:34:39 +01:00
Alexandre Archambault e344cdf4a9 Merge pull request #481 from olafurpg/bintray-ivy
Support --repository bintray-ivy:org/repo/ in cli.
2017-04-06 01:34:44 +02:00
Alexandre Archambault 2420fa8a69 Tweak optional pseudo-configuration
Have it ~extends "default" rather than "compile", so that depending on both "default" and "optional" can be simplified to just "optional" ("default" being pulled by it now, thanks to this change). That allows to address the scala-compiler jar appearing twice on the classpath sometimes.
2017-04-06 00:14:33 +02:00
Dale Wijnand a0eeec37e2
Kill project delegation 2017-04-05 22:47:39 +01:00
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
Ólafur Páll Geirsson 45b920c352 Support --repository bintray-ivy:org/repo/ in cli.
This commit adds support for a `bintray-ivy:` repository prefix to the `--repository`
flag in the cli. This option is equivalent to the `Resolver.bintrayIvyRepo` helper in sbt.
With this new helper, it's possible to write `-r bintray-ivy:scalameta/maven/` instead of

```
-r ivy:https://dl.bintray.com/scalameta/maven/[organisation]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext]
```
2017-04-05 18:00:59 +02:00
Dale Wijnand 80715dfb57
Make ScmInfo devConnection default to None 2017-04-05 15:51:36 +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
Alexandre Archambault 6c1b8ea7a4 Merge pull request #486 from coursier/topic/fix-spark-submit-1.x
Fix spark-submit command in spark 1.x
2017-04-05 13:30:38 +02:00
Alexandre Archambault 4e3c4aff1d Fix spark-submit command in spark 1.x
Recent regression
2017-04-05 12:33:54 +02:00
Eugene Yokota 3244e67040 Bump io and util 2017-04-05 00:13:49 -04:00
Eugene Yokota 061b259d1d Fix build 2017-04-04 23:56:54 -04:00
Eugene Yokota ed8034f12d Bump IO 2017-04-04 23:55:39 -04: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 6fe4d820ed Merge pull request #81 from eed3si9n/fport/3017
[fport] Fix version parsing
2017-04-04 17:50:58 -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 e9e6939c8f Merge pull request #77 from eed3si9n/fport/2999
[fport] JLine 2.14.3
2017-04-04 16:23:59 -07: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 36121bed74 Fix version parsing
Fixes sbt/sbt#3011
2017-04-04 18:34:37 -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
eugene yokota a1e7e5713f Merge pull request #80 from eed3si9n/fport/2959
[fport] Maven version range improvement
2017-04-04 14:17:29 -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 70a2b4c169 JLine 2.14.3
Fixes sbt/sbt#1855
See also jline/jline2#127
2017-04-04 16:49:18 -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