Merge remote-tracking branch 'origin/2.12.x' into merge-2.12-to-2.13-…

…20241021

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        java: [8, 11, 17, 21, 22, 23-ea]
+        java: [8, 11, 17, 21, 23]
     runs-on: ${{matrix.os}}
     steps:
       - run: git config --global core.autocrlf false

README.md

@@ -288,11 +288,11 @@ $ sbt
 
 ## "Nightly" builds
 
-The Scala CI builds nightly download releases and publishes
-them to https://scala-ci.typesafe.com/artifactory/scala-integration/ .
+The Scala CI publishes these to
+https://scala-ci.typesafe.com/artifactory/scala-integration/ .
 
-Using a nightly build in sbt is explained in
-[this Stack Overflow answer](https://stackoverflow.com/questions/40622878)
+Using a nightly build in sbt and other tools is explained on this
+[doc page](https://docs.scala-lang.org/overviews/core/nightlies.html).
 
 Although we casually refer to these as "nightly" builds, they aren't
 actually built nightly, but "mergely".  That is to say, a build is

build.sbt

@@ -45,7 +45,7 @@ val jnaDep            = "net.java.dev.jna"               % "jna"
 val jlineDeps         = Seq(jlineDep, jnaDep)
 val testInterfaceDep  = "org.scala-sbt"                  % "test-interface"                   % "1.0"
 val diffUtilsDep      = "io.github.java-diff-utils"      % "java-diff-utils"                  % "4.12"
-val compilerInterfaceDep = "org.scala-sbt"               % "compiler-interface"               % "1.10.2"
+val compilerInterfaceDep = "org.scala-sbt"               % "compiler-interface"               % "1.10.3"
 
 val projectFolder = settingKey[String]("subfolder in src when using configureAsSubproject, else the project name")
 

project/build.properties

@@ -1 +1 @@
-sbt.version=1.10.2
+sbt.version=1.10.3