From a62c3d62f4fcd17e9f824497fb2af21739f214fc Mon Sep 17 00:00:00 2001 From: eugene yokota Date: Thu, 27 Aug 2026 01:44:57 -0400 Subject: [PATCH] [2.x] Scala 3.9.0 (#9439) Use Scala 3.9.0 for metabuild. --- build.sbt | 7 +++++++ buildfile/src/main/scala/sbt/internal/Eval.scala | 8 +++++--- contributing-docs/05_scripted_tests.md | 4 ++-- .../scala/sbt/internal/scripted/StatementHandler.scala | 2 +- .../src/main/scala/sbt/internal/WorkerExchange.scala | 2 +- project/Dependencies.scala | 2 +- sbt-app/src/sbt-test/cache/cached-compile/build.sbt | 2 +- sbt-app/src/sbt-test/cache/cached-test/build.sbt | 2 +- .../sbt-test/cache/compile-classes-restore/build.sbt | 2 +- .../src/sbt-test/cache/compile-io-failure/build.sbt | 2 +- .../sbt-test/cache/compile-repackage-skip/build.sbt | 2 +- sbt-app/src/sbt-test/cache/input-order/build.sbt | 2 +- .../cache/runtime-classpath-versioned/build.sbt | 2 +- .../src/sbt-test/cache/version-bump-compile/build.sbt | 2 +- .../ivyless-publish-http/build.sbt | 2 +- .../ivyless-publish-local/build.sbt | 2 +- .../ivyless-publish-maven-http/build.sbt | 2 +- .../ivyless-publish-maven/build.sbt | 2 +- .../dependency-management/ivyless-publish/build.sbt | 2 +- .../platform-artifact-name/build.sbt | 2 +- .../dependency-management/platform-publish/build.sbt | 2 +- sbt-app/src/sbt-test/nio/clean-symlinks/build.sbt | 2 +- .../sbt-test/plugins/auto-plugins-minimal/build.sbt | 2 +- sbt-app/src/sbt-test/plugins/pgp/build.sbt | 2 +- sbt-app/src/sbt-test/plugins/plugin-cross/build.sbt | 2 +- .../src/sbt-test/plugins/sbt-native-packager/build.sbt | 4 ++-- .../project-load/neg-types/caseclass.log.check | 2 +- .../sbt-test/project-load/neg-types/changes/bad1.sbt | 2 +- .../sbt-test/project-load/neg-types/changes/bad2.sbt | 2 +- .../sbt-test/project-load/neg-types/changes/bad3.sbt | 2 +- .../sbt-test/project-load/neg-types/changes/good.sbt | 8 ++++++-- .../sbt-test/project-load/neg-types/class.log.check | 2 +- .../src/sbt-test/project-load/neg-types/enum.log.check | 2 +- .../src/sbt-test/project-load/subdirectory/build.sbt | 2 +- sbt-app/src/sbt-test/project-load/werror/build.sbt | 2 +- .../src/sbt-test/project-load/werror/changes/build.sbt | 2 +- sbt-app/src/sbt-test/project-matrix/full/build.sbt | 2 +- sbt-app/src/sbt-test/project-matrix/full/test | 4 ++-- .../src/sbt-test/project-matrix/source-dep/build.sbt | 2 +- .../project-matrix/source-dep/ext/lib/build.sbt | 4 ++-- sbt-app/src/sbt-test/project/Class.forName/build.sbt | 2 +- .../project/i8207-sjson-new-downgrade/build.sbt | 2 +- sbt-app/src/sbt-test/project/nested-macro/build.sbt | 2 +- sbt-app/src/sbt-test/project/no-delegate/build.sbt | 2 +- sbt-app/src/sbt-test/project/remove/build.sbt | 10 +++++----- .../sbt-test/project/scala3-console-project/build.sbt | 2 +- .../src/sbt-test/project/settings-delegate/build.sbt | 2 +- .../sbt-test/project/usePipelining-console/build.sbt | 2 +- sbt-app/src/sbt-test/remote-cache/basic/build.sbt | 2 +- .../sbt-test/run/fork-working-directory/changes/a.sbt | 2 +- .../sbt-test/run/fork-working-directory/changes/b.sbt | 2 +- .../sbt-test/server/bsp-output-paths-cache/build.sbt | 2 +- .../src/sbt-test/tests/fork-main-resources/build.sbt | 2 +- sbt-app/src/sbt-test/tests/fork-raw/build.sbt | 2 +- .../src/sbt-test/tests/fork-shutdown-hook/build.sbt | 2 +- .../sbt-test/tests/fork-working-directory/build.sbt | 2 +- sbt-app/src/sbt-test/tests/fork/build.sbt | 2 +- sbt-app/src/sbt-test/tests/fork2/build.sbt | 2 +- .../sbt-test/tests/incremental-object-deps/build.sbt | 2 +- sbt-app/src/sbt-test/tests/munit/build.sbt | 2 +- sbt-app/src/sbt-test/tests/resources/build.sbt | 2 +- sbt-app/src/sbt-test/tests/t543/build.sbt | 2 +- sbt-app/src/sbt-test/tests/test-option/build.sbt | 2 +- sbt-app/src/sbt-test/tests/test-resource/build.sbt | 2 +- .../sbt-test/tests/test-result-logger-api/build.sbt | 2 +- sbt-app/src/sbt-test/tests/version-bump-test/build.sbt | 2 +- 66 files changed, 89 insertions(+), 76 deletions(-) diff --git a/build.sbt b/build.sbt index fc1bde8f3..e134299dc 100644 --- a/build.sbt +++ b/build.sbt @@ -436,6 +436,13 @@ lazy val utilScripted = (project in file("internal") / "util-scripted") name := "Util Scripted", libraryDependencies += scalaParsers, mimaSettings, + mimaBinaryIssueFilters ++= Vector( + exclude[DirectMissingMethodProblem]( + "sbt.internal.scripted.BasicStatementHandler.initialState" + ), + exclude[IncompatibleResultTypeProblem]("sbt.internal.scripted.CommentHandler.initialState"), + exclude[IncompatibleResultTypeProblem]("sbt.internal.scripted.FileCommands.initialState"), + ), ) .configure(addSbtIO) /* **** Intermediate-level Modules **** */ diff --git a/buildfile/src/main/scala/sbt/internal/Eval.scala b/buildfile/src/main/scala/sbt/internal/Eval.scala index 8850904c2..9a793430d 100644 --- a/buildfile/src/main/scala/sbt/internal/Eval.scala +++ b/buildfile/src/main/scala/sbt/internal/Eval.scala @@ -108,8 +108,9 @@ class Eval( val header = imports.strings.mkString("\n") + s""" - |object $moduleName { - | def $WrapValName${returnType} = {""".stripMargin + |@scala.annotation.nowarn("name=IllegalIdentifier") + |object `$moduleName` { + | def `$WrapValName`${returnType} = {""".stripMargin val contents = s"""$header |$expression | } @@ -171,7 +172,8 @@ class Eval( val header = imports.strings.mkString("\n") + s""" - |object $moduleName {""".stripMargin + |@scala.annotation.nowarn("name=IllegalIdentifier") + |object `$moduleName` {""".stripMargin val contents = s"""$header |${definitions.map(_._1).mkString("\n")} diff --git a/contributing-docs/05_scripted_tests.md b/contributing-docs/05_scripted_tests.md index 26ee9d2a2..7105791b9 100644 --- a/contributing-docs/05_scripted_tests.md +++ b/contributing-docs/05_scripted_tests.md @@ -28,7 +28,7 @@ Create an initial build in `something`. Like a real build using sbt. I'm sure yo ```scala name := "foo" -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" ``` I also have `Hello.scala`: @@ -107,7 +107,7 @@ import scala.sys.process.Process lazy val check = taskKey[Unit]("check") name := "foo" -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" check := { val pkg = (Compile / packageBin).value val conv = fileConverter.value diff --git a/internal/util-scripted/src/main/scala/sbt/internal/scripted/StatementHandler.scala b/internal/util-scripted/src/main/scala/sbt/internal/scripted/StatementHandler.scala index e0c9b968e..872ecbb1c 100644 --- a/internal/util-scripted/src/main/scala/sbt/internal/scripted/StatementHandler.scala +++ b/internal/util-scripted/src/main/scala/sbt/internal/scripted/StatementHandler.scala @@ -19,7 +19,7 @@ trait StatementHandler { trait BasicStatementHandler extends StatementHandler { final type State = Unit - final def initialState = () + final def initialState: State = () final def apply(command: String, arguments: List[String], state: Unit): Unit = apply(command, arguments) diff --git a/main-actions/src/main/scala/sbt/internal/WorkerExchange.scala b/main-actions/src/main/scala/sbt/internal/WorkerExchange.scala index af368e28f..602e73d21 100644 --- a/main-actions/src/main/scala/sbt/internal/WorkerExchange.scala +++ b/main-actions/src/main/scala/sbt/internal/WorkerExchange.scala @@ -87,7 +87,7 @@ object WorkerExchange: inputRef.success(out) val scanner = Scanner(in, "UTF-8") while scanner.hasNextLine() do notifyListeners(scanner.nextLine()) - val (connArgs, closer): (Seq[String], Option[AutoCloseable]) = connectionType match + val (connArgs, closer) = connectionType match case WorkerConnection.Tcp => val serverSocket = Retry(ServerSocket(0, 1, loopback)) val accepter = Thread(() => { diff --git a/project/Dependencies.scala b/project/Dependencies.scala index c25f23c93..909a24d3e 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -3,7 +3,7 @@ import Keys.* object Dependencies { // WARNING: Please Scala update versions in PluginCross.scala too - val scala3 = "3.8.4" + val scala3 = "3.9.0" val scala212 = "2.12.21" val baseScalaVersion = scala3 def nightlyVersion: Option[String] = diff --git a/sbt-app/src/sbt-test/cache/cached-compile/build.sbt b/sbt-app/src/sbt-test/cache/cached-compile/build.sbt index 5d5324e01..0c74d9ab0 100644 --- a/sbt-app/src/sbt-test/cache/cached-compile/build.sbt +++ b/sbt-app/src/sbt-test/cache/cached-compile/build.sbt @@ -5,7 +5,7 @@ lazy val checkMiss = inputKey[Unit]("") Global / localCacheDirectory := baseDirectory.value / "diskcache" -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" checkMiss := { val expected: Int = (Space ~> NatBasic).parsed val s = streams.value diff --git a/sbt-app/src/sbt-test/cache/cached-test/build.sbt b/sbt-app/src/sbt-test/cache/cached-test/build.sbt index e6867d953..afa7692c2 100644 --- a/sbt-app/src/sbt-test/cache/cached-test/build.sbt +++ b/sbt-app/src/sbt-test/cache/cached-test/build.sbt @@ -5,7 +5,7 @@ lazy val verify = "com.eed3si9n.verify" %% "verify" % "1.0.0" Global / localCacheDirectory := baseDirectory.value / "diskcache" -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" libraryDependencies += verify % Test testFrameworks += new TestFramework("verify.runner.Framework") diff --git a/sbt-app/src/sbt-test/cache/compile-classes-restore/build.sbt b/sbt-app/src/sbt-test/cache/compile-classes-restore/build.sbt index 3335d1b29..b2b47fe24 100644 --- a/sbt-app/src/sbt-test/cache/compile-classes-restore/build.sbt +++ b/sbt-app/src/sbt-test/cache/compile-classes-restore/build.sbt @@ -13,7 +13,7 @@ Global / localCacheDirectory := baseDirectory.value / "diskcache" lazy val compileClassesRestore = project .in(file(".")) .settings( - scalaVersion := "3.8.4" + scalaVersion := "3.9.0" ) delClasses := Def.uncached { diff --git a/sbt-app/src/sbt-test/cache/compile-io-failure/build.sbt b/sbt-app/src/sbt-test/cache/compile-io-failure/build.sbt index 836e6a8d9..b68bb6904 100644 --- a/sbt-app/src/sbt-test/cache/compile-io-failure/build.sbt +++ b/sbt-app/src/sbt-test/cache/compile-io-failure/build.sbt @@ -1,5 +1,5 @@ Global / localCacheDirectory := baseDirectory.value / "diskcache" -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" val denyClassDir = taskKey[Unit]("Remove write permission from the compile output dir") denyClassDir := { diff --git a/sbt-app/src/sbt-test/cache/compile-repackage-skip/build.sbt b/sbt-app/src/sbt-test/cache/compile-repackage-skip/build.sbt index cd76092f2..694cb5f3c 100644 --- a/sbt-app/src/sbt-test/cache/compile-repackage-skip/build.sbt +++ b/sbt-app/src/sbt-test/cache/compile-repackage-skip/build.sbt @@ -31,7 +31,7 @@ def recorded(kind: String) = Def.task { } Global / localCacheDirectory := (ThisBuild / baseDirectory).value / "diskcache" -ThisBuild / scalaVersion := "3.8.4" +ThisBuild / scalaVersion := "3.9.0" ThisBuild / exportJars := true lazy val a = project.in(file("a")) diff --git a/sbt-app/src/sbt-test/cache/input-order/build.sbt b/sbt-app/src/sbt-test/cache/input-order/build.sbt index 099c5ea10..e3fa97eab 100644 --- a/sbt-app/src/sbt-test/cache/input-order/build.sbt +++ b/sbt-app/src/sbt-test/cache/input-order/build.sbt @@ -14,7 +14,7 @@ Global / localCacheDirectory := baseDirectory.value / "diskcache" lazy val inputOrder = project .in(file(".")) .settings( - scalaVersion := "3.8.4", + scalaVersion := "3.9.0", // Reversing stands in for a second filesystem's readdir order, which is the only part of // this that cannot be reproduced on a single machine. Compile / sources := { diff --git a/sbt-app/src/sbt-test/cache/runtime-classpath-versioned/build.sbt b/sbt-app/src/sbt-test/cache/runtime-classpath-versioned/build.sbt index 38bfe4c02..f489b0e13 100644 --- a/sbt-app/src/sbt-test/cache/runtime-classpath-versioned/build.sbt +++ b/sbt-app/src/sbt-test/cache/runtime-classpath-versioned/build.sbt @@ -1,6 +1,6 @@ Global / localCacheDirectory := baseDirectory.value / "diskcache" -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" // packageInternal is used for the Compile/Test-time internal classpath (what app compiles // against), so a dependency's version bump alone doesn't bust downstream compile caches. diff --git a/sbt-app/src/sbt-test/cache/version-bump-compile/build.sbt b/sbt-app/src/sbt-test/cache/version-bump-compile/build.sbt index 23f956a2d..5345c03f3 100644 --- a/sbt-app/src/sbt-test/cache/version-bump-compile/build.sbt +++ b/sbt-app/src/sbt-test/cache/version-bump-compile/build.sbt @@ -3,7 +3,7 @@ import complete.DefaultParsers.* Global / localCacheDirectory := baseDirectory.value / "diskcache" -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" lazy val checkMiss = inputKey[Unit]("Assert the exact onsite/miss count of the previous run") diff --git a/sbt-app/src/sbt-test/dependency-management/ivyless-publish-http/build.sbt b/sbt-app/src/sbt-test/dependency-management/ivyless-publish-http/build.sbt index c05671cda..f3a0996af 100644 --- a/sbt-app/src/sbt-test/dependency-management/ivyless-publish-http/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/ivyless-publish-http/build.sbt @@ -3,7 +3,7 @@ ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-c name := "lib1" organization := "com.example" version := "0.1.0-SNAPSHOT" -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" val publishRepoBase = settingKey[File]("Base directory for publish repo (HTTP server writes here)") publishRepoBase := baseDirectory.value / "repo" diff --git a/sbt-app/src/sbt-test/dependency-management/ivyless-publish-local/build.sbt b/sbt-app/src/sbt-test/dependency-management/ivyless-publish-local/build.sbt index 86f2cdeba..400e26430 100644 --- a/sbt-app/src/sbt-test/dependency-management/ivyless-publish-local/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/ivyless-publish-local/build.sbt @@ -3,7 +3,7 @@ ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-c name := "lib1" organization := "com.example" version := "0.1.0-SNAPSHOT" -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" // Use a fixed path for local ivy repo to avoid sbt 2.x output sharding val ivyLocalBase = settingKey[File]("Local Ivy repository base") diff --git a/sbt-app/src/sbt-test/dependency-management/ivyless-publish-maven-http/build.sbt b/sbt-app/src/sbt-test/dependency-management/ivyless-publish-maven-http/build.sbt index 35524f841..65a65bb55 100644 --- a/sbt-app/src/sbt-test/dependency-management/ivyless-publish-maven-http/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/ivyless-publish-maven-http/build.sbt @@ -1,7 +1,7 @@ ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-cache" ThisBuild / organization := "com.example" ThisBuild / version := "0.1.0-SNAPSHOT" -ThisBuild / scalaVersion := "3.8.4" +ThisBuild / scalaVersion := "3.9.0" val publishRepoBase = settingKey[File]("Base directory for Maven publish repo (HTTP server writes here)") ThisBuild / publishRepoBase := (ThisBuild / baseDirectory).value / "repo" diff --git a/sbt-app/src/sbt-test/dependency-management/ivyless-publish-maven/build.sbt b/sbt-app/src/sbt-test/dependency-management/ivyless-publish-maven/build.sbt index f7033537f..9c2e651cd 100644 --- a/sbt-app/src/sbt-test/dependency-management/ivyless-publish-maven/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/ivyless-publish-maven/build.sbt @@ -3,7 +3,7 @@ ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-c name := "lib1" organization := "com.example" version := "0.1.0-SNAPSHOT" -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" publishMavenStyle := true val publishRepoBase = settingKey[File]("Base directory for Maven publish repo") diff --git a/sbt-app/src/sbt-test/dependency-management/ivyless-publish/build.sbt b/sbt-app/src/sbt-test/dependency-management/ivyless-publish/build.sbt index 7bb4065cf..4287c5329 100644 --- a/sbt-app/src/sbt-test/dependency-management/ivyless-publish/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/ivyless-publish/build.sbt @@ -3,7 +3,7 @@ ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-c name := "lib1" organization := "com.example" version := "0.1.0-SNAPSHOT" -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" // Publish to a file repo (tests ivyless publish without HTTP server) val publishRepoBase = settingKey[File]("Base directory for publish repo") diff --git a/sbt-app/src/sbt-test/dependency-management/platform-artifact-name/build.sbt b/sbt-app/src/sbt-test/dependency-management/platform-artifact-name/build.sbt index 120a0398e..81684300d 100644 --- a/sbt-app/src/sbt-test/dependency-management/platform-artifact-name/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/platform-artifact-name/build.sbt @@ -1,7 +1,7 @@ ThisBuild / organization := "com.example" name := "testproj" version := "0.1.0-SNAPSHOT" -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" platform := "native0.5" crossVersion := CrossVersion.binary diff --git a/sbt-app/src/sbt-test/dependency-management/platform-publish/build.sbt b/sbt-app/src/sbt-test/dependency-management/platform-publish/build.sbt index 0bec6ae61..3108d6b50 100644 --- a/sbt-app/src/sbt-test/dependency-management/platform-publish/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/platform-publish/build.sbt @@ -3,7 +3,7 @@ ThisBuild / organization := "com.example" ThisBuild / version := "0.1.0" -ThisBuild / scalaVersion := "3.8.4" +ThisBuild / scalaVersion := "3.9.0" ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-cache" lazy val mavenRepo = settingKey[File]("shared local Maven repo for the consume round-trip") diff --git a/sbt-app/src/sbt-test/nio/clean-symlinks/build.sbt b/sbt-app/src/sbt-test/nio/clean-symlinks/build.sbt index a03570948..8a0b39068 100644 --- a/sbt-app/src/sbt-test/nio/clean-symlinks/build.sbt +++ b/sbt-app/src/sbt-test/nio/clean-symlinks/build.sbt @@ -2,7 +2,7 @@ import java.nio.file.Files name := "clean-symlinks-test" -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" TaskKey[Unit]("createSymlinkedDirectory") := { IO.createDirectory(target.value) diff --git a/sbt-app/src/sbt-test/plugins/auto-plugins-minimal/build.sbt b/sbt-app/src/sbt-test/plugins/auto-plugins-minimal/build.sbt index 42b26b739..5977a2d53 100644 --- a/sbt-app/src/sbt-test/plugins/auto-plugins-minimal/build.sbt +++ b/sbt-app/src/sbt-test/plugins/auto-plugins-minimal/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" organization := "com.example" diff --git a/sbt-app/src/sbt-test/plugins/pgp/build.sbt b/sbt-app/src/sbt-test/plugins/pgp/build.sbt index f9a2d45c5..f8c790b76 100644 --- a/sbt-app/src/sbt-test/plugins/pgp/build.sbt +++ b/sbt-app/src/sbt-test/plugins/pgp/build.sbt @@ -3,7 +3,7 @@ Global / pgpSecretRing := baseDirectory.value / "secring.pgp" Global / pgpPublicRing := baseDirectory.value / "pubring.pgp" Global / useGpg := false -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" organization := "com.example" name := "app" version := "1.0" diff --git a/sbt-app/src/sbt-test/plugins/plugin-cross/build.sbt b/sbt-app/src/sbt-test/plugins/plugin-cross/build.sbt index 3afc0f4c0..57a664e88 100644 --- a/sbt-app/src/sbt-test/plugins/plugin-cross/build.sbt +++ b/sbt-app/src/sbt-test/plugins/plugin-cross/build.sbt @@ -19,4 +19,4 @@ lazy val plugin = (projectMatrix in file("plugin")) case _ => "2.0.0-RC3" }, ) - .jvmPlatform(scalaVersions = Seq("3.8.4", "2.12.21")) + .jvmPlatform(scalaVersions = Seq("3.9.0", "2.12.21")) diff --git a/sbt-app/src/sbt-test/plugins/sbt-native-packager/build.sbt b/sbt-app/src/sbt-test/plugins/sbt-native-packager/build.sbt index ba429a00f..7d92d4d50 100644 --- a/sbt-app/src/sbt-test/plugins/sbt-native-packager/build.sbt +++ b/sbt-app/src/sbt-test/plugins/sbt-native-packager/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "3.8.4" +ThisBuild / scalaVersion := "3.9.0" name := "hello" enablePlugins(JavaAppPackaging) @@ -10,7 +10,7 @@ enablePlugins(UniversalDeployPlugin) lazy val check = taskKey[Unit]("") check := { - val cmd = "target/out/jvm/scala-3.8.4/hello/universal/stage/bin/hello" + val cmd = "target/out/jvm/scala-3.9.0/hello/universal/stage/bin/hello" val cmd0 = if (sys.props("os.name").toLowerCase(java.util.Locale.ROOT).contains("windows")) cmd + ".bat" diff --git a/sbt-app/src/sbt-test/project-load/neg-types/caseclass.log.check b/sbt-app/src/sbt-test/project-load/neg-types/caseclass.log.check index 47a739f1e..ac54c05b2 100644 --- a/sbt-app/src/sbt-test/project-load/neg-types/caseclass.log.check +++ b/sbt-app/src/sbt-test/project-load/neg-types/caseclass.log.check @@ -11,4 +11,4 @@ [error] 3 |case class A() [error] |^^^^^^^^^^^^^^ [error] |Defining types in *.sbt file is not supported -[error] an error in expression: class dotty.tools.dotc.reporting.Diagnostic$Error at BASE/build.sbt:[980..991..994] L3: Defining types in *.sbt file is not supported \ No newline at end of file +[error] an error in expression: class dotty.tools.dotc.reporting.Diagnostic$Error at BASE/build.sbt:[OFFSET] L3: Defining types in *.sbt file is not supported \ No newline at end of file diff --git a/sbt-app/src/sbt-test/project-load/neg-types/changes/bad1.sbt b/sbt-app/src/sbt-test/project-load/neg-types/changes/bad1.sbt index c7383055b..8534d288c 100644 --- a/sbt-app/src/sbt-test/project-load/neg-types/changes/bad1.sbt +++ b/sbt-app/src/sbt-test/project-load/neg-types/changes/bad1.sbt @@ -1,3 +1,3 @@ -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" class A diff --git a/sbt-app/src/sbt-test/project-load/neg-types/changes/bad2.sbt b/sbt-app/src/sbt-test/project-load/neg-types/changes/bad2.sbt index 72e85d476..c5c639050 100644 --- a/sbt-app/src/sbt-test/project-load/neg-types/changes/bad2.sbt +++ b/sbt-app/src/sbt-test/project-load/neg-types/changes/bad2.sbt @@ -1,3 +1,3 @@ -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" case class A() diff --git a/sbt-app/src/sbt-test/project-load/neg-types/changes/bad3.sbt b/sbt-app/src/sbt-test/project-load/neg-types/changes/bad3.sbt index 31826005e..b641259cf 100644 --- a/sbt-app/src/sbt-test/project-load/neg-types/changes/bad3.sbt +++ b/sbt-app/src/sbt-test/project-load/neg-types/changes/bad3.sbt @@ -1,4 +1,4 @@ -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" enum A: case B diff --git a/sbt-app/src/sbt-test/project-load/neg-types/changes/good.sbt b/sbt-app/src/sbt-test/project-load/neg-types/changes/good.sbt index 24a43a3e4..9d2e72c29 100644 --- a/sbt-app/src/sbt-test/project-load/neg-types/changes/good.sbt +++ b/sbt-app/src/sbt-test/project-load/neg-types/changes/good.sbt @@ -1,7 +1,7 @@ import complete.DefaultParsers.{ *, given } LocalRootProject / name := "hello" -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" autoScalaLibrary := false crossPaths := false @@ -36,7 +36,11 @@ exportFailedSessionLog := Def.uncached { logLines(lastLog :: Nil) .foldLeft(List(List.empty[String])) { (acc, line) => if line.contains("welcome to sbt") then Nil :: acc - else (line.replace(b, "BASE").replaceAll(" -{4,}$", "") :: acc.head) :: acc.tail + else + (line + .replace(b, "BASE") + .replaceAll(" -{4,}$", "") + .replaceAll("""\[\d+\.\.\d+\.\.\d+\]""", "[OFFSET]") :: acc.head) :: acc.tail } .map(_.reverse) .reverse diff --git a/sbt-app/src/sbt-test/project-load/neg-types/class.log.check b/sbt-app/src/sbt-test/project-load/neg-types/class.log.check index 073d70a5e..ac8e802f3 100644 --- a/sbt-app/src/sbt-test/project-load/neg-types/class.log.check +++ b/sbt-app/src/sbt-test/project-load/neg-types/class.log.check @@ -11,4 +11,4 @@ [error] 3 |class A [error] |^^^^^^^ [error] |Defining types in *.sbt file is not supported -[error] an error in expression: class dotty.tools.dotc.reporting.Diagnostic$Error at BASE/build.sbt:[980..986..987] L3: Defining types in *.sbt file is not supported \ No newline at end of file +[error] an error in expression: class dotty.tools.dotc.reporting.Diagnostic$Error at BASE/build.sbt:[OFFSET] L3: Defining types in *.sbt file is not supported \ No newline at end of file diff --git a/sbt-app/src/sbt-test/project-load/neg-types/enum.log.check b/sbt-app/src/sbt-test/project-load/neg-types/enum.log.check index 0ae73804d..13f143a08 100644 --- a/sbt-app/src/sbt-test/project-load/neg-types/enum.log.check +++ b/sbt-app/src/sbt-test/project-load/neg-types/enum.log.check @@ -13,4 +13,4 @@ [error] |Defining types in *.sbt file is not supported [error] | [error] 4 | case B -[error] an error in expression: class dotty.tools.dotc.reporting.Diagnostic$Error at BASE/build.sbt:[980..985..996] L3: Defining types in *.sbt file is not supported \ No newline at end of file +[error] an error in expression: class dotty.tools.dotc.reporting.Diagnostic$Error at BASE/build.sbt:[OFFSET] L3: Defining types in *.sbt file is not supported \ No newline at end of file diff --git a/sbt-app/src/sbt-test/project-load/subdirectory/build.sbt b/sbt-app/src/sbt-test/project-load/subdirectory/build.sbt index fa6c6b44f..e52683c57 100644 --- a/sbt-app/src/sbt-test/project-load/subdirectory/build.sbt +++ b/sbt-app/src/sbt-test/project-load/subdirectory/build.sbt @@ -3,7 +3,7 @@ lazy val foo = project @transient lazy val check = taskKey[Unit]("") -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" LocalRootProject / check := { assert((foo / Compile / scalacOptions).value == List("-Xmacro-settings:a:a"), s"${(foo / Compile / scalacOptions).value}") diff --git a/sbt-app/src/sbt-test/project-load/werror/build.sbt b/sbt-app/src/sbt-test/project-load/werror/build.sbt index 144964006..dc6f035ce 100644 --- a/sbt-app/src/sbt-test/project-load/werror/build.sbt +++ b/sbt-app/src/sbt-test/project-load/werror/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" @deprecated def foo = true diff --git a/sbt-app/src/sbt-test/project-load/werror/changes/build.sbt b/sbt-app/src/sbt-test/project-load/werror/changes/build.sbt index 0673d832b..c0b645425 100644 --- a/sbt-app/src/sbt-test/project-load/werror/changes/build.sbt +++ b/sbt-app/src/sbt-test/project-load/werror/changes/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" @deprecated def foo = true diff --git a/sbt-app/src/sbt-test/project-matrix/full/build.sbt b/sbt-app/src/sbt-test/project-matrix/full/build.sbt index a10f4c756..2cb0734d7 100644 --- a/sbt-app/src/sbt-test/project-matrix/full/build.sbt +++ b/sbt-app/src/sbt-test/project-matrix/full/build.sbt @@ -1,5 +1,5 @@ lazy val scala3_LTS = "3.3.5" -lazy val scala3_current = "3.8.4" +lazy val scala3_current = "3.9.0" lazy val check = taskKey[Unit]("") organization := "com.example" diff --git a/sbt-app/src/sbt-test/project-matrix/full/test b/sbt-app/src/sbt-test/project-matrix/full/test index c45b24c55..d642fb44f 100644 --- a/sbt-app/src/sbt-test/project-matrix/full/test +++ b/sbt-app/src/sbt-test/project-matrix/full/test @@ -1,4 +1,4 @@ > packageBin $ exists target/**/app_3.3.5-0.1.0-SNAPSHOT.jar -$ exists target/**/app_3.8.4-0.1.0-SNAPSHOT.jar -> core3_8_4/check +$ exists target/**/app_3.9.0-0.1.0-SNAPSHOT.jar +> core3_9_0/check diff --git a/sbt-app/src/sbt-test/project-matrix/source-dep/build.sbt b/sbt-app/src/sbt-test/project-matrix/source-dep/build.sbt index f88ec331c..3910855fc 100644 --- a/sbt-app/src/sbt-test/project-matrix/source-dep/build.sbt +++ b/sbt-app/src/sbt-test/project-matrix/source-dep/build.sbt @@ -1,5 +1,5 @@ // https://github.com/sbt/sbt/issues/8971 -ThisBuild / scalaVersion := "3.8.4" +ThisBuild / scalaVersion := "3.9.0" lazy val extLib = ProjectRef(file("ext/lib"), "lib") diff --git a/sbt-app/src/sbt-test/project-matrix/source-dep/ext/lib/build.sbt b/sbt-app/src/sbt-test/project-matrix/source-dep/ext/lib/build.sbt index 8466a855b..1299866ba 100644 --- a/sbt-app/src/sbt-test/project-matrix/source-dep/ext/lib/build.sbt +++ b/sbt-app/src/sbt-test/project-matrix/source-dep/ext/lib/build.sbt @@ -1,7 +1,7 @@ -ThisBuild / scalaVersion := "3.8.4" +ThisBuild / scalaVersion := "3.9.0" lazy val lib = (projectMatrix in file(".")) .settings( name := "lib", ) - .jvmPlatform(scalaVersions = Seq("3.8.4")) + .jvmPlatform(scalaVersions = Seq("3.9.0")) diff --git a/sbt-app/src/sbt-test/project/Class.forName/build.sbt b/sbt-app/src/sbt-test/project/Class.forName/build.sbt index d660b858e..b0922c67c 100644 --- a/sbt-app/src/sbt-test/project/Class.forName/build.sbt +++ b/sbt-app/src/sbt-test/project/Class.forName/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" crossPaths := false name := "definition-lib-forname-test" version := "1.0" diff --git a/sbt-app/src/sbt-test/project/i8207-sjson-new-downgrade/build.sbt b/sbt-app/src/sbt-test/project/i8207-sjson-new-downgrade/build.sbt index e2734d0de..44d6f6dfa 100644 --- a/sbt-app/src/sbt-test/project/i8207-sjson-new-downgrade/build.sbt +++ b/sbt-app/src/sbt-test/project/i8207-sjson-new-downgrade/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "3.8.4" +ThisBuild / scalaVersion := "3.9.0" ThisBuild / organization := "com.example" libraryDependencies += "com.typesafe" % "config" % "1.4.5" diff --git a/sbt-app/src/sbt-test/project/nested-macro/build.sbt b/sbt-app/src/sbt-test/project/nested-macro/build.sbt index e70a11d5e..745edcd82 100644 --- a/sbt-app/src/sbt-test/project/nested-macro/build.sbt +++ b/sbt-app/src/sbt-test/project/nested-macro/build.sbt @@ -1,6 +1,6 @@ lazy val a1 = settingKey[Boolean]("") -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" a1 := true Compile / sourceGenerators += { diff --git a/sbt-app/src/sbt-test/project/no-delegate/build.sbt b/sbt-app/src/sbt-test/project/no-delegate/build.sbt index 946aaf53f..31116de26 100644 --- a/sbt-app/src/sbt-test/project/no-delegate/build.sbt +++ b/sbt-app/src/sbt-test/project/no-delegate/build.sbt @@ -1 +1 @@ -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" diff --git a/sbt-app/src/sbt-test/project/remove/build.sbt b/sbt-app/src/sbt-test/project/remove/build.sbt index eab339c5a..c141c9fba 100644 --- a/sbt-app/src/sbt-test/project/remove/build.sbt +++ b/sbt-app/src/sbt-test/project/remove/build.sbt @@ -11,7 +11,7 @@ lazy val intsSetting2 = Def.setting { Seq(1, 2, 3) } -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" intsTask := Seq(1, 2, 3, 4, 5, 6, 7) intsTask -= 3 @@ -30,10 +30,10 @@ intsSetting -= intSetting2.value intsSetting --= intsSetting2.value intsFromScalaV := Seq(1, 2, 3, 4, 5, 6, 7) -intsFromScalaV -= { if scalaVersion.value == "3.8.4" then 3 else 5 } -intsFromScalaV --= { if scalaVersion.value == "3.8.4" then Seq(1, 2) else Seq(4) } -intsFromScalaV -= { if scalaVersion.value == "3.8.4" then Option(6) else None } -intsFromScalaV --= { if scalaVersion.value == "3.8.4" then Option(7) else None } +intsFromScalaV -= { if scalaVersion.value == "3.9.0" then 3 else 5 } +intsFromScalaV --= { if scalaVersion.value == "3.9.0" then Seq(1, 2) else Seq(4) } +intsFromScalaV -= { if scalaVersion.value == "3.9.0" then Option(6) else None } +intsFromScalaV --= { if scalaVersion.value == "3.9.0" then Option(7) else None } intsSetSetting := Set(1, 2, 3, 4, 5, 6, 7) intsSetSetting -= 3 diff --git a/sbt-app/src/sbt-test/project/scala3-console-project/build.sbt b/sbt-app/src/sbt-test/project/scala3-console-project/build.sbt index 952762ced..91bc4cc2a 100644 --- a/sbt-app/src/sbt-test/project/scala3-console-project/build.sbt +++ b/sbt-app/src/sbt-test/project/scala3-console-project/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "3.8.4" +ThisBuild / scalaVersion := "3.9.0" lazy val markerFile = settingKey[java.io.File]("marker file written by consoleProject REPL when bindings resolve") diff --git a/sbt-app/src/sbt-test/project/settings-delegate/build.sbt b/sbt-app/src/sbt-test/project/settings-delegate/build.sbt index 946aaf53f..31116de26 100644 --- a/sbt-app/src/sbt-test/project/settings-delegate/build.sbt +++ b/sbt-app/src/sbt-test/project/settings-delegate/build.sbt @@ -1 +1 @@ -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" diff --git a/sbt-app/src/sbt-test/project/usePipelining-console/build.sbt b/sbt-app/src/sbt-test/project/usePipelining-console/build.sbt index 0baa7f9ff..ff45fb82f 100644 --- a/sbt-app/src/sbt-test/project/usePipelining-console/build.sbt +++ b/sbt-app/src/sbt-test/project/usePipelining-console/build.sbt @@ -1,7 +1,7 @@ // Regression test for #8921: pipelining flags must not leak into console/scalacOptions. ThisBuild / usePipelining := true -ThisBuild / scalaVersion := "3.8.1" +ThisBuild / scalaVersion := "3.9.0" val checkConsoleScalacOptions = taskKey[Unit]( "Fails if console/scalacOptions still contains pipelining flags (-Ypickle-java / -Ypickle-write)" diff --git a/sbt-app/src/sbt-test/remote-cache/basic/build.sbt b/sbt-app/src/sbt-test/remote-cache/basic/build.sbt index 310376625..2ae2501f7 100644 --- a/sbt-app/src/sbt-test/remote-cache/basic/build.sbt +++ b/sbt-app/src/sbt-test/remote-cache/basic/build.sbt @@ -1,6 +1,6 @@ import sbt.internal.util.CacheEventSummary -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" Global / remoteCache := Some(new java.net.URI("grpc://127.0.0.1:2024")) Global / localCacheDirectory := baseDirectory.value / "diskcache" diff --git a/sbt-app/src/sbt-test/run/fork-working-directory/changes/a.sbt b/sbt-app/src/sbt-test/run/fork-working-directory/changes/a.sbt index 184b248ae..87a32a289 100644 --- a/sbt-app/src/sbt-test/run/fork-working-directory/changes/a.sbt +++ b/sbt-app/src/sbt-test/run/fork-working-directory/changes/a.sbt @@ -1,4 +1,4 @@ -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" @transient lazy val check = taskKey[Unit]("") diff --git a/sbt-app/src/sbt-test/run/fork-working-directory/changes/b.sbt b/sbt-app/src/sbt-test/run/fork-working-directory/changes/b.sbt index c7aa50511..0669764fb 100644 --- a/sbt-app/src/sbt-test/run/fork-working-directory/changes/b.sbt +++ b/sbt-app/src/sbt-test/run/fork-working-directory/changes/b.sbt @@ -1,4 +1,4 @@ -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" @transient lazy val check = taskKey[Unit]("") diff --git a/sbt-app/src/sbt-test/server/bsp-output-paths-cache/build.sbt b/sbt-app/src/sbt-test/server/bsp-output-paths-cache/build.sbt index 670303fad..0e8736abe 100644 --- a/sbt-app/src/sbt-test/server/bsp-output-paths-cache/build.sbt +++ b/sbt-app/src/sbt-test/server/bsp-output-paths-cache/build.sbt @@ -1,6 +1,6 @@ import sbt.internal.bsp.OutputPathsItem -ThisBuild / scalaVersion := "3.8.2" +ThisBuild / scalaVersion := "3.9.0" name := "bsp-output-paths-cache" diff --git a/sbt-app/src/sbt-test/tests/fork-main-resources/build.sbt b/sbt-app/src/sbt-test/tests/fork-main-resources/build.sbt index ff75b0468..e9117d8d6 100644 --- a/sbt-app/src/sbt-test/tests/fork-main-resources/build.sbt +++ b/sbt-app/src/sbt-test/tests/fork-main-resources/build.sbt @@ -1,6 +1,6 @@ val scalatest = "org.scalatest" %% "scalatest" % "3.2.19" -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" Test / fork := true libraryDependencies += scalatest % Test diff --git a/sbt-app/src/sbt-test/tests/fork-raw/build.sbt b/sbt-app/src/sbt-test/tests/fork-raw/build.sbt index 7fd48e96c..615945b0c 100644 --- a/sbt-app/src/sbt-test/tests/fork-raw/build.sbt +++ b/sbt-app/src/sbt-test/tests/fork-raw/build.sbt @@ -1,6 +1,6 @@ val munit = "org.scalameta" %% "munit" % "1.0.4" -scalaVersion := "3.8.2" +scalaVersion := "3.9.0" libraryDependencies += munit % Test Test / fork := true diff --git a/sbt-app/src/sbt-test/tests/fork-shutdown-hook/build.sbt b/sbt-app/src/sbt-test/tests/fork-shutdown-hook/build.sbt index 1b63fb338..422dabd9a 100644 --- a/sbt-app/src/sbt-test/tests/fork-shutdown-hook/build.sbt +++ b/sbt-app/src/sbt-test/tests/fork-shutdown-hook/build.sbt @@ -1,5 +1,5 @@ Global / localCacheDirectory := baseDirectory.value / "diskcache" -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" Test / fork := true diff --git a/sbt-app/src/sbt-test/tests/fork-working-directory/build.sbt b/sbt-app/src/sbt-test/tests/fork-working-directory/build.sbt index dbf929bb1..69d52ca61 100644 --- a/sbt-app/src/sbt-test/tests/fork-working-directory/build.sbt +++ b/sbt-app/src/sbt-test/tests/fork-working-directory/build.sbt @@ -1,6 +1,6 @@ val scalatest = "org.scalatest" %% "scalatest" % "3.2.19" -ThisBuild / scalaVersion := "3.8.4" +ThisBuild / scalaVersion := "3.9.0" lazy val root = (project in file(".")) diff --git a/sbt-app/src/sbt-test/tests/fork/build.sbt b/sbt-app/src/sbt-test/tests/fork/build.sbt index c6d1069cf..f6c55a772 100644 --- a/sbt-app/src/sbt-test/tests/fork/build.sbt +++ b/sbt-app/src/sbt-test/tests/fork/build.sbt @@ -12,7 +12,7 @@ def groupId(idx: Int) = "group_" + (idx + 1) def groupPrefix(idx: Int) = groupId(idx) + "_file_" Global / localCacheDirectory := baseDirectory.value / "diskcache" -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" organization := "com.example" lazy val root = rootProject diff --git a/sbt-app/src/sbt-test/tests/fork2/build.sbt b/sbt-app/src/sbt-test/tests/fork2/build.sbt index 670c0be28..6ef4d490b 100644 --- a/sbt-app/src/sbt-test/tests/fork2/build.sbt +++ b/sbt-app/src/sbt-test/tests/fork2/build.sbt @@ -1,5 +1,5 @@ val scalatest = "org.scalatest" %% "scalatest" % "3.2.19" -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" fork := true libraryDependencies += scalatest % Test diff --git a/sbt-app/src/sbt-test/tests/incremental-object-deps/build.sbt b/sbt-app/src/sbt-test/tests/incremental-object-deps/build.sbt index e18395371..84d3a01db 100644 --- a/sbt-app/src/sbt-test/tests/incremental-object-deps/build.sbt +++ b/sbt-app/src/sbt-test/tests/incremental-object-deps/build.sbt @@ -1,3 +1,3 @@ -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" libraryDependencies += "com.eed3si9n.verify" %% "verify" % "1.0.0" % Test testFrameworks += new TestFramework("verify.runner.Framework") diff --git a/sbt-app/src/sbt-test/tests/munit/build.sbt b/sbt-app/src/sbt-test/tests/munit/build.sbt index 4de5cd4df..3bfd69672 100644 --- a/sbt-app/src/sbt-test/tests/munit/build.sbt +++ b/sbt-app/src/sbt-test/tests/munit/build.sbt @@ -1,5 +1,5 @@ val munit = "org.scalameta" %% "munit" % "1.0.4" -scalaVersion := "3.8.2" +scalaVersion := "3.9.0" lazy val root = rootProject .settings( diff --git a/sbt-app/src/sbt-test/tests/resources/build.sbt b/sbt-app/src/sbt-test/tests/resources/build.sbt index 8bb77a4ec..da7c71e43 100644 --- a/sbt-app/src/sbt-test/tests/resources/build.sbt +++ b/sbt-app/src/sbt-test/tests/resources/build.sbt @@ -1,3 +1,3 @@ -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" val munit = "org.scalameta" %% "munit" % "1.0.4" libraryDependencies += munit % Test diff --git a/sbt-app/src/sbt-test/tests/t543/build.sbt b/sbt-app/src/sbt-test/tests/t543/build.sbt index ff5147cd0..e83b05247 100644 --- a/sbt-app/src/sbt-test/tests/t543/build.sbt +++ b/sbt-app/src/sbt-test/tests/t543/build.sbt @@ -6,7 +6,7 @@ val marker = new File("marker") val check = TaskKey[Unit]("check", "Check correct error has been returned.") val scalatest = "org.scalatest" %% "scalatest" % "3.2.19" -ThisBuild / scalaVersion := "3.8.4" +ThisBuild / scalaVersion := "3.9.0" lazy val root = (project in file(".")). settings( diff --git a/sbt-app/src/sbt-test/tests/test-option/build.sbt b/sbt-app/src/sbt-test/tests/test-option/build.sbt index e0ad9f773..040b5ae7e 100644 --- a/sbt-app/src/sbt-test/tests/test-option/build.sbt +++ b/sbt-app/src/sbt-test/tests/test-option/build.sbt @@ -1,2 +1,2 @@ -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test diff --git a/sbt-app/src/sbt-test/tests/test-resource/build.sbt b/sbt-app/src/sbt-test/tests/test-resource/build.sbt index c22c55b5d..3bfd69672 100644 --- a/sbt-app/src/sbt-test/tests/test-resource/build.sbt +++ b/sbt-app/src/sbt-test/tests/test-resource/build.sbt @@ -1,5 +1,5 @@ val munit = "org.scalameta" %% "munit" % "1.0.4" -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" lazy val root = rootProject .settings( diff --git a/sbt-app/src/sbt-test/tests/test-result-logger-api/build.sbt b/sbt-app/src/sbt-test/tests/test-result-logger-api/build.sbt index 0d4fc4abe..8817db2d2 100644 --- a/sbt-app/src/sbt-test/tests/test-result-logger-api/build.sbt +++ b/sbt-app/src/sbt-test/tests/test-result-logger-api/build.sbt @@ -2,7 +2,7 @@ import sbt.* import sbt.Tests.Output import sbt.util.Logger -ThisBuild / scalaVersion := "3.8.4" +ThisBuild / scalaVersion := "3.9.0" val marker = file("test-result-logger-ran") val verify = "com.eed3si9n.verify" %% "verify" % "1.0.0" diff --git a/sbt-app/src/sbt-test/tests/version-bump-test/build.sbt b/sbt-app/src/sbt-test/tests/version-bump-test/build.sbt index 018640a21..be4f8152d 100644 --- a/sbt-app/src/sbt-test/tests/version-bump-test/build.sbt +++ b/sbt-app/src/sbt-test/tests/version-bump-test/build.sbt @@ -1,6 +1,6 @@ Global / localCacheDirectory := baseDirectory.value / "diskcache" -scalaVersion := "3.8.4" +scalaVersion := "3.9.0" val munit = "org.scalameta" %% "munit" % "1.0.4"