diff --git a/build.sbt b/build.sbt index 5ae4b8c..d3639ec 100644 --- a/build.sbt +++ b/build.sbt @@ -18,10 +18,8 @@ def osgiExport(scalaVersion: String, version: String) = { }) ++ Seq(s"scala.compat.java8.*;version=${version}") } -ThisBuild / versionScheme := Some("early-semver") -ThisBuild / versionPolicyIntention := Compatibility.BinaryAndSourceCompatible - lazy val commonSettings = Seq( + versionPolicyIntention := Compatibility.BinaryAndSourceCompatible, Compile / unmanagedSourceDirectories ++= { (Compile / unmanagedSourceDirectories).value.flatMap { dir => CrossVersion.partialVersion(scalaVersion.value) match { @@ -73,8 +71,6 @@ lazy val scalaJava8Compat = (project in file(".")) libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test", - scalaModuleMimaPreviousVersion := Some("1.0.0"), - mimaBinaryIssueFilters ++= { import com.typesafe.tools.mima.core._, ProblemFilters._ Seq( diff --git a/build.sh b/build.sh index 4b1f48a..1d72bea 100755 --- a/build.sh +++ b/build.sh @@ -31,6 +31,7 @@ verPat="[0-9]+\.[0-9]+\.[0-9]+(-[A-Za-z0-9-]+)?" tagPat="^v$verPat(#.*)?$" if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then + versionCheckTask="versionCheck" releaseTask="ci-release" if ! isReleaseJob; then echo "Not releasing on Java $ADOPTOPENJDK with Scala $TRAVIS_SCALA_VERSION" @@ -47,4 +48,4 @@ export CI_SNAPSHOT_RELEASE="${projectPrefix}publish" # for now, until we're confident in the new release scripts, just close the staging repo. export CI_SONATYPE_RELEASE="; sonatypePrepare; sonatypeBundleUpload; sonatypeClose" -sbt clean ${projectPrefix}test ${projectPrefix}versionPolicyCheck ${projectPrefix}publishLocal $releaseTask +sbt clean ${projectPrefix}test ${projectPrefix}publishLocal $versionCheckTask $releaseTask diff --git a/project/plugins.sbt b/project/plugins.sbt index 486c4b9..0401cc3 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1 @@ -addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.3.1") -addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "1.2.1") +addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.4.0")