Commit Graph

8979 Commits

Author SHA1 Message Date
Ethan Atkins 19fcd3011d
Merge pull request #5371 from eatkins/javafmt
Apply google java formatting to sbt java source files
2020-01-14 15:11:00 -08:00
Ethan Atkins cf745255e8 Apply javafmt in sbt project 2020-01-14 14:38:08 -08:00
Ethan Atkins 813864ec0f Add swoval java formatting plugin
The swoval javafmt plugin uses the google java formatter (which I
believe is the only widely used java formatter) to format source files.
It does not provide an automatic javafmtOnCompile method like the
scalafmt plugin so I had to manually implement that functionality. In
general the java formatter is much faster than scalafmt so the impact of
having javafmtOnCompile set to true is very low.
2020-01-14 14:20:23 -08:00
eugene yokota f1370a25fe
Merge pull request #5363 from eatkins/doc-linter
Use implicit val rather than import
2020-01-13 18:46:29 -05:00
eugene yokota e180c43dd3
Merge pull request #5362 from eatkins/doc-last-modified
Don't use last modified time of directories in doc
2020-01-13 18:45:56 -05:00
Ethan Atkins c5f0ee0e59 Don't use last modified time of directories in doc
I noticed that sbt does a _lot_ of no-op docs in the sbt project.
Through some debugging, I determined that this was because the target
directory last modified time of some of the dependent projects would
change between runs. I'm not really sure why that was happening but
instead of computing the last modified time of the directory, we should
be checking the last modified time of the directory contents.

After this change a no-op `doc` in the sbt project returns in less than
one second on my mac. Before, it was more like 25-60 seconds (the upper
bound is one runs `doc` because `sbtRoot/doc` takes about a minute).
2020-01-13 13:11:09 -08:00
Ethan Atkins 11174fb382 Use implicit val rather than import
This import was causing an unused import warning during doc.
2020-01-13 10:25:34 -08:00
eugene yokota 27531c5d29
Merge pull request #5365 from eatkins/scalafmt-bump
Upgrade scalafmt
2020-01-13 12:16:11 -05:00
Ethan Atkins adfdb945f8 Upgrade scalafmt
Intellij has problems with older versions of scalafmt (see
https://github.com/scalameta/scalafmt/issues/1630). Not sure if this a
scalafmt issue or an intellij issue. I pinned the edition to October
2019 to avoid reformatting tons of files. Once development stabilizes,
we may wish to drop the edition but, for now, it's disruptive to change
the formatting.
2020-01-12 13:52:10 -08:00
eugene yokota 57543fc59a
Merge pull request #5361 from eatkins/no-escape
Cleanup scripted quotation mark parsing
2020-01-11 20:36:09 -05:00
Ethan Atkins b9231a49cc Don't add extra quotation marks in scripted commands
Scripted automatically adding quotation marks when an argument contains
spaces breaks arguments that already were wrapped in quotations. The
scripted test should be responsible for its own escaping. Since this is
part of scripted-sbt-redux, we don't have to worry about downstream
builds relying on the old escaping behavior.
2020-01-11 16:51:46 -08:00
Ethan Atkins 639b812a01 Don't strip quotes in _sbt_ scripted command arguments
Stripping quotation marks makes it impossible to cleanly test certain
sbt features without resorting to weird hacks. For example:
> set Compile / scalacOptions += "-Xfatal-warnings"
did not work while
> set Compile / scalacOptions += '"-Xfatal-warnings"'
did.

I leave the single quote parser unchanged since single quotes are not
really used in sbt and so there is utility in leaving them as a way to
group arguments that should not be split apart.

This change should only affect the scripted tests in the sbt repo. We
can consider making stripQuotes = false the default for the plugin as
well.
2020-01-11 16:50:22 -08:00
eugene yokota 3d510e27ad
Merge pull request #5354 from eed3si9n/wip/bumpcoursier
lm-coursier-shaded 2.0.0-RC5-3
2020-01-09 16:16:02 -05:00
eugene yokota f96652bc4c
Merge pull request #5355 from eed3si9n/wip/repo-override
Update repo override test
2020-01-09 15:28:01 -05:00
Eugene Yokota f94aa19643 Update repo override test
Fixes https://github.com/sbt/sbt/issues/5335
2020-01-09 14:47:55 -05:00
eugene yokota 9b931c4bf8
Merge pull request #5350 from mrArkwright/fix-4451
introduce SysProp sbt.testing.legacyreport
2020-01-09 13:30:24 -05:00
eugene yokota 6257d90ddc
Merge pull request #5353 from eatkins/run-main-supershell
Add runMain to supershell blacklist
2020-01-09 13:29:51 -05:00
Eugene Yokota 9d857d3d95 lm-coursier-shaded 2.0.0-RC5-3
Fixes https://github.com/sbt/sbt/issues/5333
Fixes https://github.com/sbt/sbt/issues/5324
Fixes https://github.com/sbt/sbt/issues/5268
Ref https://github.com/sbt/sbt/issues/5282
2020-01-09 13:14:04 -05:00
eugene yokota 990ef8af82
Merge pull request #5351 from eed3si9n/wip/warnings
reduce compiler warnings
2020-01-09 12:59:56 -05:00
Ethan Atkins ccce238b16 Add runMain to supershell blacklist
See https://github.com/sbt/sbt/issues/5352.
2020-01-08 10:52:26 -08:00
Eugene Yokota 36a16673c0 reduce compiler warnings 2020-01-08 09:41:29 -05:00
Jannik Theiß af245d2494 SysProp sbt.testing.legacyreport: fix integration tests, JUnitXmlTestsListener backward binary compatibility 2020-01-08 15:29:48 +01:00
Jannik Theiß cea516175f introduce SysProp sbt.testing.legacyreport
either create test reports with legacy file names (legacyreport=true) or with standard file names (legacyreport=false or omitted) but not both as suggested in #4451
2020-01-08 12:23:09 +01:00
eugene yokota b37bad6644
Merge pull request #5347 from eed3si9n/fport/clearbanner
[fport] clear banner
2019-12-31 23:34:30 -05:00
Eugene Yokota 3be047d050 clear banner 2019-12-31 21:38:28 -05:00
eugene yokota 214ae747a8
Merge pull request #5346 from eed3si9n/wip/nightly2
some adjustments to the scripted tests
2019-12-30 07:24:13 -05:00
eugene yokota 8dfce72a2e
Merge pull request #5345 from eed3si9n/wip/bridge
Fix Zinc component compiler to respect -Dsbt.ivy.home
2019-12-30 06:38:38 -05:00
Eugene Yokota 4f01fef477 some adjustments to the scripted tests
some minor adjustments to make it work on Jenkins.
2019-12-30 06:37:46 -05:00
Eugene Yokota 4d8c8b8e34 Forward -Dsbt.ivy.home 2019-12-30 04:58:21 -05:00
Eugene Yokota f5090cf70f Fix Zinc component compiler to respect -Dsbt.ivy.home
This is currently blocking the new nightly process.
2019-12-29 16:55:38 -05:00
eugene yokota 73b4d4b158
Merge pull request #5328 from dwijnand/message-reboot
Revert "clarify message on sbt.version mismatch"
2019-12-29 03:06:09 -05:00
eugene yokota bf9225bccf
Merge pull request #5344 from eed3si9n/wip/repeatable
Don't emit timestamps when packaging to jar, take 2
2019-12-29 02:58:53 -05:00
Arnout Engelen 989a37a776 Update sbt.io to 1.4.0-M2 2019-12-29 02:31:21 -05:00
eugene yokota 5aed0bb06d
Merge pull request #5340 from eed3si9n/wip/bumpsbt
sbt 1.3.6
2019-12-27 17:15:13 -05:00
Eugene Yokota a8ab4ada68 Replace getResource("") trick
Fixes https://github.com/sbt/sbt/issues/5339

It seems like some tests are using `ClassLoader#getResource("")` to acquire the `classes` directory path. This does not seem to work on sbt 1.3.6, which returns `file:/home/travis/.cache/coursier/v1/https/repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api/2.11.2/log4j-api-2.11.2.jar!/META-INF/versions/9/`. To workaround this issue, I've switched to loading the known folder name instead.
2019-12-27 16:43:20 -05:00
eugene yokota 19cf7a4da0
Merge pull request #5341 from eed3si9n/wip/publishto
customize publishTo for nightlies
2019-12-27 02:48:37 -05:00
Eugene Yokota b18876b1f5 customize publishTo for nightlies 2019-12-27 02:43:46 -05:00
Eugene Yokota d21d698e96 sbt 1.3.6 2019-12-27 01:51:25 -05:00
eugene yokota 9400225fe9
Merge pull request #5338 from eed3si9n/wip/aggregate
add aggregate projects for lower utils and upper modules
2019-12-27 01:45:28 -05:00
Eugene Yokota 80aeb7eed9 add aggregate project for lower utils and upper modules 2019-12-27 00:24:03 -05:00
Dale Wijnand f5e73b610a Keep "using" change in sbt.version mismatch messaging. 2019-12-26 08:28:06 +00:00
eugene yokota cba3843965
Merge pull request #5329 from eatkins/cross-serial
Run cross commands (with `+`) in parallel when possible
2019-12-24 12:56:25 -05:00
Arnout Engelen 1d0a415200 SOURCE_DATE_EPOCH is in seconds, let's pass milliseconds 2019-12-24 10:11:09 +01:00
Arnout Engelen 4353098454 Target develop branch of io, support SOURCE_DATE_EPOCH 2019-12-24 10:11:09 +01:00
Arnout Engelen ceb28a0a41 Target 1.4.0 2019-12-24 10:11:09 +01:00
Arnout Engelen 52b72a7e14 Target 1.4.0 2019-12-24 10:11:09 +01:00
Arnout Engelen 21533863da Don't emit timestamps when packaging to jar
This makes the build more deterministic.
2019-12-24 10:11:09 +01:00
Ethan Atkins d445590d9d Fix cross multi command performance
In 53788ba356, I changed the cross multi
parser to issue all of the commands sequentially. This caused a
performance regression for many use cases:
https://github.com/sbt/sbt/issues/5321. This commit restores the old
behavior of `+` if the command to run has no arguments.
2019-12-23 14:45:57 -08:00
Ethan Atkins 4207362835 Upgrade scala 2.13 version in scripted tests 2019-12-23 14:45:57 -08:00
Dale Wijnand 56aa46308b Revert "clarify message on sbt.version mismatch"
This reverts commit 2f4b6f476a.
2019-12-23 22:25:37 +00:00