Skip to content

Commit 0f7d436

Browse files
authored
Merge pull request scala#557 from scala-steward/update/scala3-library-3.0.2
Update scala3-library to 3.0.2
2 parents 622fadf + fe2b547 commit 0f7d436

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

.circleci/config.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ workflows:
109109
java_version: jdk8
110110
scala_version: 2.13.6
111111
- scala_job:
112-
name: 3.0.1
112+
name: 3.0.2
113113
java_version: jdk8
114-
scala_version: 3.0.1
114+
scala_version: 3.0.2
115115
- scala_job:
116116
name: jdk11_2.12
117117
java_version: jdk11
@@ -123,7 +123,7 @@ workflows:
123123
- scala_job:
124124
name: jdk11_3.0
125125
java_version: jdk11
126-
scala_version: 3.0.1
126+
scala_version: 3.0.2
127127
- scala_job:
128128
name: jdk17_2.12
129129
java_version: jdk17
@@ -135,7 +135,7 @@ workflows:
135135
- scala_job:
136136
name: jdk17_3.0
137137
java_version: jdk17
138-
scala_version: 3.0.1
138+
scala_version: 3.0.2
139139
- scalajs_job:
140140
name: sjs1.0_2.12
141141
scala_version: 2.12.14
@@ -146,7 +146,7 @@ workflows:
146146
scalajs_version: 1.7.0
147147
- scalajs_job:
148148
name: sjs1.0_3
149-
scala_version: 3.0.1
149+
scala_version: 3.0.2
150150
scalajs_version: 1.7.0
151151
- scalanative_job:
152152
name: native0.4_2.12

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import: scala/scala-dev:travis/default.yml
55
language: scala
66

77
scala:
8-
- 3.0.1
8+
- 3.0.2
99
- 2.12.14
1010
- 2.13.6
1111

@@ -18,7 +18,7 @@ env:
1818

1919
jobs:
2020
exclude:
21-
- scala: 3.0.1
21+
- scala: 3.0.2
2222
env: SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=8
2323

2424
install:

build.sbt

+5-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
5959
// Note: Change back to BinaryAndSourceCompatible after 2.1.0 release
6060
versionPolicyIntention := Compatibility.BinaryCompatible,
6161
// Note: See discussion on non-JVM Mima in https://github.com/scala/scala-xml/pull/517
62-
mimaReportSignatureProblems := true,
6362
mimaBinaryIssueFilters ++= {
6463
import com.typesafe.tools.mima.core._
6564
import com.typesafe.tools.mima.core.ProblemFilters._
@@ -79,6 +78,11 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
7978
exclude[DirectMissingMethodProblem]("scala.xml.parsing.NoBindingFactoryAdapter.createComment")
8079
)
8180
},
81+
// Mima signature checking stopped working after 3.0.2 upgrade, see #557
82+
mimaReportSignatureProblems := (CrossVersion.partialVersion(scalaVersion.value) match {
83+
case Some((3, _)) => false
84+
case _ => true
85+
}),
8286

8387
apiMappings ++= scalaInstance.value.libraryJars.filter { file =>
8488
file.getName.startsWith("scala-library") && file.getName.endsWith(".jar")

0 commit comments

Comments
 (0)