Merge branch 'main' into update/scala-library-2.13.14

scala · May 21, 2024 · 6f84227 · 6f84227
2 parents 85b9235 + 2bf2c3a
commit 6f84227
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/build.sbt b/build.sbt
@@ -19,7 +19,7 @@ def osgiExport(scalaVersion: String, version: String) = {
 }
 
 lazy val commonSettings = Seq(
- crossScalaVersions := Seq("2.13.14", "2.12.18", "2.11.12", "3.3.3"),
+ crossScalaVersions := Seq("2.13.14", "2.12.19", "2.11.12", "3.3.3"),
  scalaVersion := crossScalaVersions.value.head,
  // we could make this stricter again (BinaryAndSourceCompatible)
  // after our reference version was built on Scala 3.1.x

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.9
+sbt.version=1.10.0