Skip to content

Commit bac7932

Browse files
authored
Merge pull request #274 from scala-steward/update/sbt-scala-module-2.4.0
Update sbt-scala-module to 2.4.0
2 parents c66a4bc + d348fd2 commit bac7932

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

Diff for: build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
21
val sharedSettings = ScalaModulePlugin.scalaModuleSettings ++ ScalaModulePlugin.scalaModuleOsgiSettings ++ Seq(
32
name := "scala-async",
43
scalaModuleAutomaticModuleName := Some("scala.async"),
4+
versionPolicyIntention := Compatibility.BinaryAndSourceCompatible,
55

66
OsgiKeys.exportPackage := Seq(s"scala.async.*;version=${version.value}"),
77

Diff for: build.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ tagPat="^v$verPat(#$verPat)?$"
3737

3838
if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then
3939
releaseTask="ci-release"
40+
versionCheckTask="versionCheck"
4041
tagScalaVer=$(echo $TRAVIS_TAG | sed s/[^#]*// | sed s/^#//)
4142
if [[ "$tagScalaVer" == "" ]]; then
4243
if ! isReleaseJob; then
@@ -62,4 +63,4 @@ export CI_SNAPSHOT_RELEASE="publish"
6263
# for now, until we're confident in the new release scripts, just close the staging repo.
6364
export CI_SONATYPE_RELEASE="; sonatypePrepare; sonatypeBundleUpload; sonatypeClose"
6465
65-
sbt "$setTagScalaVersion" clean test publishLocal $releaseTask
66+
sbt "$setTagScalaVersion" clean test publishLocal $versionCheckTask $releaseTask

Diff for: project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.3.1")
1+
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.4.0")
22
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.0")
33
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")

0 commit comments

Comments
 (0)