From f809aeb8ab2ee43dbb37789e54b5e34e3f302876 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 3 Aug 2021 23:23:10 +0200 Subject: [PATCH 1/2] Update sbt-scala-module to 2.4.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 7588d9e7..73132edd 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,7 +8,7 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % crossVer) addSbtPlugin("org.scala-native" % "sbt-scala-native" % scalaNativeVersion) addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % crossVer) -addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.3.1") +addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.4.0") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.29") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0") addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "1.2.1") From b26ec56d0085fbe6847e4c457d7bf80c106d45ff Mon Sep 17 00:00:00 2001 From: Julien Richard-Foy Date: Wed, 4 Aug 2021 09:30:01 +0200 Subject: [PATCH 2/2] Adjust build definition - plugin sbt-version-policy is not needed anymore, it is brought by sbt-scala-module - key `versionScheme` is already configured by sbt-version-policy - key `scalaModuleMimaPreviousVersion` is not needed anymore - `versionPolicyCheck` does not need to be invoked explicitly, because the task `test` of published modules already depends on it --- build.sbt | 3 --- project/plugins.sbt | 1 - 2 files changed, 4 deletions(-) diff --git a/build.sbt b/build.sbt index 82f18702..e24fc236 100644 --- a/build.sbt +++ b/build.sbt @@ -75,13 +75,11 @@ lazy val compat = MultiScalaCrossProject(JSPlatform, JVMPlatform, NativePlatform sharedSourceDir / "scala-2.11_2.12" } }, - versionScheme := Some("early-semver"), versionPolicyIntention := Compatibility.BinaryCompatible, ) .jvmSettings( Test / unmanagedSourceDirectories += (ThisBuild / baseDirectory).value / "compat/src/test/scala-jvm", junit, - scalaModuleMimaPreviousVersion := Some("2.5.0"), mimaBinaryIssueFilters ++= { import com.typesafe.tools.mima.core._ import com.typesafe.tools.mima.core.ProblemFilters._ @@ -373,7 +371,6 @@ inThisBuild( List(s"""++${sys.env.get("TRAVIS_SCALA_VERSION").get}!"""), List(s"$projectPrefix/clean"), List(s"$testProjectPrefix/test"), - List(s"$projectPrefix/versionPolicyCheck"), List(s"$projectPrefix/publishLocal"), publishTask ).flatten diff --git a/project/plugins.sbt b/project/plugins.sbt index 73132edd..f7d5f569 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -11,4 +11,3 @@ addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % crossV addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.4.0") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.29") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0") -addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "1.2.1")