From a31e86c814e3dd85c595524f170ebecc639aa5ae Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 3 Aug 2021 23:23:36 +0200 Subject: [PATCH 1/2] Update sbt-scala-module to 2.4.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index e53f281..4515b79 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,3 @@ -addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.2.4") +addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.4.0") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.6.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") From a4e96e8a3f3eab10e8f907687d1727bc3f3be3ff Mon Sep 17 00:00:00 2001 From: Julien Richard-Foy Date: Wed, 4 Aug 2021 09:52:44 +0200 Subject: [PATCH 2/2] Adjust build definition and CI process - remove `scalaModuleMimaPreviousVersion` (already set by sbt-version-policy) - add `scalaModuleAutomaticModuleName` (required by sbt-scala-module 2.3+) - add `versionPolicyIntention` - invoke `versionCheck` before publishing a release Fixes #72 Fixes #15 --- build.sbt | 3 ++- build.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 6c0525d..198e550 100644 --- a/build.sbt +++ b/build.sbt @@ -18,7 +18,8 @@ lazy val scalaLibraryNext = crossProject(JVMPlatform, JSPlatform) .jsEnablePlugins(ScalaJSJUnitPlugin) .settings( ScalaModulePlugin.scalaModuleSettings, - scalaModuleMimaPreviousVersion := None, + scalaModuleAutomaticModuleName := Some("scala.library.next"), + versionPolicyIntention := Compatibility.None, // TODO Change to `Compatibility.BinaryAndSourceCompatible` after the first release scalacOptions ++= Seq("-deprecation", "-feature", "-Werror"), libraryDependencies ++= Seq( "org.scalacheck" %%% "scalacheck" % "1.15.4" % Test, diff --git a/build.sh b/build.sh index 1cd603f..a147701 100755 --- a/build.sh +++ b/build.sh @@ -34,6 +34,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" @@ -50,4 +51,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}publishLocal $releaseTask +sbt clean ${projectPrefix}test ${projectPrefix}publishLocal $versionCheckTask $releaseTask