Skip to content

Commit fdc2b8a

Browse files
authored
Merge pull request #241 from scala-steward/update/sbt-scala-module-2.4.0
Update sbt-scala-module to 2.4.0
2 parents 57e1f7c + f0192a6 commit fdc2b8a

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

build.sbt

+1-5
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@ def osgiExport(scalaVersion: String, version: String) = {
1818
}) ++ Seq(s"scala.compat.java8.*;version=${version}")
1919
}
2020

21-
ThisBuild / versionScheme := Some("early-semver")
22-
ThisBuild / versionPolicyIntention := Compatibility.BinaryAndSourceCompatible
23-
2421
lazy val commonSettings = Seq(
22+
versionPolicyIntention := Compatibility.BinaryAndSourceCompatible,
2523
Compile / unmanagedSourceDirectories ++= {
2624
(Compile / unmanagedSourceDirectories).value.flatMap { dir =>
2725
CrossVersion.partialVersion(scalaVersion.value) match {
@@ -73,8 +71,6 @@ lazy val scalaJava8Compat = (project in file("."))
7371

7472
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test",
7573

76-
scalaModuleMimaPreviousVersion := Some("1.0.0"),
77-
7874
mimaBinaryIssueFilters ++= {
7975
import com.typesafe.tools.mima.core._, ProblemFilters._
8076
Seq(

build.sh

+2-1
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 ${projectPrefix}versionPolicyCheck ${projectPrefix}publishLocal $releaseTask
51+
sbt clean ${projectPrefix}test ${projectPrefix}publishLocal $versionCheckTask $releaseTask

project/plugins.sbt

+1-2
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)