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

Merge pull request #331 from eed3si9n/wip/bump 

Update sbtn
This commit is contained in:
eugene yokota 2020-09-23 15:16:50 -04:00 committed by GitHub
parent 80f8323234 adbd541c97
commit ea440e5987
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.sbt
View File

@ -42,7 +42,7 @@ val sbtLaunchJarLocation = SettingKey[File]("sbt-launch-jar-location")
val sbtLaunchJar = TaskKey[File]("sbt-launch-jar", "Resolves SBT launch jar") val sbtLaunchJar = TaskKey[File]("sbt-launch-jar", "Resolves SBT launch jar")
val moduleID = (organization) apply { (o) => ModuleID(o, "sbt", sbtVersionToRelease) } val moduleID = (organization) apply { (o) => ModuleID(o, "sbt", sbtVersionToRelease) }
val sbtnVersion = SettingKey[String]("sbtn-version") val sbtnVersion = SettingKey[String]("sbtn-version")
val sbtnJarsMappings = TaskKey[Seq[(File, String)]]("sbtn-jars", "Resolves sbtn JARs") val sbtnJarsMappings = TaskKey[Seq[(File, String)]]("sbtn-jars-mappings", "Resolves sbtn JARs")
val sbtnJarsBaseUrl = SettingKey[String]("sbtn-jars-base-url") val sbtnJarsBaseUrl = SettingKey[String]("sbtn-jars-base-url")
lazy val bintrayDebianUrl = settingKey[String]("API point for Debian packages") lazy val bintrayDebianUrl = settingKey[String]("API point for Debian packages")
@ -109,14 +109,14 @@ val root = (project in file(".")).
// TODO - GPG Trust validation. // TODO - GPG Trust validation.
file file
}, },
sbtnVersion := "1.4.0-M2", sbtnVersion := "1.4.0-RC2",
sbtnJarsBaseUrl := "https://github.com/sbt/sbtn-dist/releases/download", sbtnJarsBaseUrl := "https://github.com/sbt/sbtn-dist/releases/download",
sbtnJarsMappings := { sbtnJarsMappings := {
val baseUrl = sbtnJarsBaseUrl.value val baseUrl = sbtnJarsBaseUrl.value
val v = sbtnVersion.value val v = sbtnVersion.value
val macosImageTar = s"sbtn-darwin-amd64-$v.tar.gz" val macosImageTar = s"sbtn-$x86MacPlatform-$v.tar.gz"
val linuxImageTar = s"sbtn-linux-amd64-$v.tar.gz" val linuxImageTar = s"sbtn-$x86LinuxPlatform-$v.tar.gz"
val windowsImageZip = s"sbtn-windows-amd64-$v.zip" val windowsImageZip = s"sbtn-$x86WindowsPlatform-$v.zip"
val t = target.value val t = target.value
val macosTar = t / macosImageTar val macosTar = t / macosImageTar
val linuxTar = t / linuxImageTar val linuxTar = t / linuxImageTar

2
citest/project/build.properties
View File

@ -1 +1 @@
sbt.version=1.4.0-RC1 sbt.version=1.4.0-RC2