Skip to content

Commit 05ca073

Browse files
authored
Merge pull request #211 from SethTisue/declare-version-scheme
2 parents d2dafa6 + 8e2b88e commit 05ca073

File tree

4 files changed

+24
-4
lines changed

4 files changed

+24
-4
lines changed

Diff for: .travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ language: scala
66

77
scala:
88
- 2.11.12
9-
- 2.12.12
10-
- 2.13.4
9+
- 2.12.13
10+
- 2.13.5
1111

1212
env:
1313
- ADOPTOPENJDK=8

Diff for: build.sbt

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

21+
ThisBuild / versionScheme := Some("early-semver")
22+
ThisBuild / versionPolicyIntention := Compatibility.BinaryAndSourceCompatible
23+
2124
lazy val commonSettings = Seq(
2225
scalacOptions ++= Seq("-feature", "-deprecation", "-unchecked"),
2326

@@ -70,7 +73,23 @@ lazy val scalaJava8Compat = (project in file("."))
7073

7174
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test",
7275

73-
scalaModuleMimaPreviousVersion := None,
76+
// we're still in 0.x land so we could choose to break bincompat,
77+
// but let's at least be aware when we're doing it. also we should
78+
// think about going 1.0, it's been a while
79+
scalaModuleMimaPreviousVersion := Some("0.9.1"),
80+
81+
mimaBinaryIssueFilters ++= {
82+
import com.typesafe.tools.mima.core._, ProblemFilters._
83+
Seq(
84+
// bah
85+
exclude[IncompatibleSignatureProblem]("*"),
86+
// mysterious -- see scala/scala-java8-compat#211
87+
exclude[DirectMissingMethodProblem ]("scala.compat.java8.Priority1FunctionConverters.enrichAsJavaIntFunction"),
88+
exclude[ReversedMissingMethodProblem]("scala.compat.java8.Priority1FunctionConverters.enrichAsJavaIntFunction"),
89+
exclude[DirectMissingMethodProblem ]("scala.compat.java8.FunctionConverters.package.enrichAsJavaIntFunction" ),
90+
exclude[ReversedMissingMethodProblem]("scala.compat.java8.FunctionConverters.package.enrichAsJavaIntFunction" ),
91+
)
92+
},
7493

7594
testOptions += Tests.Argument(TestFrameworks.JUnit, "-v", "-a"),
7695

Diff for: build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@ export CI_SNAPSHOT_RELEASE="publish"
6262
# for now, until we're confident in the new release scripts, just close the staging repo.
6363
export CI_SONATYPE_RELEASE="; sonatypePrepare; sonatypeBundleUpload; sonatypeClose"
6464
65-
sbt "$setTagScalaVersion" clean test publishLocal $releaseTask
65+
sbt "$setTagScalaVersion" clean test versionPolicyCheck publishLocal $releaseTask

Diff for: project/plugins.sbt

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.2.4")
2+
addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "1.0.0-RC5")

0 commit comments

Comments
 (0)