Commit Graph

7202 Commits

Author SHA1 Message Date
Eugene Yokota 2da1aa61eb implement cross JDK forking
```
sbt:helloworld> java++ 10
[info] Reapplying settings...
sbt:helloworld> run
[info] Running (fork) Hello
[info] 10.0.1

sbt:helloworld> java++ 8
[info] Reapplying settings...

sbt:helloworld> run
[info] Running (fork) Hello
[info] 1.8.0_171
```
2018-05-30 00:16:27 -04:00
Eugene Yokota aff9e0110c Accept both 1.x and x for 1.1 to 1.8 2018-05-30 00:16:27 -04:00
Martynas Mickevičius c31583e4f8 Discovery of java homes 2018-05-30 00:16:27 -04:00
Dale Wijnand 17f5bc149e
Merge pull request #4175 from cunei/wip-fix4148
Fix for #4148 (SessionSettingsSpec intermittently fails)
2018-05-29 10:27:08 +01:00
Antonio Cunei f2a7e1f1c3 Fix for #4148 (SessionSettingsSpec intermittently fails)
It turns out that `syntaxAnalyzer.UnitParser()` in global now also
needs to be synchronized. The alternative is adding `synchronizeNames = true`
in the global constructor, but that already proved unreliable in the
case of #3743 (see comment https://github.com/sbt/sbt/issues/3170#issuecomment-355218833)
2018-05-28 14:09:13 +02:00
eugene yokota 7e8e18b9fa
Merge pull request #4099 from eatkins/redundant
Handle managedSources writing into unmanaged source directories
2018-05-27 23:57:46 -04:00
eugene yokota b3042091db
Merge pull request #4174 from eed3si9n/wip/bump
IO 1.1.10 and Zinc 1.1.5
2018-05-27 23:24:06 -04:00
Eugene Yokota 833e61635e IO 1.1.10 and Zinc 1.1.5 2018-05-27 22:38:58 -04:00
eugene yokota 7f808bd3a1
Merge pull request #4164 from alodavi/alodavi/improving_loading_settings_messaging
Improving loading settings messaging
2018-05-23 16:18:08 -04:00
alodavi 67efea6248 [alodavi/improving_loading_settings_messaging] logging file and project name instead of only file name 2018-05-23 17:20:41 +02:00
Aloisia Davì 9b5f44f1ea
Merge branch '1.x' into alodavi/improving_loading_settings_messaging 2018-05-23 17:08:50 +02:00
Dale Wijnand d8e27747d8
Merge pull request #4162 from holdenk/support-double-dash-for-logging-levels
Support -- for log levels
2018-05-23 12:13:23 +01:00
Dale Wijnand 807fc8035a
Merge pull request #4160 from ninjalama/1.1.x
Display first line of task/setting of multiline description
2018-05-23 12:12:08 +01:00
eugene yokota a6cd0fc994
Merge pull request #4171 from dwijnand/drop-kebabs
Drop deprecated write-sbt-version & notify-users-about-shell
2018-05-21 20:36:20 +02:00
Dale Wijnand ab35c21c98
Drop deprecated write-sbt-version & notify-users-about-shell
Introduced in https://github.com/sbt/sbt/pull/4169, these commands
aren't "user-facing" and are quite new. So no need to keep the old kebab
syntax.
2018-05-21 17:24:38 +01:00
Dale Wijnand ee1add6f4f
Merge pull request #4169 from tiqwab/kebab-case-commands
Fix kebab-case commands: notify-users-about-shell, write-sbt-version
2018-05-19 12:49:32 +02:00
tiqwab b7c9862f16 Fix kebab-case commands: notify-users-about-shell, write-sbt-version 2018-05-19 18:31:20 +09:00
Dale Wijnand 250874dde0
Merge pull request #4161 from dadarakt/1.1.x
Recreating output JAR on packageBin if file was deleted
2018-05-15 20:30:49 +02:00
Aloisia Davì 145da16c7f
Merge branch '1.x' into alodavi/improving_loading_settings_messaging 2018-05-15 14:53:00 +02:00
alodavi 80601e78ad [alodavi/improving_loading_settings_messaging] added notes on the Pr 2018-05-15 14:44:00 +02:00
Øyvind Høisæther 667a6be99e Show all lines when running help <task>, but only first line when listing tasks 2018-05-15 14:33:24 +02:00
Holden Karau 6214408783 Add support for --error. 2018-05-15 05:31:58 -07:00
dadarakt 39cac14ea7 Adapted syntax to match example 2018-05-15 14:25:49 +02:00
dadarakt e83013d3c8 Using outputChanged to track the change of the jar file instead of unit 2018-05-15 14:09:27 +02:00
alodavi b30159aded [alodavi/improving_loading_settings_messaging] logging the path instead of just the name 2018-05-15 14:06:50 +02:00
Dale Wijnand aabb6a1e36
Merge pull request #4159 from Asamsig/1.x
Migrated last command strings to camelCase
2018-05-15 14:04:48 +02:00
Øyvind Høisæther 34cc8cd273 Only use first line for multiline descriptions 2018-05-15 13:42:41 +02:00
Alexander Samsig 7dfe6097fb Removed Load and LoadCommand since they are no longer in use.
Changed add-defaults-commands directly since it is only used internally.
Added deprecation warning for LoadFailed and LastGrep.
2018-05-15 12:44:17 +02:00
Dale Wijnand f6fa7cb765
Merge pull request #4158 from cunei/backport-MavenCentral-RunFromSourceMain
Add MavenCentral to RunFromSourceMain's repos
2018-05-15 12:13:03 +02:00
Dale Wijnand c8a4dc10e7 Add MavenCentral to RunFromSourceMain's repos 2018-05-15 11:07:31 +02:00
eugene yokota b72f36f156
Merge pull request #4154 from timcharper/1.x
Add timestamp field to JUnitXML report
2018-05-15 06:35:18 +02:00
Tim Harper 5cc0038a65 Little better comment. Add timestamp to example. 2018-05-14 20:57:04 -06:00
Tim Harper 3702132019 Keep single parameter constructor for backwards bin compat. 2018-05-14 17:31:05 -06:00
Tim Harper 13085138a5 Remove milliseconds from format in order to comply with JUnit spec 2018-05-14 17:30:15 -06:00
Tim Harper add6bde396 Add timestamp field to JUnitXML report 2018-05-14 12:42:24 -06:00
eugene yokota 5335eb3779
Merge pull request #4151 from eed3si9n/wip/bumpio
IO 1.1.8
2018-05-08 18:43:46 -04:00
Eugene Yokota b849894a36 IO 1.1.8 2018-05-08 17:52:30 -04:00
eugene yokota 685b8fe254
Merge pull request #4150 from eatkins/watch-fix
Revert back to non-blocking watch termination condition
2018-05-08 17:50:37 -04:00
Ethan Atkins d3ac5274b3 Revert back to non-blocking watch termination condition
A thread blocking on System.in.read() cannot be interrupted, so check
System.in.available before blocking. This is how it used to work. It
requires https://github.com/sbt/io/pull/149 or else a cpu will be
pegged by the EventMonitor user input thread spinning on
System.in.available.
2018-05-08 13:26:58 -07:00
eugene yokota 68c984a66d
Merge pull request #4146 from eed3si9n/wip/bumpzinc
Zinc 1.1.7
2018-05-08 13:09:34 -04:00
Eugene Yokota 24946189f0 Zinc 1.1.7 2018-05-07 16:18:46 -04:00
eugene yokota 20ca5c8f8a
Merge pull request #4145 from eed3si9n/wip/bumpzinc
IO 1.1.7, Zinc 1.1.6, dotty plugin, and watch
2018-05-05 23:58:59 -04:00
Eugene Yokota 2b099c86b5 Fix Dotty plugin test
Ref https://github.com/sbt/sbt/pull/4084
2018-05-05 15:19:47 -04:00
Eugene Yokota d8fe09f007 Adjust to upstream change 2018-05-05 05:02:53 -04:00
Eugene Yokota 90931857c3 Merge branch 'pr/4096' into wip/bumpzinc 2018-05-05 04:58:19 -04:00
Eugene Yokota 094c2c602d Formatting 2018-05-05 04:57:14 -04:00
Eugene Yokota a629dea053 Merge branch 'pr/4084' into wip/bumpzinc 2018-05-05 04:54:43 -04:00
Eugene Yokota 38d53a941a IO 1.1.7, Zinc 1.1.6 2018-05-05 04:53:34 -04:00
eugene yokota 913307189e
Merge pull request #4143 from eed3si9n/wip/merge-1.1.x
merge 1.1.x
2018-05-04 23:23:21 -04:00
Eugene Yokota 96287f1ad5 Merge branch '1.1.x' into wip/merge-1.1.x 2018-05-04 21:55:50 -04:00