From 3bc9bd682fd86032e16b8df376e22f6e9c80f8dc Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 1 Sep 2021 13:29:22 +0200 Subject: [PATCH 1/4] Update scala3-library, ... to 3.0.2 --- .circleci/config.yml | 8 ++++---- .travis.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f3168d6c..744a5885 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -111,7 +111,7 @@ workflows: - scala_job: name: 3.0.1 java_version: jdk8 - scala_version: 3.0.1 + scala_version: 3.0.2 - scala_job: name: jdk11_2.12 java_version: jdk11 @@ -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 @@ -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 @@ -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 diff --git a/.travis.yml b/.travis.yml index ac00ec9b..f781ceb8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ env: jobs: exclude: - - scala: 3.0.1 + - scala: 3.0.2 env: SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=8 install: From 52f5e9ed6531fc1d29fdcaff87c5b79ade39a81f Mon Sep 17 00:00:00 2001 From: "Aaron S. Hawley" Date: Wed, 1 Sep 2021 07:49:11 -0400 Subject: [PATCH 2/4] Fix job name to 3.0.2 in Circle --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 744a5885..4901a30a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -109,7 +109,7 @@ 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.2 - scala_job: From 5f3042410eaab8aaa2de4a2405a91e313b973d7e Mon Sep 17 00:00:00 2001 From: "Aaron S. Hawley" Date: Wed, 1 Sep 2021 07:49:46 -0400 Subject: [PATCH 3/4] Update 3.0.2 in Travis matrix --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f781ceb8..9f47674b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 From fe2b547765258b9e9fb9f696010ad96c012aa4de Mon Sep 17 00:00:00 2001 From: "Aaron S. Hawley" Date: Wed, 1 Sep 2021 17:16:19 -0400 Subject: [PATCH 4/4] Disable Mima signature check on Scala 3.0.2 --- build.sbt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 7b86182d..65e5677e 100644 --- a/build.sbt +++ b/build.sbt @@ -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._ @@ -70,6 +69,11 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform) exclude[DirectMissingMethodProblem]("scala.xml.include.sax.XIncluder.declaration"), ) }, + // 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")