luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
428 Commits 29 Branches 318 Tags 97 MiB
Commit Graph

428 Commits

Author SHA1 Message Date
Jessica Hamilton 6ffec60e4b
sbt.bat: JAVACMD is not quoted in version check 
This fixes a failed version check for a path containing spaces.
 2018-04-20 11:07:23 +12:00
eugene yokota 7ba36d64b9
Merge pull request #226 from eed3si9n/wip/debug 
forward -debug to sbt
 2018-04-06 22:01:20 -04:00
Eugene Yokota 8727faa8b3 forward -debug to sbt 
`-debug` is a legitimate command since 0.13.13, but it's been impossible to use it because Bash eats it. This allows log level to be set to debug level. (similar to `-warn` setting to warn level)

Ref https://github.com/sbt/sbt/pull/2742
 2018-04-06 08:26:28 -04:00
Dale Wijnand 8350d7ca03
Merge pull request #225 from eed3si9n/wip/jdk10 
Fix Java version detection and comparison for JDK 10
 2018-04-06 10:45:47 +01:00
Eugene Yokota b2fdb7685f Fix Java version detection on Windows 
Fixes https://github.com/sbt/sbt/issues/4055
Adds JDK 10 testing on Windows
 2018-04-06 05:24:07 -04:00
Eugene Yokota a638ad49ac Fix bash number comparison 
This adds JDK 10 and 11 testing on Linux
 2018-04-06 05:23:14 -04:00
Dale Wijnand 77039c2e3b
Merge pull request #222 from analytically/master 
Support SBT 1.1+ for preloading the compiler interface
 2018-03-16 17:46:39 +00:00
Mathias Bogaert 7d826e05d5
Support SBT 1.1+ for preloading the compiler interface 2018-03-16 12:41:26 +01:00
Dale Wijnand 311bb7022c
Merge pull request #220 from ForNeVeR/feature/quotes 
Fix quotes in sbt.bat
 2018-02-19 10:06:55 +00:00
Friedrich von Never 3019b94da0
Fix quotes in sbt.bat 2018-02-17 21:56:09 +07:00
Dale Wijnand 35072a62b0
Merge pull request #219 from eed3si9n/wip/test-mac 
more portable jdk_version function
 2018-02-16 09:57:17 +00:00
Eugene Yokota 21cf71e384 more portable jdk_version function 
I've reimplemented java version detection as a bash function.
This no longer uses grep.
Also this no longer uses `?` in sed, which doesn't work on macOS.

Fixes https://github.com/sbt/sbt/issues/3873
 2018-02-15 23:04:43 -05:00
Eugene Yokota 66b8670c59 Add macOS testing 2018-02-15 23:04:35 -05:00
Dale Wijnand 31b42c0e18
Merge pull request #216 from eed3si9n/wip/travis 
cross JVM testing
 2018-02-15 07:42:28 +00:00
Eugene Yokota 6f1e6c36d9 cross JVM testing 
This continues to use Oracle JDK 8 for building, but adds test jobs using oraclejdk8, oraclejdk9, and oraclejdk10.
 2018-02-15 00:42:01 -05:00
Dale Wijnand b50cc6f342
Merge pull request #215 from 2m/wip-no-decimals-2m 
Use only integers for versions
 2018-02-14 14:21:06 +00:00
Martynas Mickevičius 5a0bde442d
Use only integers for versions 2018-02-14 14:00:36 +02:00
TATSUNO Yasuhiro 06420a7c62 Ignore comment in .jvmopts on Windows (#213) 2018-02-14 09:06:22 +00:00
Dale Wijnand aa574a8f8c
Merge pull request #211 from eatkins/gc-output 
Whitelist java9-rt-ext- output in rt export process
 2018-02-13 13:02:16 +00:00
Dale Wijnand 09cf5cb7e5
Merge pull request #210 from 2m/wip-unfreeze-jdk9-package-2m 
Unfreeze jdk9 appveyor package version
 2018-02-13 12:45:06 +00:00
Martynas Mickevičius 769b3a46a2
Use not-yet-approved package version 2018-02-13 14:30:34 +02:00
Ethan Atkins 09a7152b1d Whitelist java9-rt-ext- output in rt export process 
If -verbose:gc is set, there can be gc log output in this process that
prevents the directory from being properly extracted. Rather than
blacklist possible output strings, I think it makes more sense to
whitelist the specific output line that we're looking for.
 2018-02-12 09:20:30 -08:00
Martynas Mickevičius 3a2a84163e
Unfreeze jdk9 appveyor package version 2018-02-05 13:19:09 +01:00
Dale Wijnand f035626b18
Merge pull request #209 from 2m/wip-handle-jdk-10-version-2m 
Handle JDK 10 version string
 2018-02-05 10:13:58 +00:00
Martynas Mickevičius e15633064b
Handle JDK 10 version string 2018-02-03 18:19:24 +01:00
eugene yokota bf9cd40349
Merge pull request #207 from sbt/wip/windows 
Fix "was unexpected at this time."
 2018-01-08 10:33:12 -05:00
Eugene Yokota 417599b463 Fixing test 2018-01-08 10:17:38 -05:00
Eugene Yokota 3b39ff0554 Use more delayed expansion 
Fixes #206

When I use unzipped sbt.bat it seems to runs ok, but using the msi installer version, this variable seems to expand and causes:

```
\sbt\bin\java9-rt-export.jar was unexpected at this time.
```
 2018-01-08 10:06:04 -05:00
eugene yokota a8b7b5a060
Merge pull request #205 from philwalk/cygfix 
remove invisible carriage-return appended to java_version under cygwin
 2018-01-05 17:14:43 -05:00
Phil 13f2bafdf8 remove invisible carriage-return appended to java_version under cygwin 2018-01-05 14:36:17 -07:00
eugene yokota f66161a14f line up Scala version and JLine 2018-01-05 15:55:14 -05:00
Dale Wijnand 7acc3c1fb9
Merge pull request #204 from sbt/version-memory 
Set both Xms & Xmx when running java -version
 2018-01-04 11:28:32 +00:00
Dale Wijnand 901e5794b8
Set both Xms & Xmx when running java -version 
See the comments in #203.

My choice of minimum memory is basically arbitrary.
 2018-01-04 10:18:18 +00:00
eugene yokota 412709ce50
Merge pull request #203 from marcospereira/fix-java-version-detection 
Remove -Xmx512M flag when detecting java version
 2018-01-04 03:30:25 -05:00
Marcos Pereira f9295a6715
Remove -Xmx512M flag when detecting java version 
The flag can cause problems when there is another configuration
adding -Xms with a value bigger than 512M. The `java -version`
command will fail and no java version will be detected, causing
a failure in `checkJava`.
 2018-01-02 18:15:07 -02:00
Dale Wijnand cb6bae6c45
Merge pull request #202 from sbt/wip/windows2 
Remove double quotes around rtexport
 2017-12-19 07:20:45 +00:00
Eugene Yokota 0e59118ded Remove double quotes around rtexport 
See https://github.com/sbt/sbt/issues/3804#issuecomment-352602666
 2017-12-18 22:27:19 -05:00
Dale Wijnand 8ef10aecf5
Merge pull request #201 from sbt/wip/windows 
Fix "Error: Unable to access jarfile" on Windows + JDK 9
 2017-12-14 12:05:34 +00:00
Eugene Yokota f9b9d082f6 use delayed expansion 
Fixes sbt/sbt#3804

Inside the if, it seems like bunch of variables were set to blank.
Using delayed expansion seems to fix this. This is confirmed by the newly added test.
 2017-12-14 02:30:02 -05:00
Eugene Yokota 49d85750af add test 2017-12-14 02:03:47 -05:00
Eugene Yokota 73bd7a5284 Add AppVeyor settings 2017-12-13 23:40:10 -05:00
eugene yokota 4188199965
Merge pull request #200 from sbt/bat-no-quotes 
Drop quotes in bat script
 2017-12-13 18:56:52 -05:00
Dale Wijnand 6dbf7eb527
Drop quotes in bat script 2017-12-13 23:22:39 +00:00
Dale Wijnand 7d70f0966c
Merge pull request #199 from thatfulvioguy/use-expr-over-bc 
Use expr instead of bc when checking Java versions.
 2017-11-16 16:21:28 +00:00
Fulvio Valente 6ad16c2b74 Use expr instead of bc when checking Java versions. 
Because expr is in coreutils, we can expect it to be present on systems unlike bc.

Fixes #198
Fixes #192
 2017-11-16 15:11:19 +00:00
Dale Wijnand efdc7c90ca
Merge pull request #197 from mkurz/debugFix 
Ignore debug output when getting runtime jar path
 2017-11-16 11:09:17 +00:00
Dale Wijnand 096a0d83b2
Update sbt.build.version in CONTRIBUTING too. 2017-11-16 11:02:18 +00:00
Dale Wijnand 749a1b7f27
Merge pull request #196 from javabrett/add-travis-build-image 
Updated README.md to add a Travis build status image, fixed Travis build
 2017-11-16 11:01:46 +00:00
Brett Randall 8f276e95e0 Set compatible build properties, sbt version (1.0.3) to fix Travis build. Added required fakeroot package. 
Fixed #180.
 2017-11-15 11:38:53 -05:00
Matthias Kurz 006a5eee23
Ignore debug output when getting runtime jar path 2017-11-15 11:55:12 +01:00