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

11930 Commits

Author SHA1 Message Date
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
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 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 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 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 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
Filipe Regadas 66da2f5926
Merge branch 'develop' into fix/5110 2019-10-19 15:27:34 +01:00
eugene yokota 8d9c28c587
Merge pull request #5203 from regadas/fix/settings-type 
Add explicit return type to plugin settings
 2019-10-19 09:55:10 -04:00
Filipe Regadas 562eae2bff
Add explicit return type to plugin settings 2019-10-19 09:38:54 +01:00
Filipe Regadas d49ced04da
Bump semanticdbVersio to 4.2.3 2019-10-19 09:09:36 +01:00
Filipe Regadas 46b6ad0171
Bump semanticdbVersio to 4.2.4 2019-10-18 21:39:13 +01:00
Filipe Regadas 0ef5b578f8
Fix MiMa 2019-10-18 18:39:39 +01:00
Filipe Regadas 8afadce715
Merge branch 'develop' into fix/5110 2019-10-18 16:48:57 +01:00
Filipe Regadas a451200bad
Fix #5110: allow semanticdbVersion override 2019-10-18 16:48:36 +01:00
eugene yokota 295c159bc5
Merge pull request #5195 from regadas/fix/5193 
Fix sbt startup when running sbt-allsources.sh
 2019-10-18 10:53:00 -04:00
Filipe Regadas ae7614285b
Merge branch 'develop' into fix/5193 2019-10-17 22:32:21 +01:00
Filipe Regadas 4dced81408
Fix MiMa 2019-10-17 22:27:43 +01:00
eugene yokota e4ee8d4a7f
Merge pull request #5197 from jsoref/patch-1 
Remove excess quotation mark
 2019-10-17 15:47:47 -04:00
Josh Soref c7bf1a37f2
Remove excess quotation mark 2019-10-17 14:19:20 -04:00
eugene yokota ead69fe395
Merge pull request #300 from eed3si9n/wip/d 
Fix -D with quotes
 2019-10-16 15:23:47 -04:00
Filipe Regadas cb46943cec
Fix librarymanagement project Id 2019-10-16 19:27:32 +01:00
Filipe Regadas 9cdf5957ed
Add sbt-mima-plugin 2019-10-16 19:27:11 +01:00