Skip to content

Commit

Permalink
Merge pull request #720 from scala-steward/update/scala-compiler-2.13.14
Browse files Browse the repository at this point in the history
undefined
  • Loading branch information
SethTisue authored Aug 9, 2024
2 parents 7a120d5 + e64465c commit 72e6d72
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ workflows:
- scala_job:
name: 2.13.x
java_version: jdk8
scala_version: 2.13.13
scala_version: 2.13.14
- scala_job:
name: 3.x
java_version: jdk8
Expand All @@ -110,7 +110,7 @@ workflows:
- scala_job:
name: jdk11_2.13.x
java_version: jdk11
scala_version: 2.13.13
scala_version: 2.13.14
- scala_job:
name: jdk11_3.x
java_version: jdk11
Expand All @@ -122,7 +122,7 @@ workflows:
- scala_job:
name: jdk17_2.13.x
java_version: jdk17
scala_version: 2.13.13
scala_version: 2.13.14
- scala_job:
name: jdk17_3.x
java_version: jdk17
Expand All @@ -132,7 +132,7 @@ workflows:
scala_version: 2.12.19
- scalajs_job:
name: sjs1.0_2.13.x
scala_version: 2.13.13
scala_version: 2.13.14
- scalajs_job:
name: sjs1.0_3.x
scala_version: 3.3.3
Expand All @@ -141,7 +141,7 @@ workflows:
scala_version: 2.12.19
- scalanative_job:
name: native0.4_2.13.x
scala_version: 2.13.13
scala_version: 2.13.14
- scalanative_job:
name: native0.4_3.x
scala_version: 3.3.3
4 changes: 3 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
.settings(
name := "scala-xml",
scalaModuleAutomaticModuleName := Some("scala.xml"),
crossScalaVersions := Seq("2.13.13", "2.12.19", "3.3.3"),
crossScalaVersions := Seq("2.13.14", "2.12.19", "3.3.3"),
scalaVersion := "2.12.19",

scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
Expand Down Expand Up @@ -130,6 +130,8 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
}),
)
.jsSettings(
versionPolicyCheck / skip := true,
versionCheck / skip := true,
// Scala.js cannot run forked tests
Test / fork := false
)
Expand Down

0 comments on commit 72e6d72

Please sign in to comment.