diff --git a/build.sbt b/build.sbt index 1f2427b8f..e82f2c050 100644 --- a/build.sbt +++ b/build.sbt @@ -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 diff --git a/launcher-package/build.sbt b/launcher-package/build.sbt index 33a605a6e..84e74ea93 100755 --- a/launcher-package/build.sbt +++ b/launcher-package/build.sbt @@ -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" diff --git a/project/Utils.scala b/project/Utils.scala index 9c7113268..270f16fd8 100644 --- a/project/Utils.scala +++ b/project/Utils.scala @@ -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 := {}, diff --git a/sbt b/sbt index 3631d4ead..7f10695c0 100755 --- a/sbt +++ b/sbt @@ -26,7 +26,7 @@ declare use_sbtn= declare use_jvm_client= declare no_server= declare sbtn_command="$SBTN_CMD" -declare sbtn_version="1.12.5" +declare sbtn_version="2.0.0-RC13" declare use_colors=1 declare is_this_dir_sbt="" declare hide_jdk_warnings=1