diff --git a/build.sbt b/build.sbt index 9289ea27..79b3402d 100644 --- a/build.sbt +++ b/build.sbt @@ -1,12 +1,10 @@ Global / cancelable := true publish / skip := true // in root -ThisBuild / versionScheme := Some("early-semver") -ThisBuild / versionPolicyIntention := Compatibility.BinaryAndSourceCompatible - lazy val commonSettings: Seq[Setting[_]] = Seq(scalaModuleAutomaticModuleName := Some("scala.collection.parallel")) ++ ScalaModulePlugin.scalaModuleSettings ++ Seq( + versionPolicyIntention := Compatibility.BinaryAndSourceCompatible, Compile / compile / scalacOptions --= (CrossVersion.partialVersion(scalaVersion.value) match { case Some((3, _)) => Seq("-Xlint") case _ => Seq() @@ -22,7 +20,6 @@ lazy val core = project.in(file("core")) .settings( name := "scala-parallel-collections", Compile / doc / autoAPIMappings := true, - scalaModuleMimaPreviousVersion := Some("1.0.3"), ) lazy val junit = project.in(file("junit")) diff --git a/build.sh b/build.sh index 36404356..45d3925e 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 versionPolicyCheck core/headerCheck ${projectPrefix}publishLocal $releaseTask +sbt clean ${projectPrefix}test core/headerCheck ${projectPrefix}publishLocal $versionCheckTask $releaseTask diff --git a/project/plugins.sbt b/project/plugins.sbt index 486c4b9d..0401cc36 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")