luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,940 Commits 22 Branches 332 Tags 96 MiB
Commit Graph

17940 Commits

Author SHA1 Message Date
eugene yokota aa6ce25a86
Merge pull request #308 from esamson/master 
Use exec to launch when not in cygwin
 2019-11-20 21:49:36 +02:00
eugene yokota 9b9e168fb4
Merge pull request #5235 from fthomas/fix/5234 
Include description and homepage in ivy.xml files
 2019-11-20 21:44:13 +02:00
Edward Samson a362c964de Use exec to launch when not in cygwin 
This allows, for example, capturing the correct PID when launching sbt
from within a bash script. The original change from
1a07150560 was to address an issue
specific to cygwin.
 2019-11-20 13:57:33 +08:00
eugene yokota 031021cea0
Merge pull request #307 from er1c/script-version-no-copy 
Update sbt.bat --script-version to execute early and avoid java check/robocopy bootstrap
 2019-11-18 07:49:17 +02:00
Eric Peters 8122bd7020 Update citest to use 1.3.0 release 2019-11-17 11:49:58 -08:00
Eric Peters 63eabf3c8f Update sbt.bat --script-version to execute early and avoid java check/robocopy bootstrap - Fixes #5220 2019-11-17 08:35:30 -08:00
Frank S. Thomas 16860b5273 Include description and homepage in ivy.xml files 
This PR includes the values of the `description` and `homepage`
settings into the `ivy.xml` files generated by the `makeIvyXml`
task. It restores the behaviour of sbt 1.2.8 and if `useCoursier`
is set to `false`.

Two things are changed in this PR:
 * `IvyXml.content` now adds the `homepage` attribute to the
   `description` element if `project.info.homePage` is not empty.
 * `CoursierInputsTasks.coursierProject0` now fills the previous
   empty `CProject.info` field with the description and homepage.

Closes: #5234
 2019-11-16 20:18:42 +01:00
Scala Steward de3b4f0458 Update sbt-coursier, sbt-shading to 2.0.0-RC4-1 (#153) 2019-11-14 20:22:04 +01:00
Scala Steward 26918b9974 Update coursier to 2.0.0-RC5-2 (#155) 2019-11-14 15:03:37 +01:00
eugene yokota 98aac0a413
Merge pull request #306 from michaelh0911/master 
Add special handling for -XX
 2019-11-13 09:00:06 +02:00
Michael Hsu 1318c0f594 Add special handling for -XX, -XX:+ and -XX:0 2019-11-11 10:59:06 +08:00
Michael Hsu cb19634350 Fix tests for -XX, then add test for -XX:+ and -XX:- 2019-11-11 10:56:10 +08:00
Eugene Yokota 033601c393 addPluginSbtFile command fixes 
Ref #4211
Fixes #4395
Fixes #4600

This is a reimplementation of `--addPluginSbtFile`. #4211 implemented the command to load extra `*.sbt` files as part of the global plugin subproject. That had the unwanted side effects of not working when `.sbt/1.0/plugins` directory does not exist. This changes the strategy to load the `*.sbt` files as part of the meta build.

```
$ sbt -Dsbt.global.base=/tmp/hello/global --addPluginSbtFile=/tmp/plugins/plugin.sbt
[info] Loading settings for project hello-build from plugin.sbt ...
[info] Loading project definition from /private/tmp/hello/project
sbt:hello> plugins
In file:/private/tmp/hello/
	sbt.plugins.IvyPlugin: enabled in root
	sbt.plugins.JvmPlugin: enabled in root
	sbt.plugins.CorePlugin: enabled in root
	sbt.ScriptedPlugin
	sbt.plugins.SbtPlugin
	sbt.plugins.SemanticdbPlugin: enabled in root
	sbt.plugins.JUnitXmlReportPlugin: enabled in root
	sbt.plugins.Giter8TemplatePlugin: enabled in root
	sbtvimquit.VimquitPlugin: enabled in root
```
 2019-11-10 20:03:09 -05:00
Michael Hsu 34ca729719 Fix Travis CI error: find: '=': No such file or directory 2019-11-10 20:46:55 +08:00
Michael Hsu c742f66dd8 Add tests for -XX and mutiple -D 2019-11-09 22:44:13 +08:00
Michael Hsu fe43d0b975 Add special handling for -XX 
Fix special handling for -D where > null should be > nul
Fix the problem that only the first option of SBT_OPTS and JAVA_OPTS got processed
 2019-11-08 10:23:53 +08:00
eugene yokota 08c7fd1b8f
Merge pull request #5225 from samvel1024/develop 
Sleep the current thread when we need to retry background job shutdown
 2019-11-06 10:33:51 -05:00
Samvel Abrahamyan ff75a21d4f Sleep the current thread when we need to retry background job shutdown 2019-11-05 14:54:55 +01:00
eugene yokota 609917c3b9
Merge pull request #21 from sbt/wip/virtualaxis 
implement VirtualAxis
 2019-11-04 14:08:02 -05:00
Eugene Yokota 88fd75bc72 implement VirtualAxis 
Fixes https://github.com/sbt/sbt-projectmatrix/issues/13
Fixes https://github.com/sbt/sbt-projectmatrix/issues/14

This adds the notion of VirutalAxis that allows the matrix to define strong or weak axis.
 2019-11-04 11:58:13 -05:00
eugene yokota e17c64dfb6
Merge pull request #5153 from eed3si9n/wip/lint 
build linting to warn on unused settings during reload
 2019-10-30 11:36:43 -04:00
eugene yokota 574be6fb79
Merge pull request #324 from eed3si9n/wip/bumpivy 
ivy 2.3.0-sbt-88d6a93d15f9b029958c1c289a8859e8dfe31a19
 2019-10-30 11:34:09 -04:00
eugene yokota 098796cdff
Merge pull request #232 from diesalbla/recycle_string_builder_storage 
ConsoleAppender: reuse/recycle StringBuilder storage
 2019-10-22 17:57:00 -04:00
Diego E. Alonso-Blas 3657910063 ConsoleAppender: reuse/recycle StringBuilder storage. 
A StringBuilder is a mutable data structure to create a String.
When the String is created, the new String does not share any
storage with the StringBuilder. Thus, we can keep a same
StringBuilder, and reuse its internal storage between different
iterations.
 2019-10-22 23:30:09 +02:00
Johannes Rudolph 221e5fb7a1
Expand note and ask for help from users 2019-10-21 11:07:04 +02:00
Eugene Yokota 6200255eed ivy 2.3.0-sbt-88d6a93d15f9b029958c1c289a8859e8dfe31a19 2019-10-20 11:42:41 -04:00
eugene yokota 9f9dd66336
Merge pull request #305 from er1c/sbt-jar-win 
Add --sbt-jar test and windows sbt.bat support
 2019-10-20 09:56:13 -04:00
eugene yokota 2f31849c64
Merge pull request #5204 from eed3si9n/wip/nohouse 
in-source sbt-houserules
 2019-10-20 01:21:56 -04:00
Eugene Yokota 6f49065a56 in-source sbt-houserules 2019-10-20 00:41:53 -04:00
Eugene Yokota 417de34779 util 1.3.2, zinc 1.3.1 2019-10-20 00:28:25 -04:00
Eugene Yokota 675430dad2 io 1.3.1 2019-10-20 00:28:17 -04:00
eugene yokota 6444172538
Merge pull request #5202 from regadas/fix/5110 
Fix #5110: allow semanticdbVersion override
 2019-10-20 00:25:39 -04:00
Eric Peters 978ea39676 Make the script version regex test more windows-friendly 2019-10-19 21:01:03 -07:00
Eric Peters 5991e803af Add --sbt-jar test and windows sbt.bat support 2019-10-19 20:29:09 -07:00
eugene yokota d97d9e66ff
Merge pull request #304 from er1c/deprecated-args 
Remove unimplemented --sbt-rc and --sbt-snapshot arguments from docs and scripts
 2019-10-19 23:02:19 -04:00
Eric Peters 819ee47071 Remove unimplemented --sbt-rc and --sbt-snapshot arguments from docs and scripts 2019-10-19 18:34:13 -07:00
eugene yokota da6897b8a3
Merge pull request #322 from eed3si9n/wip/nohouse 
in-source sbt-houserules
 2019-10-19 20:13:20 -04:00
Eugene Yokota 705cb472b6 Add previous artifact 2019-10-19 20:02:25 -04:00
Eugene Yokota 6807e91edd Scala 2.12.10 2019-10-19 19:59:13 -04:00
Eugene Yokota e0d2455982 sbt 1.3.3 2019-10-19 19:56:19 -04:00
Eugene Yokota 8aeb43fc11 in-source sbt-houserules 2019-10-19 19:53:11 -04:00
eugene yokota f5358db783
Merge pull request #229 from eed3si9n/wip/nohouse 
in-source sbt-houserules
 2019-10-19 19:28:13 -04:00
Eugene Yokota 6c9120ea62 Bump Scala versions 2019-10-19 19:21:03 -04:00
Eugene Yokota 1e3e726d0b sbt 1.3.3 2019-10-19 19:14:29 -04:00
Eugene Yokota 8c2aef75e4 in-source sbt-houserules 2019-10-19 19:14:16 -04:00
eugene yokota f1f114b15f
Merge pull request #303 from er1c/update-target-java-8 
Update javacOptions to target 1.8 & Add IntelliJ integrationTest/test run configuration
 2019-10-19 17:54:12 -04:00
eugene yokota 832d94739b
Merge pull request #301 from er1c/osx-tests 
Run the full integrationTest/test on OSX
 2019-10-19 17:28:13 -04:00
Eric Peters d7d780e16e Add IntelliJ run configuration for integrationTest/test 2019-10-19 12:21:35 -07:00
Eric Peters b04ecd9427 Update javacOptions to target 1.8 2019-10-19 12:13:08 -07:00
Eric Peters 1249bf4d8e Run the full integrationTest/test on OSX 2019-10-19 11:51:31 -07:00