From f7ab8dff9726c7669d0adb68602160d6fa3abfe5 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 29 Feb 2024 18:26:34 +0000 Subject: [PATCH 1/4] Update scala-library, scala-reflect to 2.13.13 --- build.sbt | 2 +- .../src/main/scala/com/typesafe/tools/mima/lib/TestCli.scala | 2 +- .../src/sbt-test/sbt-mima-plugin/pom-only-project/build.sbt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 87a4e854..dbb043f1 100644 --- a/build.sbt +++ b/build.sbt @@ -42,7 +42,7 @@ commands += Command.command("testStaging") { state => // Keep in sync with TestCli val scala212 = "2.12.18" -val scala213 = "2.13.12" +val scala213 = "2.13.13" val scala3 = "3.3.1" val root = project.in(file(".")).settings( diff --git a/functional-tests/src/main/scala/com/typesafe/tools/mima/lib/TestCli.scala b/functional-tests/src/main/scala/com/typesafe/tools/mima/lib/TestCli.scala index f81d0be4..1c0d4e86 100644 --- a/functional-tests/src/main/scala/com/typesafe/tools/mima/lib/TestCli.scala +++ b/functional-tests/src/main/scala/com/typesafe/tools/mima/lib/TestCli.scala @@ -11,7 +11,7 @@ object TestCli { // Keep in sync with build.sbt val scala211 = "2.11.12" val scala212 = "2.12.18" - val scala213 = "2.13.12" + val scala213 = "2.13.13" val scala3 = "3.3.1" val hostScalaVersion = StdLibProps.scalaPropOrNone("maven.version.number").get val allScalaVersions = List(scala211, scala212, scala213, scala3) diff --git a/sbtplugin/src/sbt-test/sbt-mima-plugin/pom-only-project/build.sbt b/sbtplugin/src/sbt-test/sbt-mima-plugin/pom-only-project/build.sbt index 7aaf84ed..72135389 100644 --- a/sbtplugin/src/sbt-test/sbt-mima-plugin/pom-only-project/build.sbt +++ b/sbtplugin/src/sbt-test/sbt-mima-plugin/pom-only-project/build.sbt @@ -2,7 +2,7 @@ organization := "com.typesafe" name := "pom-only-project" version := "1.1.0" mimaPreviousArtifacts := Set(organization.value %% moduleName.value % "1.0.0") -scalaVersion := "2.13.12" +scalaVersion := "2.13.13" // this is an arbitrary dependency, but one that's known to cause issues in POM-only projects // see https://github.com/lightbend/mima/issues/768 for more context From af19a1eb51a163afc1f12e6db95817eb4d542c0b Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Fri, 1 Mar 2024 16:21:00 +0100 Subject: [PATCH 2/4] switch from -Xsource:3 to -Xsource:3-cross --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index dbb043f1..1179c919 100644 --- a/build.sbt +++ b/build.sbt @@ -24,7 +24,7 @@ def compilerOptions(scalaVersion: String): Seq[String] = ) ++ (CrossVersion.partialVersion(scalaVersion) match { case Some((2, _)) => Seq( - "-Xsource:3", "-Xlint", + "-Xsource:3-cross", "-Xlint", // these are too annoying when crossbuilding "-Wconf:cat=unused-nowarn:s", ) From bb758a36836db018c0efba0169c35d1aa41ca9e5 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Sun, 17 Mar 2024 08:20:46 +0100 Subject: [PATCH 3/4] only 2.13 has -Xsource:3-cross --- build.sbt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index f6d199a0..3a0ad549 100644 --- a/build.sbt +++ b/build.sbt @@ -24,11 +24,16 @@ def compilerOptions(scalaVersion: String): Seq[String] = ) ++ (CrossVersion.partialVersion(scalaVersion) match { case Some((2, _)) => Seq( - "-Xsource:3-cross", "-Xlint", + "-Xlint", // these are too annoying when crossbuilding "-Wconf:cat=unused-nowarn:s", ) case _ => Seq() + }) ++ + (CrossVersion.partialVersion(scalaVersion) match { + case Some((2, 12)) => Seq("-Xsource:3") + case Some((2, 13)) => Seq("-Xsource:3-cross") + case _ => Seq() }) // Useful to self-test releases From cd5287ce33e60bf129e4696493ba5c444f678a71 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 19 Mar 2024 10:27:05 +0100 Subject: [PATCH 4/4] adjust a test case for 2.13.13 --- .../scalac-options-2.13.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/functional-tests/src/test/case-class-private-constructor-changes-ok/scalac-options-2.13.txt b/functional-tests/src/test/case-class-private-constructor-changes-ok/scalac-options-2.13.txt index aea506b6..93c192a7 100644 --- a/functional-tests/src/test/case-class-private-constructor-changes-ok/scalac-options-2.13.txt +++ b/functional-tests/src/test/case-class-private-constructor-changes-ok/scalac-options-2.13.txt @@ -1,2 +1,2 @@ --Xsource:3 --Wconf:cat=scala3-migration:s \ No newline at end of file +-Xsource:3-cross +-Wconf:cat=scala3-migration:s