Skip to content

Commit 72e6d72

Browse files
authored
Merge pull request #720 from scala-steward/update/scala-compiler-2.13.14
undefined
2 parents 7a120d5 + e64465c commit 72e6d72

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

.circleci/config.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ workflows:
9898
- scala_job:
9999
name: 2.13.x
100100
java_version: jdk8
101-
scala_version: 2.13.13
101+
scala_version: 2.13.14
102102
- scala_job:
103103
name: 3.x
104104
java_version: jdk8
@@ -110,7 +110,7 @@ workflows:
110110
- scala_job:
111111
name: jdk11_2.13.x
112112
java_version: jdk11
113-
scala_version: 2.13.13
113+
scala_version: 2.13.14
114114
- scala_job:
115115
name: jdk11_3.x
116116
java_version: jdk11
@@ -122,7 +122,7 @@ workflows:
122122
- scala_job:
123123
name: jdk17_2.13.x
124124
java_version: jdk17
125-
scala_version: 2.13.13
125+
scala_version: 2.13.14
126126
- scala_job:
127127
name: jdk17_3.x
128128
java_version: jdk17
@@ -132,7 +132,7 @@ workflows:
132132
scala_version: 2.12.19
133133
- scalajs_job:
134134
name: sjs1.0_2.13.x
135-
scala_version: 2.13.13
135+
scala_version: 2.13.14
136136
- scalajs_job:
137137
name: sjs1.0_3.x
138138
scala_version: 3.3.3
@@ -141,7 +141,7 @@ workflows:
141141
scala_version: 2.12.19
142142
- scalanative_job:
143143
name: native0.4_2.13.x
144-
scala_version: 2.13.13
144+
scala_version: 2.13.14
145145
- scalanative_job:
146146
name: native0.4_3.x
147147
scala_version: 3.3.3

build.sbt

+3-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.13", "2.12.19", "3.3.3"),
39+
crossScalaVersions := Seq("2.13.14", "2.12.19", "3.3.3"),
4040
scalaVersion := "2.12.19",
4141

4242
scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
@@ -130,6 +130,8 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
130130
}),
131131
)
132132
.jsSettings(
133+
versionPolicyCheck / skip := true,
134+
versionCheck / skip := true,
133135
// Scala.js cannot run forked tests
134136
Test / fork := false
135137
)

0 commit comments

Comments
 (0)