@@ -18,14 +18,12 @@ def osgiExport(scalaVersion: String, version: String) = {
18
18
}) ++ Seq (s " scala.compat.java8.*;version= ${version}" )
19
19
}
20
20
21
- // shouldn't be necessary anymore after https://github.com/lampepfl/dotty/pull/13498
22
- // makes it into a release
23
- ThisBuild / libraryDependencySchemes += " org.scala-lang" %% " scala3-library" % " semver-spec"
24
-
25
21
lazy val commonSettings = Seq (
26
- crossScalaVersions := Seq (" 2.13.8" , " 2.12.16" , " 2.11.12" , " 3.0.2 " ),
22
+ crossScalaVersions := Seq (" 2.13.8" , " 2.12.16" , " 2.11.12" , " 3.1.3 " ),
27
23
scalaVersion := crossScalaVersions.value.head,
28
- 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 ,
29
27
Compile / unmanagedSourceDirectories ++= {
30
28
(Compile / unmanagedSourceDirectories).value.flatMap { dir =>
31
29
CrossVersion .partialVersion(scalaVersion.value) match {
@@ -72,6 +70,17 @@ lazy val scalaJava8Compat = (project in file("."))
72
70
case v => Seq (v)
73
71
},
74
72
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
+
75
84
testOptions += Tests .Argument (TestFrameworks .JUnit , " -v" , " -a" ),
76
85
77
86
(Compile / sourceGenerators) += Def .task {
@@ -106,8 +115,6 @@ lazy val scalaJava8Compat = (project in file("."))
106
115
if (Set (" 1.5" , " 1.6" , " 1.7" ) contains specVersion)
107
116
sys.error(" Java 8 or higher is required for this project." )
108
117
},
109
-
110
- packageDoc / publishArtifact := ! disableDocs && ! scalaVersion.value.startsWith(" 3." )
111
118
)
112
119
.settings(
113
120
inConfig(JavaDoc )(Defaults .configSettings) ++ {
0 commit comments