diff --git a/build.sbt b/build.sbt index 4359cbd..25c20f9 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ - val sharedSettings = ScalaModulePlugin.scalaModuleSettings ++ ScalaModulePlugin.scalaModuleOsgiSettings ++ Seq( name := "scala-async", scalaModuleAutomaticModuleName := Some("scala.async"), + versionPolicyIntention := Compatibility.BinaryAndSourceCompatible, OsgiKeys.exportPackage := Seq(s"scala.async.*;version=${version.value}"), 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 diff --git a/project/plugins.sbt b/project/plugins.sbt index aed2291..5d5094e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,3 @@ -addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.3.1") +addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.4.0") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")