From 7f47f5ca75b861569d1906da06193069fcaa8e67 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 3 Aug 2021 23:22:41 +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 33d0107..0401cc3 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.3.1") +addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.4.0") From 45163218ae7890fade4c3d90d92b2cee7c054ed2 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 31 Aug 2021 15:28:46 -0400 Subject: [PATCH 2/2] configure sbt-version-policy --- build.sbt | 1 + build.sh | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 1f17478..3eafd51 100644 --- a/build.sbt +++ b/build.sbt @@ -3,6 +3,7 @@ ScalaModulePlugin.scalaModuleOsgiSettings name := "scala-async" scalaModuleAutomaticModuleName := Some("scala.async") +versionPolicyIntention := Compatibility.BinaryAndSourceCompatible libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value % "provided" libraryDependencies += "junit" % "junit" % "4.13.2" % Test diff --git a/build.sh b/build.sh index 65cc465..7b807f8 100755 --- a/build.sh +++ b/build.sh @@ -37,6 +37,7 @@ tagPat="^v$verPat(#$verPat)?$" if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then releaseTask="ci-release" + versionCheckTask="versionCheck" tagScalaVer=$(echo $TRAVIS_TAG | sed s/[^#]*// | sed s/^#//) if [[ "$tagScalaVer" == "" ]]; then if ! isReleaseJob; then @@ -62,4 +63,4 @@ export CI_SNAPSHOT_RELEASE="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 "$setTagScalaVersion" clean test publishLocal $releaseTask +sbt "$setTagScalaVersion" clean test publishLocal $versionCheckTask $releaseTask