Skip to content

Commit ccf3550

Browse files
committed
make MiMa okay with the Scala 3.0->3.1 upgrade
1 parent 0963ad8 commit ccf3550

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
@@ -21,7 +21,9 @@ def osgiExport(scalaVersion: String, version: String) = {
2121
lazy val commonSettings = Seq(
2222
crossScalaVersions := Seq("2.13.8", "2.12.16", "2.11.12", "3.1.3"),
2323
scalaVersion := crossScalaVersions.value.head,
24-
versionPolicyIntention := Compatibility.BinaryAndSourceCompatible,
24+
// we could make this stricter again (BinaryAndSourceCompatible)
25+
// after our reference version was built on Scala 3.1.x
26+
versionPolicyIntention := Compatibility.BinaryCompatible,
2527
Compile / unmanagedSourceDirectories ++= {
2628
(Compile / unmanagedSourceDirectories).value.flatMap { dir =>
2729
CrossVersion.partialVersion(scalaVersion.value) match {
@@ -68,6 +70,17 @@ lazy val scalaJava8Compat = (project in file("."))
6870
case v => Seq(v)
6971
},
7072

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

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

0 commit comments

Comments
 (0)