Skip to content

Commit eb16484

Browse files
authored
Merge pull request #267 from scala-steward/update/scala3-library-3.1.3
2 parents 47bac30 + a233b48 commit eb16484

File tree

2 files changed

+17
-10
lines changed

2 files changed

+17
-10
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
java: [8, 11, 17]
13-
scala: [2.11.12, 2.12.16, 2.13.8, 3.0.2]
13+
scala: [2.11.x, 2.12.x, 2.13.x, 3.x]
1414
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v2
@@ -22,4 +22,4 @@ jobs:
2222
distribution: temurin
2323
java-version: ${{matrix.java}}
2424
- name: Test
25-
run: sbt ++${{matrix.scala}} test headerCheck versionPolicyCheck package
25+
run: sbt ++${{matrix.scala}} test headerCheck versionPolicyCheck publishLocal

build.sbt

+15-8
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,12 @@ def osgiExport(scalaVersion: String, version: String) = {
1818
}) ++ Seq(s"scala.compat.java8.*;version=${version}")
1919
}
2020

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-
2521
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"),
2723
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,
2927
Compile / unmanagedSourceDirectories ++= {
3028
(Compile / unmanagedSourceDirectories).value.flatMap { dir =>
3129
CrossVersion.partialVersion(scalaVersion.value) match {
@@ -72,6 +70,17 @@ lazy val scalaJava8Compat = (project in file("."))
7270
case v => Seq(v)
7371
},
7472

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+
7584
testOptions += Tests.Argument(TestFrameworks.JUnit, "-v", "-a"),
7685

7786
(Compile / sourceGenerators) += Def.task {
@@ -106,8 +115,6 @@ lazy val scalaJava8Compat = (project in file("."))
106115
if (Set("1.5", "1.6", "1.7") contains specVersion)
107116
sys.error("Java 8 or higher is required for this project.")
108117
},
109-
110-
packageDoc / publishArtifact := !disableDocs && !scalaVersion.value.startsWith("3.")
111118
)
112119
.settings(
113120
inConfig(JavaDoc)(Defaults.configSettings) ++ {

0 commit comments

Comments
 (0)