Commit Graph

6319 Commits

Author SHA1 Message Date
eugene yokota 0d3d6bab02
Merge pull request #4196 from eed3si9n/wip/merge-1.1.x
Merge 1.1.x
2018-06-13 03:20:17 -04:00
Eugene Yokota 41fc25dba7 Fix scripted test 2018-06-13 02:01:17 -04:00
Eugene Yokota 86427c7ce7 Merge branch '1.1.x' into wip/merge-1.1.x 2018-06-12 23:33:47 -04:00
Dale Wijnand 1d7b35bd67
Merge pull request #3766 from eatkins/hostname
Add warning for slow hostname lookups on OS X
2018-06-06 22:39:58 +01:00
Ethan Atkins 27e93601b5 Add warning for slow hostname lookups on OS X
I spent a lot of time debugging why it took 5 seconds to run tests each
time. It turns out that if the hostname is not set explicitly on os x,
then getaddrinfo takes 5 seconds to try (and fail) to resolve the dns
entry for the localhostname. This is easily fixed by setting the
hostname, but it is not at all easy to figure out that a slow hostname
lookup is the reason why tests are slow to start.

I don't know if this is a common issue on other platforms, so only issue
the warning on OS X.
2018-06-06 10:53:46 -07:00
eugene yokota 2848770f85
Merge pull request #4139 from eed3si9n/wip/discover-java-home
Cross JDK forking
2018-05-30 13:45:00 -04:00
Eugene Yokota 9b7c224f93 use stringly-typed key so we can define it machine-wide 2018-05-30 00:59:12 -04:00
Eugene Yokota 72ebdeb199 jabba 0.10.1
https://github.com/shyiko/jabba/blob/master/CHANGELOG.md#0101---2018-05-07
Ref https://github.com/shyiko/jabba/issues/190
2018-05-30 00:16:27 -04:00
Eugene Yokota a7d85c8724 Formatting 2018-05-30 00:16:27 -04:00
Eugene Yokota 35e98f51fd Adjust to upstream change 2018-05-30 00:16:27 -04:00
Eugene Yokota 951eaa646f jabba 0.9.6 (no sudo)
Ref https://github.com/shyiko/jabba/issues/190
Bumping to jabba 0.9.6 fixes sporaditc permission issues.
2018-05-30 00:16:27 -04:00
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