Skip to content

Commit 91a7c23

Browse files
committed
make MiMa okay with the Scala 3.0->3.1 upgrade
1 parent 5a2f6cb commit 91a7c23

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

build.sbt

+14-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ def osgiExport(scalaVersion: String, version: String) = {
1616
lazy val commonSettings = Seq(
1717
crossScalaVersions := Seq("2.13.8", "2.12.16", "2.11.12", "3.1.3"),
1818
scalaVersion := crossScalaVersions.value.head,
19-
versionPolicyIntention := Compatibility.BinaryAndSourceCompatible,
19+
// we could make this stricter again (BinaryAndSourceCompatible)
20+
// after our reference version was built on Scala 3.1.x
21+
versionPolicyIntention := Compatibility.BinaryCompatible,
2022
Compile / unmanagedSourceDirectories ++= {
2123
(Compile / unmanagedSourceDirectories).value.flatMap { dir =>
2224
CrossVersion.partialVersion(scalaVersion.value) match {
@@ -63,6 +65,17 @@ lazy val scalaJava8Compat = (project in file("."))
6365
case v => Seq(v)
6466
},
6567

68+
// shouldn't be needed anymore after our reference version is a version
69+
// built on Scala 3.1.x
70+
mimaBinaryIssueFilters := {
71+
import com.typesafe.tools.mima.core.ProblemFilters._
72+
import com.typesafe.tools.mima.core._
73+
Seq(
74+
exclude[IncompatibleSignatureProblem]("scala.compat.java8.*"),
75+
exclude[IncompatibleSignatureProblem]("scala.concurrent.java8.*"),
76+
),
77+
},
78+
6679
testOptions += Tests.Argument(TestFrameworks.JUnit, "-v", "-a"),
6780

6881
(Compile / sourceGenerators) += Def.task {

0 commit comments

Comments
 (0)