Skip to content

Commit 1624192

Browse files
authored
Merge branch 'main' into update/scala-compiler-2.13.11
2 parents 2da3990 + 0f77473 commit 1624192

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

.circleci/config.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ workflows:
9494
- scala_job:
9595
name: 2.12.17
9696
java_version: jdk8
97-
scala_version: 2.12.17
97+
scala_version: 2.12.18
9898
- scala_job:
9999
name: 2.13.10
100100
java_version: jdk8
@@ -106,7 +106,7 @@ workflows:
106106
- scala_job:
107107
name: jdk11_2.12
108108
java_version: jdk11
109-
scala_version: 2.12.17
109+
scala_version: 2.12.18
110110
- scala_job:
111111
name: jdk11_2.13
112112
java_version: jdk11
@@ -118,7 +118,7 @@ workflows:
118118
- scala_job:
119119
name: jdk17_2.12
120120
java_version: jdk17
121-
scala_version: 2.12.17
121+
scala_version: 2.12.18
122122
- scala_job:
123123
name: jdk17_2.13
124124
java_version: jdk17
@@ -129,7 +129,7 @@ workflows:
129129
scala_version: 3.3.0
130130
- scalajs_job:
131131
name: sjs1.0_2.12
132-
scala_version: 2.12.17
132+
scala_version: 2.12.18
133133
- scalajs_job:
134134
name: sjs1.0_2.13
135135
scala_version: 2.13.11
@@ -138,7 +138,7 @@ workflows:
138138
scala_version: 3.3.0
139139
- scalanative_job:
140140
name: native0.4_2.12
141-
scala_version: 2.12.17
141+
scala_version: 2.12.18
142142
- scalanative_job:
143143
name: native0.4_2.13
144144
scala_version: 2.13.11

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
3636
.settings(
3737
name := "scala-xml",
3838
scalaModuleAutomaticModuleName := Some("scala.xml"),
39-
crossScalaVersions := Seq("2.13.11", "2.12.17", "3.3.0"),
40-
scalaVersion := "2.12.17",
39+
crossScalaVersions := Seq("2.13.11", "2.12.18", "3.3.0"),
40+
scalaVersion := "2.12.18",
4141

4242
scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
4343
case Some((3, _)) =>

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.1")
33
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.1")
44
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1")
55
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14")
6-
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.9.0")
6+
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")

0 commit comments

Comments
 (0)