From d3a88f58b4bf56bf0fd7fb58d69675f217f73acf Mon Sep 17 00:00:00 2001 From: eugene yokota Date: Sun, 14 Jun 2026 01:32:30 -0400 Subject: [PATCH] [1.x] sbtn 2.0.0-f0d2fae4 (#9334) --- build.sbt | 12 ++++++------ launcher-package/build.sbt | 2 +- project/{Util.scala => Utils.scala} | 2 +- sbt | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) rename project/{Util.scala => Utils.scala} (99%) diff --git a/build.sbt b/build.sbt index 5e082bb3c..00538b25e 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,5 @@ import Dependencies._ -import Util._ +import Utils._ import com.typesafe.tools.mima.core.ProblemFilters._ import com.typesafe.tools.mima.core._ import local.Scripted @@ -15,7 +15,7 @@ ThisBuild / version := { nightlyVersion.getOrElse(v) } // update sbt.sh at root -ThisBuild / Util.sbtnVersion := "2.0.0-RC14" +ThisBuild / Utils.sbtnVersion := "2.0.0-f0d2fae4" ThisBuild / version2_13 := "2.0.0-SNAPSHOT" ThisBuild / versionScheme := Some("early-semver") ThisBuild / scalafmtOnCompile := !(Global / insideCI).value @@ -79,7 +79,7 @@ def commonBaseSettings: Seq[Setting[?]] = Def.settings( resolvers ++= Resolver.sonatypeOssRepos("snapshots"), testFrameworks += TestFramework("hedgehog.sbt.Framework"), testFrameworks += TestFramework("verify.runner.Framework"), - Global / concurrentRestrictions += Util.testExclusiveRestriction, + Global / concurrentRestrictions += testExclusiveRestriction, Test / testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-w", "1"), Test / testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-verbosity", "2"), compile / javacOptions ++= Seq("-Xlint", "-Xlint:-serial"), @@ -212,10 +212,10 @@ lazy val sbtRoot: Project = (project in file(".")) |!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!""".stripMargin else "") }, - Util.baseScalacOptions, + Utils.baseScalacOptions, Docs.settings, scalacOptions += "-Ymacro-expand:none", // for both sxr and doc - Util.publishPomSettings, + Utils.publishPomSettings, otherRootSettings, publish := {}, publishLocal := {}, @@ -272,7 +272,7 @@ val collectionProj = (project in file("internal") / "util-collection") .settings( testedBaseSettings, utilCommonSettings, - Util.keywordsSettings, + keywordsSettings, name := "Collections", libraryDependencies ++= Seq(sjsonNewScalaJson.value), libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match { diff --git a/launcher-package/build.sbt b/launcher-package/build.sbt index 6347ebc74..9a229e833 100755 --- a/launcher-package/build.sbt +++ b/launcher-package/build.sbt @@ -133,7 +133,7 @@ val launcherPackage = (project in file(".")). sbtnJarsBaseUrl := "https://github.com/sbt/sbtn-dist/releases/download", sbtnJarsMappings := { val baseUrl = sbtnJarsBaseUrl.value - val v = Util.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/Util.scala b/project/Utils.scala similarity index 99% rename from project/Util.scala rename to project/Utils.scala index 5f0b4519e..b75ac6713 100644 --- a/project/Util.scala +++ b/project/Utils.scala @@ -2,7 +2,7 @@ import scala.util.control.NonFatal import sbt._ import Keys._ -object Util { +object Utils { val version2_13 = settingKey[String]("version number") val ExclusiveTest: Tags.Tag = Tags.Tag("exclusive-test") diff --git a/sbt b/sbt index 13965d8c5..628a0a50a 100755 --- a/sbt +++ b/sbt @@ -25,7 +25,7 @@ declare use_sbtn= declare use_jvm_client= declare no_server= declare sbtn_command="$SBTN_CMD" -declare sbtn_version="2.0.0-RC14" +declare sbtn_version="2.0.0-f0d2fae4" declare use_colors=1 declare is_this_dir_sbt="" declare hide_jdk_warnings=1