luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,342 Commits 29 Branches 314 Tags 70 MiB
Commit Graph

6342 Commits

Author SHA1 Message Date
Filipe Regadas 0fb07a861b Add alternative scripted filenames 2018-06-19 14:59:04 -04:00
eugene yokota e313193609
Merge pull request #4215 from eed3si9n/wip/contrib 
Use 1.x branch
 2018-06-19 10:49:12 -04:00
Eugene Yokota d07e432b4f Use 1.x branch 2018-06-19 10:47:34 -04:00
eugene yokota 5b8272b935
Merge pull request #4214 from eed3si9n/wip/bump 
bump modules to 1.2.0-M1
 2018-06-18 23:25:22 -04:00
Eugene Yokota ddf0f4f43d bump modules to 1.2.0-M1 2018-06-18 22:39:40 -04:00
eugene yokota 6fbb7f055a
Merge pull request #4211 from eed3si9n/wip/loadplugin 
addPluginSbtFile command
 2018-06-18 22:35:08 -04:00
eugene yokota c966e01a29
Merge pull request #4213 from eed3si9n/wip/split-server-test 
Split server unit test on its own
 2018-06-18 10:16:41 -04:00
Eugene Yokota dc73fcfece Split server unit test on its own 
Ref https://github.com/sbt/sbt/issues/4186
This is an attempt to fix the flaky server test issue.
 2018-06-18 04:43:11 -04:00
eugene yokota 479ea92bd8
Merge pull request #4212 from eed3si9n/wip/open-setplugins 
Open up setPlugins to private[sbt]
 2018-06-18 04:05:17 -04:00
Eugene Yokota 932f911483 addPluginSbtFile command 
Fixes https://github.com/sbt/sbt/issues/1502

This adds `--addPluginSbtFile=<file>` command, which adds the given .sbt file to the plugin build.
Using this mechanism editors or IDEs can start a build with required plugin.

```
$ cat /tmp/extra.sbt
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.7")

$ sbt --addPluginSbtFile=/tmp/extra.sbt
...
sbt:helloworld> plugins
In file:/xxxx/hellotest/
  ...
  sbtassembly.AssemblyPlugin: enabled in root
```
 2018-06-18 01:50:36 -04:00
Eugene Yokota b3bcb3f47d Open up setPlugins to private[sbt] 
This would make it easier for projectMatrix to be a plugin.
 2018-06-18 00:36:43 -04:00
eugene yokota a6ae813b7c
Merge pull request #4202 from eed3si9n/wip/houserules 
sbt-houserules 0.3.7
 2018-06-15 16:12:28 -04:00
eugene yokota f3618c74b6
Merge pull request #4205 from sbt/1.1.x 
Merge 1.1.x
 2018-06-15 15:33:02 -04:00
eugene yokota 21db286766
Merge pull request #4204 from eed3si9n/wip/fix-shutdownhook 
Remove the shutdown hook when it's done
 2018-06-14 07:21:31 -04:00
Eugene Yokota e3c9eb0cd9 Remove the shutdown hook when it's done 2018-06-14 05:12:36 -04:00
Eugene Yokota 8ec0e0193e sbt-houserules 0.3.7 2018-06-14 02:51:09 -04:00
eugene yokota 9b8648519f
Merge pull request #4198 from eed3si9n/wip/offline-props 
-Dsbt.offline sets offline setting
 2018-06-14 01:09:32 -04:00
eugene yokota 51ee6fc409
Merge pull request #4194 from veera83372/1.1.x 
Fix for #4191 (active.json should be removed on JVM shutdown)
 2018-06-13 11:25:18 -04:00
eugene yokota ca6115da55
Merge pull request #4187 from mcanlas/sort-and-indent-plugins-output 
sort and indent plugins output in "about" command
 2018-06-13 04:50:42 -04:00
Eugene Yokota 7b6ae46116 -Dsbt.offline sets offline setting 
Fixes #771
 2018-06-13 03:52:21 -04:00
eugene yokota 54ad0d865e
Merge branch '1.x' into sort-and-indent-plugins-output 2018-06-13 03:21:02 -04:00
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
veera venky e465aee36a Fix for #4191 (active.json should be removed on JVM shutdown) 
Added a shutdown hook to clean up active.json file
 2018-06-13 03:06:30 +05:30
Mark Canlas 5fd774693c sort and indent about plugins output 2018-06-09 01:31:45 -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