luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,635 Commits 23 Branches 320 Tags 104 MiB
Commit Graph

7635 Commits

Author SHA1 Message Date
eugene yokota bb938e761d
Merge pull request #5256 from eatkins/scalafmt 
Bump scalafmt and run on metabuild
 2019-11-30 23:27:52 -05:00
eugene yokota 9a3b7cfc3f
Merge pull request #5257 from eatkins/bump-sbt 
Bump sbt version
 2019-11-30 23:26:37 -05:00
Ethan Atkins 9e02d31fcf
Merge pull request #5255 from eatkins/scripted-exceptions 
Don't print stack trace for pending tests
 2019-11-30 18:10:45 -08:00
Ethan Atkins 8d67593cf5
Merge branch 'develop' into scripted-exceptions 2019-11-30 15:51:53 -08:00
Ethan Atkins d7a191e277 Bump sbt version 2019-11-30 14:59:44 -08:00
Ethan Atkins bb73730c00 Run scalafmtSbt 
Also add scalafmtSbtCheck to travis.
 2019-11-30 14:57:57 -08:00
Ethan Atkins 094d730b06 Bump scalafmt 2019-11-30 14:57:20 -08:00
eugene yokota 181bfe8a46
Merge pull request #5254 from dwijnand/cleanup/Transform 
Cleanup project/Transform.scala
 2019-11-30 17:47:39 -05:00
Ethan Atkins a708cac2a3 Don't print stack trace for pending tests 
This can be very noisy, especially for tests that are marked pending
because they fail to load the build. These induce a lengthy and largely
unhelpful "Reload for batch scripted failed..." error message.
 2019-11-30 13:53:47 -08:00
eugene yokota 5377fb98df
Merge pull request #5251 from steinybot/fix/5250-console-project-scala-2-13 
Fix consoleProject for scala 2.13
 2019-11-29 23:02:12 -05:00
Dale Wijnand 02e26465f7 Cleanup project/Transform.scala 2019-11-28 21:25:49 +00:00
Jason Pickens 71bc3876d9
Scope compiler bridge to consoleProject 2019-11-28 20:29:31 +13:00
Jason Pickens 8c3245d569
Add test to reproduce consoleProject bug 2019-11-28 20:14:49 +13:00
eugene yokota 964f7867b3
Merge pull request #5242 from xuwei-k/update-license-url 
Update license url
 2019-11-23 12:03:10 -05:00
xuwei-k fc94204e8c Update license url 2019-11-23 16:09:13 +09:00
eugene yokota 4c1f7a7548
Merge pull request #5240 from eed3si9n/wip/bumpcoursier 
lm-coursier-shaded 2.0.0-RC5-2
 2019-11-22 15:45:59 -05:00
Eugene Yokota 8f82014e31 mima 2019-11-22 14:37:07 -05:00
Eugene Yokota 0e3f94ea53 lm-coursier-shaded 2.0.0-RC5-2 
Fixes #5132
Fixes #4706
Fixes #4688
 2019-11-22 14:00:48 -05:00
eugene yokota b18140c14b
Merge pull request #5182 from eed3si9n/wip/nolub 
apply -Yno-lub
 2019-11-22 11:01:54 -05:00
eugene yokota c45e991c6b
Merge pull request #5229 from eed3si9n/wip/addPluginSbtFile 
addPluginSbtFile command fixes
 2019-11-21 17:02:02 -05: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
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 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
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 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
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
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
eugene yokota 066307998f
Merge pull request #5164 from eatkins/nio-overrides 
Don't overwrite nio build settings with injected settings
 2019-10-14 01:17:35 -04:00
Eugene Yokota 54b3405f42 apply -Yno-lub 
To demonstrate [-Yno-lub](http://eed3si9n.com/stricter-scala-with-ynolub), this shows the code changes that removes lubing (Not all subprojects are done).

After I made the changes, I switched the Scala back to normal 2.12.10.
 2019-10-13 23:46:23 -04:00
Ethan Atkins d698d6dcdd Don't overwrite nio build settings with injected settings 
The current injection of the new nio keys will overwrite any definitions
of those keys in a build source. This is undesirable. The fix is to
create a mapping of scoped keys to settings and for each inject setting
key, if there is a previous key, put that definition after the injected
definition so that it can override it.
 2019-10-08 09:47:59 -07:00
Ethan Atkins d3921d07ce
Merge pull request #5156 from eatkins/task-timing-logger 
Improve task timing output and supershell thread management
 2019-10-07 11:56:53 -07:00