Merge remote-tracking branch 'origin/main' into update/sbt-scala-module-3.2.2

SethTisue · SethTisue · commit ff71adb5b54a · 2025-01-07T11:17:32.000-08:00
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.20", "2.11.12", "3.3.3"),
+  crossScalaVersions := Seq("2.13.15", "2.12.20", "2.11.12", "3.3.4"),
   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.10.6
+sbt.version=1.10.7

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ def osgiExport(scalaVersion: String, version: String) = {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`lazy val commonSettings = Seq(`
`22`		`- crossScalaVersions := Seq("2.13.14", "2.12.20", "2.11.12", "3.3.3"),`
	`22`	`+ crossScalaVersions := Seq("2.13.15", "2.12.20", "2.11.12", "3.3.4"),`
`23`	`23`	`scalaVersion := crossScalaVersions.value.head,`
`24`	`24`	`// we could make this stricter again (BinaryAndSourceCompatible)`
`25`	`25`	`// after our reference version was built on Scala 3.1.x`