Skip to content

Update scala3-library, ... to 3.1.2 #600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,21 +92,21 @@ workflows:
build:
jobs:
- scala_job:
name: 2.12.15
name: 2.12
java_version: jdk8
scala_version: 2.12.15
- scala_job:
name: 2.13.8
name: 2.13
java_version: jdk8
scala_version: 2.13.8
- scala_job:
name: 3.0.2
name: 3.0
java_version: jdk8
scala_version: 3.0.2
- scala_job:
name: 3.1.0
name: 3.1
java_version: jdk8
scala_version: 3.1.1
scala_version: 3.1.2
- scala_job:
name: jdk11_2.12
java_version: jdk11
Expand All @@ -122,7 +122,7 @@ workflows:
- scala_job:
name: jdk11_3.1
java_version: jdk11
scala_version: 3.1.1
scala_version: 3.1.2
- scala_job:
name: jdk17_2.12
java_version: jdk17
Expand All @@ -138,7 +138,7 @@ workflows:
- scala_job:
name: jdk17_3.1
java_version: jdk17
scala_version: 3.1.1
scala_version: 3.1.2
- scalajs_job:
name: sjs1.0_2.12
scala_version: 2.12.15
Expand All @@ -150,7 +150,7 @@ workflows:
scala_version: 3.0.2
- scalajs_job:
name: sjs1.0_3.1
scala_version: 3.1.1
scala_version: 3.1.2
- scalanative_job:
name: native0.4_2.12
scala_version: 2.12.15
Expand All @@ -159,4 +159,4 @@ workflows:
scala_version: 2.13.8
- scalanative_job:
name: native0.4_3
scala_version: 3.1.1
scala_version: 3.1.2
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
fail-fast: false
matrix:
java: [8, 11, 17]
scala: [2.12.15, 2.13.8, 3.0.2, 3.1.1]
scala: [2.12.15, 2.13.8, 3.0.2, 3.1.2]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand Down
17 changes: 11 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,17 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
.settings(
name := "scala-xml",
scalaModuleAutomaticModuleName := Some("scala.xml"),
crossScalaVersions := Seq("2.13.8", "2.12.15", "3.0.2", "3.1.1"),
crossScalaVersions := Seq("2.13.8", "2.12.15", "3.1.2"),
scalaVersion := "2.12.15",

// Don't publish for Scala 3.1 or later, only from 3.0
publish / skip := (CrossVersion.partialVersion(scalaVersion.value) match {
case Some((3, x)) if x > 0 => true
case _ => false
}),
scalaOutputVersion := {
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((3, _)) => "3.0.2"
case _ => scalaVersion.value
}
},

publish / skip := false,

scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
case Some((3, _)) =>
Expand Down Expand Up @@ -139,6 +142,8 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
)
.jsEnablePlugins(ScalaJSJUnitPlugin)
.nativeSettings(
// should be removed after 2.2.0 is released
versionPolicyIntention := Compatibility.None,
// Scala Native cannot run forked tests
Test / fork := false,
libraryDependencies += "org.scala-native" %%% "junit-runtime" % nativeVersion % Test,
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.6.2
sbt.version=1.7.0-M2