Merge branch 'main' into update/scala-compiler-2.13.15

scala · Sep 30, 2024 · 0b42924 · 0b42924
2 parents 2c91d41 + e46c8fe
commit 0b42924
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -102,7 +102,7 @@ workflows:
       - scala_job:
           name: 3.x
           java_version: jdk8
-          scala_version: 3.3.3
+          scala_version: 3.3.4
       - scala_job:
           name: jdk11_2.12.x
           java_version: jdk11
@@ -114,7 +114,7 @@ workflows:
       - scala_job:
           name: jdk11_3.x
           java_version: jdk11
-          scala_version: 3.3.3
+          scala_version: 3.3.4
       - scala_job:
           name: jdk17_2.12.x
           java_version: jdk17
@@ -126,7 +126,7 @@ workflows:
       - scala_job:
           name: jdk17_3.x
           java_version: jdk17
-          scala_version: 3.3.3
+          scala_version: 3.3.4
       - scalajs_job:
           name: sjs1.0_2.12.x
           scala_version: 2.12.20
@@ -135,7 +135,7 @@ workflows:
           scala_version: 2.13.15
       - scalajs_job:
           name: sjs1.0_3.x
-          scala_version: 3.3.3
+          scala_version: 3.3.4
       - scalanative_job:
           name: native0.4_2.12.x
           scala_version: 2.12.20
@@ -144,4 +144,4 @@ workflows:
           scala_version: 2.13.15
       - scalanative_job:
           name: native0.4_3.x
-          scala_version: 3.3.3
+          scala_version: 3.3.4
diff --git a/build.sbt b/build.sbt
@@ -36,7 +36,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .settings(
     name    := "scala-xml",
     scalaModuleAutomaticModuleName := Some("scala.xml"),
-    crossScalaVersions := Seq("2.13.15", "2.12.20", "3.3.3"),
+    crossScalaVersions := Seq("2.13.15", "2.12.20", "3.3.4"),
     scalaVersion := "2.12.20",
 
     scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,6 +1,6 @@
 addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.1.0")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
 addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.5")
 addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")