[1.x] sbtn 2.0.0-f0d2fae4 (#9334)

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 {

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"

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")
 

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