Skip to content

Commit 9992162

Browse files
authored
Merge pull request #96 from scala-steward/update/sbt-scala-module-2.4.0
Update sbt-scala-module to 2.4.0
2 parents cdee412 + e4ef840 commit 9992162

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

build.sbt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ lazy val scalaLibraryNext = crossProject(JVMPlatform, JSPlatform)
1818
.jsEnablePlugins(ScalaJSJUnitPlugin)
1919
.settings(
2020
ScalaModulePlugin.scalaModuleSettings,
21-
scalaModuleMimaPreviousVersion := None,
21+
scalaModuleAutomaticModuleName := Some("scala.library.next"),
22+
versionPolicyIntention := Compatibility.None, // TODO Change to `Compatibility.BinaryAndSourceCompatible` after the first release
2223
scalacOptions ++= Seq("-deprecation", "-feature", "-Werror"),
2324
libraryDependencies ++= Seq(
2425
"org.scalacheck" %%% "scalacheck" % "1.15.4" % Test,

build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ verPat="[0-9]+\.[0-9]+\.[0-9]+(-[A-Za-z0-9-]+)?"
3434
tagPat="^v$verPat(#.*)?$"
3535

3636
if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then
37+
versionCheckTask="versionCheck"
3738
releaseTask="ci-release"
3839
if ! isReleaseJob; then
3940
echo "Not releasing on Java $ADOPTOPENJDK with Scala $TRAVIS_SCALA_VERSION"
@@ -50,4 +51,4 @@ export CI_SNAPSHOT_RELEASE="${projectPrefix}publish"
5051
# for now, until we're confident in the new release scripts, just close the staging repo.
5152
export CI_SONATYPE_RELEASE="; sonatypePrepare; sonatypeBundleUpload; sonatypeClose"
5253

53-
sbt clean ${projectPrefix}test ${projectPrefix}publishLocal $releaseTask
54+
sbt clean ${projectPrefix}test ${projectPrefix}publishLocal $versionCheckTask $releaseTask

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.2.4")
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.1.0")

0 commit comments

Comments
 (0)