mirror of https://github.com/sbt/sbt.git
[2.x] Bump sbtn to 2.0.0-RC13 (#9140)
This commit is contained in:
parent
64463535ca
commit
5b9553af9e
|
|
@ -11,9 +11,11 @@ import com.eed3si9n.jarjarabrams.ModuleCoordinate
|
|||
// ThisBuild settings take lower precedence,
|
||||
// but can be shared across the multi projects.
|
||||
ThisBuild / version := {
|
||||
val v = "2.0.0-RC9-bin-SNAPSHOT"
|
||||
val v = "2.0.0-RC13-bin-SNAPSHOT"
|
||||
nightlyVersion.getOrElse(v)
|
||||
}
|
||||
// update sbt.sh at root
|
||||
ThisBuild / Utils.sbtnVersion := "2.0.0-RC13"
|
||||
ThisBuild / versionScheme := Some("early-semver")
|
||||
ThisBuild / scalafmtOnCompile := !(Global / insideCI).value
|
||||
ThisBuild / Test / scalafmtOnCompile := !(Global / insideCI).value
|
||||
|
|
|
|||
|
|
@ -56,7 +56,6 @@ val sbtLaunchJarUrl = SettingKey[String]("sbt-launch-jar-url")
|
|||
val sbtLaunchJarLocation = SettingKey[File]("sbt-launch-jar-location")
|
||||
val sbtLaunchJar = TaskKey[File]("sbt-launch-jar", "Resolves SBT launch jar")
|
||||
val moduleID = (organization) apply { (o) => ModuleID(o, "sbt", sbtVersionToRelease) }
|
||||
val sbtnVersion = SettingKey[String]("sbtn-version")
|
||||
val sbtnJarsMappings = TaskKey[Seq[(File, String)]]("sbtn-jars-mappings", "Resolves sbtn JARs")
|
||||
val sbtnJarsBaseUrl = SettingKey[String]("sbtn-jars-base-url")
|
||||
|
||||
|
|
@ -144,12 +143,10 @@ val launcherPackage = (project in file("."))
|
|||
// TODO - GPG Trust validation.
|
||||
file
|
||||
},
|
||||
// update sbt.sh at root
|
||||
sbtnVersion := "1.12.1",
|
||||
sbtnJarsBaseUrl := "https://github.com/sbt/sbtn-dist/releases/download",
|
||||
sbtnJarsMappings := {
|
||||
val baseUrl = sbtnJarsBaseUrl.value
|
||||
val v = sbtnVersion.value
|
||||
val v = Utils.sbtnVersion.value
|
||||
val macosUniversalImageTar = s"sbtn-$universalMacPlatform-$v.tar.gz"
|
||||
val linuxX86ImageTar = s"sbtn-$x86LinuxPlatform-$v.tar.gz"
|
||||
val linuxAarch64ImageTar = s"sbtn-$aarch64LinuxPlatform-$v.tar.gz"
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ object Utils {
|
|||
val componentID: SettingKey[Option[String]] = settingKey[Option[String]]("")
|
||||
val scalaKeywords: TaskKey[Set[String]] = taskKey[Set[String]]("")
|
||||
val generateKeywords: TaskKey[File] = taskKey[File]("")
|
||||
val sbtnVersion = SettingKey[String]("sbtn-version")
|
||||
|
||||
lazy val noPublish = Seq(
|
||||
publish := {},
|
||||
|
|
|
|||
Loading…
Reference in New Issue