Skip to content

Commit 0b42924

Browse files
authored
Merge branch 'main' into update/scala-compiler-2.13.15
2 parents 2c91d41 + e46c8fe commit 0b42924

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.circleci/config.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ workflows:
102102
- scala_job:
103103
name: 3.x
104104
java_version: jdk8
105-
scala_version: 3.3.3
105+
scala_version: 3.3.4
106106
- scala_job:
107107
name: jdk11_2.12.x
108108
java_version: jdk11
@@ -114,7 +114,7 @@ workflows:
114114
- scala_job:
115115
name: jdk11_3.x
116116
java_version: jdk11
117-
scala_version: 3.3.3
117+
scala_version: 3.3.4
118118
- scala_job:
119119
name: jdk17_2.12.x
120120
java_version: jdk17
@@ -126,7 +126,7 @@ workflows:
126126
- scala_job:
127127
name: jdk17_3.x
128128
java_version: jdk17
129-
scala_version: 3.3.3
129+
scala_version: 3.3.4
130130
- scalajs_job:
131131
name: sjs1.0_2.12.x
132132
scala_version: 2.12.20
@@ -135,7 +135,7 @@ workflows:
135135
scala_version: 2.13.15
136136
- scalajs_job:
137137
name: sjs1.0_3.x
138-
scala_version: 3.3.3
138+
scala_version: 3.3.4
139139
- scalanative_job:
140140
name: native0.4_2.12.x
141141
scala_version: 2.12.20
@@ -144,4 +144,4 @@ workflows:
144144
scala_version: 2.13.15
145145
- scalanative_job:
146146
name: native0.4_3.x
147-
scala_version: 3.3.3
147+
scala_version: 3.3.4

build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
3636
.settings(
3737
name := "scala-xml",
3838
scalaModuleAutomaticModuleName := Some("scala.xml"),
39-
crossScalaVersions := Seq("2.13.15", "2.12.20", "3.3.3"),
39+
crossScalaVersions := Seq("2.13.15", "2.12.20", "3.3.4"),
4040
scalaVersion := "2.12.20",
4141

4242
scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {

project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.1.0")
22
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
33
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
4-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
4+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
55
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.5")
66
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")

0 commit comments

Comments
 (0)