luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6039 from eed3si9n/wip/bumpzinc 

Zinc 1.4.2
This commit is contained in:
eugene yokota 2020-11-01 22:06:01 -05:00 committed by GitHub
parent 4a2aaabb9b c5fd92959f
commit ded2787f23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.appveyor.yml
View File

@ -84,7 +84,7 @@ for:
- path: client\target\bin\sbtn.exe - path: client\target\bin\sbtn.exe
name: sbtn.exe name: sbtn.exe
install: install:
- cinst jdk8 -params 'installdir=C:\\jdk8' - cinst adoptopenjdk8 -params 'installdir=C:\\jdk8'
- SET CI=true - SET CI=true
#- choco install windows-sdk-7.1 kb2519277 #- choco install windows-sdk-7.1 kb2519277
- call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" - call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd"
@ -132,7 +132,7 @@ for:
except: except:
- build-graal - build-graal
install: install:
- cinst jdk8 -params 'installdir=C:\\jdk8' - cinst adoptopenjdk8 -params 'installdir=C:\\jdk8'
- SET JAVA_HOME=C:\jdk8 - SET JAVA_HOME=C:\jdk8
- SET PATH=C:\jdk8\bin;%PATH% - SET PATH=C:\jdk8\bin;%PATH%
- SET CI=true - SET CI=true

2
project/Dependencies.scala
View File

@ -14,7 +14,7 @@ object Dependencies {
private val ioVersion = nightlyVersion.getOrElse("1.4.0") private val ioVersion = nightlyVersion.getOrElse("1.4.0")
private val lmVersion = private val lmVersion =
sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.4.0") sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.4.0")
val zincVersion = nightlyVersion.getOrElse("1.4.1") val zincVersion = nightlyVersion.getOrElse("1.4.2")
private val sbtIO = "org.scala-sbt" %% "io" % ioVersion private val sbtIO = "org.scala-sbt" %% "io" % ioVersion

1
sbt/project/build.properties Normal file
View File

@ -0,0 +1 @@
sbt.version=1.4.0