Skip to content

Commit

Permalink
Merge pull request #557 from scala-steward/update/scala3-library-3.0.2
Browse files Browse the repository at this point in the history
Update scala3-library to 3.0.2
  • Loading branch information
ashawley committed Sep 9, 2021
2 parents 622fadf + fe2b547 commit 0f7d436
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,9 @@ workflows:
java_version: jdk8
scala_version: 2.13.6
- scala_job:
name: 3.0.1
name: 3.0.2
java_version: jdk8
scala_version: 3.0.1
scala_version: 3.0.2
- scala_job:
name: jdk11_2.12
java_version: jdk11
Expand All @@ -123,7 +123,7 @@ workflows:
- scala_job:
name: jdk11_3.0
java_version: jdk11
scala_version: 3.0.1
scala_version: 3.0.2
- scala_job:
name: jdk17_2.12
java_version: jdk17
Expand All @@ -135,7 +135,7 @@ workflows:
- scala_job:
name: jdk17_3.0
java_version: jdk17
scala_version: 3.0.1
scala_version: 3.0.2
- scalajs_job:
name: sjs1.0_2.12
scala_version: 2.12.14
Expand All @@ -146,7 +146,7 @@ workflows:
scalajs_version: 1.7.0
- scalajs_job:
name: sjs1.0_3
scala_version: 3.0.1
scala_version: 3.0.2
scalajs_version: 1.7.0
- scalanative_job:
name: native0.4_2.12
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import: scala/scala-dev:travis/default.yml
language: scala

scala:
- 3.0.1
- 3.0.2
- 2.12.14
- 2.13.6

Expand All @@ -18,7 +18,7 @@ env:

jobs:
exclude:
- scala: 3.0.1
- scala: 3.0.2
env: SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=8

install:
Expand Down
6 changes: 5 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
// Note: Change back to BinaryAndSourceCompatible after 2.1.0 release
versionPolicyIntention := Compatibility.BinaryCompatible,
// Note: See discussion on non-JVM Mima in https://github.com/scala/scala-xml/pull/517
mimaReportSignatureProblems := true,
mimaBinaryIssueFilters ++= {
import com.typesafe.tools.mima.core._
import com.typesafe.tools.mima.core.ProblemFilters._
Expand All @@ -79,6 +78,11 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
exclude[DirectMissingMethodProblem]("scala.xml.parsing.NoBindingFactoryAdapter.createComment")
)
},
// Mima signature checking stopped working after 3.0.2 upgrade, see #557
mimaReportSignatureProblems := (CrossVersion.partialVersion(scalaVersion.value) match {
case Some((3, _)) => false
case _ => true
}),

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

0 comments on commit 0f7d436

Please sign in to comment.