Skip to content

Commit 8797f60

Browse files
authored
Merge pull request #568 from scala-steward/update/scala3-library-3.1.0
Update Scala 3.1.0
2 parents 806d3e7 + c8aca30 commit 8797f60

File tree

3 files changed

+23
-2
lines changed

3 files changed

+23
-2
lines changed

Diff for: .circleci/config.yml

+15
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,10 @@ workflows:
100100
name: 3.0.2
101101
java_version: jdk8
102102
scala_version: 3.0.2
103+
- scala_job:
104+
name: 3.1.0
105+
java_version: jdk8
106+
scala_version: 3.1.0
103107
- scala_job:
104108
name: jdk11_2.12
105109
java_version: jdk11
@@ -112,6 +116,10 @@ workflows:
112116
name: jdk11_3.0
113117
java_version: jdk11
114118
scala_version: 3.0.2
119+
- scala_job:
120+
name: jdk11_3.1
121+
java_version: jdk11
122+
scala_version: 3.1.0
115123
- scala_job:
116124
name: jdk17_2.12
117125
java_version: jdk17
@@ -124,6 +132,10 @@ workflows:
124132
name: jdk17_3.0
125133
java_version: jdk17
126134
scala_version: 3.0.2
135+
- scala_job:
136+
name: jdk17_3.1
137+
java_version: jdk17
138+
scala_version: 3.1.0
127139
- scalajs_job:
128140
name: sjs1.0_2.12
129141
scala_version: 2.12.15
@@ -133,6 +145,9 @@ workflows:
133145
- scalajs_job:
134146
name: sjs1.0_3
135147
scala_version: 3.0.2
148+
- scalajs_job:
149+
name: sjs1.0_3.1
150+
scala_version: 3.1.0
136151
- scalanative_job:
137152
name: native0.4_2.12
138153
scala_version: 2.12.15

Diff for: .github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
java: [8, 11, 17]
13-
scala: [2.12.15, 2.13.6, 3.0.2]
13+
scala: [2.12.15, 2.13.6, 3.0.2, 3.1.0]
1414
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v2

Diff for: build.sbt

+7-1
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,15 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
3535
.settings(
3636
name := "scala-xml",
3737
scalaModuleAutomaticModuleName := Some("scala.xml"),
38-
crossScalaVersions := Seq("2.13.6", "2.12.15", "3.0.2"),
38+
crossScalaVersions := Seq("2.13.6", "2.12.15", "3.0.2", "3.1.0"),
3939
scalaVersion := "2.12.15",
4040

41+
// Don't publish for Scala 3.1 or later, only from 3.0
42+
publish / skip := (CrossVersion.partialVersion(scalaVersion.value) match {
43+
case Some((3, x)) if x > 0 => true
44+
case _ => false
45+
}),
46+
4147
scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
4248
case Some((3, _)) =>
4349
Seq("-language:Scala2")

0 commit comments

Comments
 (0)