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

408 Commits

Author SHA1 Message Date
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
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
Dale Wijnand 320d993fa6
Merge pull request #195 from javabrett/refer-jdk-not-jre 
Changed references to downloading/installing/updating Java (JRE?) to …
 2017-11-13 11:50:02 +00:00
Brett Randall 602b138771
Updated README.md to add a Travis build status image 2017-11-12 16:15:58 -08:00
Brett Randall da02335261 Changed references to downloading/installing/updating Java (JRE?) to refer to JDK. 
Updated download URLs. Fixed #115.
 2017-11-10 19:48:05 +00:00
Dale Wijnand 30a5038b71
Merge pull request #191 from twm/bd-dep 
Add bc dependency in Debian/Ubuntu package
 2017-10-30 16:51:08 +00:00
Tom Most eb69920e81 Add bc dependency in Debian/Ubuntu package 2017-10-27 19:49:11 -07:00
eugene yokota c7fc2c9247 Merge pull request #189 from stringbean/java9-gc 
Set -XX:+UseParallelGC on Java 9
 2017-09-28 19:20:21 -04:00
Michael Stringer 97f38b5a1d
Set -XX:+UseParallelGC on Java 9 2017-09-28 20:00:33 +01:00
eugene yokota 470da7bd9e Merge pull request #182 from smarter/java10 
Support Java 10
 2017-09-26 18:32:55 -04:00
eugene yokota bc00a5490c Merge pull request #187 from timcharper/patch-1 
OS X compatible line-ending stripping
 2017-09-26 18:32:22 -04:00
Tim Harper d251388f53 OS X compatible line-ending stripping 
BSD sed interprets sed 's/\r//' as "replace the literal letter r". A more compatible approach delegates the interpretation of this sequence to bash.

Fixes #186
 2017-09-26 15:30:03 -06:00
Dale Wijnand c0b961c5c3 Merge pull request #183 from SethTisue/upgrade-bintray-plugin 
use newer version of bintray plugin
 2017-09-25 11:34:27 +01:00
Seth Tisue 66a105eb03 use newer version of bintray plugin 
for Scala community build friendliness.  but also just
generally a good thing
 2017-09-24 19:45:18 -07:00
Guillaume Martres 32e8859df6 Support Java 10 
In bash, "10" < "1.6" returns false, because it's a string comparison.
Use bc instead to compare decimal numbers.
 2017-09-19 13:33:07 +02:00
eugene yokota e310735202 Merge pull request #166 from steinybot/wip/sbtopts-crlf 
Remove carriage return characters when loading configuration files.
 2017-09-18 12:55:58 -04:00
eugene yokota 206ccb675a Merge branch 'master' into wip/sbtopts-crlf 2017-09-18 12:55:40 -04:00
Eugene Yokota 9eeb402a15 Reset build number to 0 2017-08-29 17:34:24 -04:00
eugene yokota 3696f8aad4 Merge pull request #179 from yurique/etc-sbtopts 
Use /etc/sbt/sbtopts file if exists.
 2017-08-25 23:30:56 -04:00
Iurii Malchenko 3d194ebdbe Use /etc/sbt/sbtopts file if exists. 2017-08-26 02:23:26 +03:00
eugene yokota 1be80c06ee Merge pull request #177 from sbt/wip/about 
Don't run sbt about as post install
 2017-08-16 01:23:45 -04:00
Eugene Yokota 70aceedad7 Don't run sbt about as post install. 
Fixes sbt/sbt#3448
Fixes #176
 2017-08-16 01:22:22 -04:00