Commit Graph

12458 Commits

Author SHA1 Message Date
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
Eugene Yokota 9471fab91b Remove debug echo 2019-10-16 13:18:58 -04:00
Eugene Yokota 689fdd682a remove unnecessary /I 2019-10-16 12:00:47 -04:00
eugene yokota 3953c80c73
Update src/universal/bin/sbt.bat
Co-Authored-By: Eric Peters <eric@peters.org>
2019-10-16 11:56:43 -04:00
eugene yokota 7d7e01015f
Update src/universal/bin/sbt.bat
Co-Authored-By: Eric Peters <eric@peters.org>
2019-10-16 11:54:22 -04:00
Eugene Yokota 00e5224fde Add debugging for -D parsing 2019-10-16 10:53:49 -04:00
Eric Peters 6ebad1cffc Add a test for -D arguments (e.g. -Dsbt.supershell=false) 2019-10-16 10:49:59 -04:00
Eugene Yokota 71a216c037 Fix -D with quotes
Fixe https://github.com/sbt/sbt/issues/5192
2019-10-16 10:48:11 -04:00
Eugene Yokota 546a8b8949 Fix verbose output for SBT_ARGS 2019-10-16 10:45:33 -04:00
eugene yokota cbe96663e2
Merge pull request #298 from sbt/eed3si9n-patch-1
Fix typo around continue/quit
2019-10-15 12:51:49 -04:00
eugene yokota ab001f5597
Fix typo around continue/quit
Fixes https://github.com/sbt/sbt/issues/5188
2019-10-15 12:21:07 -04:00
eugene yokota d43357144b
Merge pull request #297 from eed3si9n/wip/bump
bump JAnsi
2019-10-14 10:29:14 -04:00
Eugene Yokota c2bac898df bump JAnsi 2019-10-14 02:59:34 -04: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
eugene yokota 2c8fc74aec
Merge pull request #296 from er1c/debug-inc-usage
Add usage for --debug-inc to bash sbt, add impl to sbt.bat
2019-10-11 23:27:47 +02:00
Eric Peters f3b9d7572e Add usage for --debug-inc to bash sbt, add impl to sbt.bat 2019-10-11 09:49:43 -07:00
eugene yokota 4f7d84d999
Merge pull request #285 from er1c/sbt-bat
Update sbt.bat to match bash sbt command line usage
2019-10-10 06:14:03 +02:00
Eric Peters b5fd78f74b Intial sbt.bat refactor to match the universal bash script - implement --help, --verbose, --version, --script-verion, --numeric-version, .sbtopts, .jvmopts, -D 2019-10-09 19:47:49 -07:00
Alex Zolotko a9d85c6df6 Detect more memory settings
Fixes sbt/sbt#5135
2019-10-09 19:47:45 -07:00
Eric Peters d272ab1a1f Fix No compatible version found for adopt@1.8.212-04 2019-10-09 19:47:44 -07: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 166511c992
Merge pull request #227 from eatkins/delete-line-count
Don't include DeleteLine in progress length
2019-10-07 15:13:03 -07:00