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

[1.x] Bump sbtn to 2.0.0-RC13 (#9139)

This commit is contained in:
eugene yokota 2026-04-27 01:01:00 -04:00 committed by GitHub
parent 0a4bdae464
commit b41ca564f6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sbt
View File

@ -14,6 +14,8 @@ ThisBuild / version := {
val v = "1.12.3-SNAPSHOT" val v = "1.12.3-SNAPSHOT"
nightlyVersion.getOrElse(v) nightlyVersion.getOrElse(v)
} }
// update sbt.sh at root
ThisBuild / Util.sbtnVersion := "2.0.0-RC13"
ThisBuild / version2_13 := "2.0.0-SNAPSHOT" ThisBuild / version2_13 := "2.0.0-SNAPSHOT"
ThisBuild / versionScheme := Some("early-semver") ThisBuild / versionScheme := Some("early-semver")
ThisBuild / scalafmtOnCompile := !(Global / insideCI).value ThisBuild / scalafmtOnCompile := !(Global / insideCI).value

5
launcher-package/build.sbt
View File

@ -49,7 +49,6 @@ val sbtLaunchJarUrl = SettingKey[String]("sbt-launch-jar-url")
val sbtLaunchJarLocation = SettingKey[File]("sbt-launch-jar-location") 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 sbtnJarsMappings = TaskKey[Seq[(File, String)]]("sbtn-jars-mappings", "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")
@ -131,12 +130,10 @@ val launcherPackage = (project in file(".")).
// TODO - GPG Trust validation. // TODO - GPG Trust validation.
file file
}, },
// update sbt.sh at root
sbtnVersion := "1.12.1",
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 = Util.sbtnVersion.value
val macosUniversalImageTar = s"sbtn-$universalMacPlatform-$v.tar.gz" val macosUniversalImageTar = s"sbtn-$universalMacPlatform-$v.tar.gz"
val linuxX86ImageTar = s"sbtn-$x86LinuxPlatform-$v.tar.gz" val linuxX86ImageTar = s"sbtn-$x86LinuxPlatform-$v.tar.gz"
val linuxAarch64ImageTar = s"sbtn-$aarch64LinuxPlatform-$v.tar.gz" val linuxAarch64ImageTar = s"sbtn-$aarch64LinuxPlatform-$v.tar.gz"

1
project/Util.scala
View File

@ -9,6 +9,7 @@ object Util {
val componentID: SettingKey[Option[String]] = settingKey[Option[String]]("") val componentID: SettingKey[Option[String]] = settingKey[Option[String]]("")
val scalaKeywords: TaskKey[Set[String]] = taskKey[Set[String]]("") val scalaKeywords: TaskKey[Set[String]] = taskKey[Set[String]]("")
val generateKeywords: TaskKey[File] = taskKey[File]("") val generateKeywords: TaskKey[File] = taskKey[File]("")
val sbtnVersion = SettingKey[String]("sbtn-version")
def noPublishSettings: Seq[Setting[_]] = Seq(publish := {}) def noPublishSettings: Seq[Setting[_]] = Seq(publish := {})

2
sbt
View File

@ -25,7 +25,7 @@ declare use_sbtn=
declare use_jvm_client= declare use_jvm_client=
declare no_server= declare no_server=
declare sbtn_command="$SBTN_CMD" declare sbtn_command="$SBTN_CMD"
declare sbtn_version="1.12.5" declare sbtn_version="2.0.0-RC13"
declare use_colors=1 declare use_colors=1
declare is_this_dir_sbt="" declare is_this_dir_sbt=""
declare hide_jdk_warnings=1 declare hide_jdk_warnings=1