Skip to content

Commit 0c59bbe

Browse files
authored
Merge pull request scala#192 from scala-steward/update/sbt-scala-module-2.4.0
Update sbt-scala-module to 2.4.0
2 parents 261265a + 461f891 commit 0c59bbe

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

build.sbt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
Global / cancelable := true
22
publish / skip := true // in root
33

4-
ThisBuild / versionScheme := Some("early-semver")
5-
ThisBuild / versionPolicyIntention := Compatibility.BinaryAndSourceCompatible
6-
74
lazy val commonSettings: Seq[Setting[_]] =
85
Seq(scalaModuleAutomaticModuleName := Some("scala.collection.parallel")) ++
96
ScalaModulePlugin.scalaModuleSettings ++ Seq(
7+
versionPolicyIntention := Compatibility.BinaryAndSourceCompatible,
108
Compile / compile / scalacOptions --= (CrossVersion.partialVersion(scalaVersion.value) match {
119
case Some((3, _)) => Seq("-Xlint")
1210
case _ => Seq()
@@ -22,7 +20,6 @@ lazy val core = project.in(file("core"))
2220
.settings(
2321
name := "scala-parallel-collections",
2422
Compile / doc / autoAPIMappings := true,
25-
scalaModuleMimaPreviousVersion := Some("1.0.3"),
2623
)
2724

2825
lazy val junit = project.in(file("junit"))

build.sh

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

3333
if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then
34+
versionCheckTask="versionCheck"
3435
releaseTask="ci-release"
3536
if ! isReleaseJob; then
3637
echo "Not releasing on Java $ADOPTOPENJDK with Scala $TRAVIS_SCALA_VERSION"
@@ -47,4 +48,4 @@ export CI_SNAPSHOT_RELEASE="${projectPrefix}publish"
4748
# for now, until we're confident in the new release scripts, just close the staging repo.
4849
export CI_SONATYPE_RELEASE="; sonatypePrepare; sonatypeBundleUpload; sonatypeClose"
4950

50-
sbt clean ${projectPrefix}test versionPolicyCheck core/headerCheck ${projectPrefix}publishLocal $releaseTask
51+
sbt clean ${projectPrefix}test core/headerCheck ${projectPrefix}publishLocal $versionCheckTask $releaseTask

project/plugins.sbt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.3.1")
2-
addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "1.2.1")
1+
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.4.0")

0 commit comments

Comments
 (0)