From b5d73896ca2ea2e9a21c7f35effc322850c45064 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 4 Feb 2020 12:20:47 +0100 Subject: [PATCH 1/3] Disable sbt-mima in projects that don't need it --- build.sbt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build.sbt b/build.sbt index 02d0571c4..4cb64c63a 100644 --- a/build.sbt +++ b/build.sbt @@ -71,6 +71,7 @@ lazy val `lm-coursier-shaded` = project lazy val `sbt-coursier-shared` = project .in(file("modules/sbt-coursier-shared")) + .disablePlugins(MimaPlugin) .dependsOn(`lm-coursier`) .settings( plugin, @@ -81,6 +82,7 @@ lazy val `sbt-coursier-shared` = project lazy val `sbt-coursier-shared-shaded` = project .in(file("modules/sbt-coursier-shared/target/shaded-module")) + .disablePlugins(MimaPlugin) .dependsOn(`lm-coursier-shaded`) .settings( plugin, @@ -91,6 +93,7 @@ lazy val `sbt-coursier-shared-shaded` = project lazy val `sbt-lm-coursier` = project .in(file("modules/sbt-lm-coursier")) .enablePlugins(ScriptedPlugin) + .disablePlugins(MimaPlugin) .dependsOn(`sbt-coursier-shared-shaded`) .settings( plugin, @@ -108,6 +111,7 @@ lazy val `sbt-lm-coursier` = project lazy val `sbt-coursier` = project .in(file("modules/sbt-coursier")) .enablePlugins(ScriptedPlugin) + .disablePlugins(MimaPlugin) .dependsOn(`sbt-coursier-shared`) .settings( plugin, @@ -124,6 +128,7 @@ lazy val `sbt-coursier` = project lazy val `sbt-pgp-coursier` = project .in(file("modules/sbt-pgp-coursier")) .enablePlugins(ScriptedPlugin) + .disablePlugins(MimaPlugin) .dependsOn(`sbt-coursier`) .settings( plugin, @@ -143,6 +148,7 @@ lazy val `sbt-pgp-coursier` = project lazy val `sbt-shading` = project .in(file("modules/sbt-shading")) .enablePlugins(ScriptedPlugin) + .disablePlugins(MimaPlugin) .dependsOn(`sbt-coursier`) .settings( plugin, @@ -158,6 +164,7 @@ lazy val `sbt-shading` = project lazy val `sbt-coursier-root` = project .in(file(".")) + .disablePlugins(MimaPlugin) .aggregate( `lm-coursier`, `lm-coursier-shaded`, From cf7498d256f8f3e9e6502c25f23cecbe3b48cdde Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 4 Feb 2020 12:21:09 +0100 Subject: [PATCH 2/3] Switch to sbt-mima 0.6.3 And restrict checked versions in mima (incompatible signature problem with former versions). --- project/Mima.scala | 3 +-- project/plugins.sbt | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/project/Mima.scala b/project/Mima.scala index 258bc7831..93ec63c33 100644 --- a/project/Mima.scala +++ b/project/Mima.scala @@ -14,14 +14,13 @@ object Mima { .forall(c => c == '.' || c == '-' || c.isDigit) def binaryCompatibilityVersions: Set[String] = - Seq("git", "tag", "--merged", "HEAD^", "--contains", "736d5c11") + Seq("git", "tag", "--merged", "HEAD^", "--contains", "v2.0.0-RC3-6") .!! .linesIterator .map(_.trim) .filter(_.startsWith("v")) .map(_.stripPrefix("v")) .filter(stable) - .filter(_ != "2.0.0-RC3-2") // borked release .toSet def settings: Seq[Setting[_]] = Seq( diff --git a/project/plugins.sbt b/project/plugins.sbt index 3df6cf45e..a7c8e4c35 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.0") -addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.3.0") +addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.6.3") addSbtPlugin("io.get-coursier" % "sbt-coursier" % "2.0.0-RC5-3") addSbtPlugin("io.get-coursier" % "sbt-shading" % "2.0.0-RC5-3") From caf77f06c34c0c0c823bf93da83d91c253e4167f Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 4 Feb 2020 13:00:06 +0100 Subject: [PATCH 3/3] Ignore incompatible signature problems Seems these are spurious (only getting them on CI) --- project/Mima.scala | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/project/Mima.scala b/project/Mima.scala index 93ec63c33..b4f992e6f 100644 --- a/project/Mima.scala +++ b/project/Mima.scala @@ -36,6 +36,8 @@ object Mima { import com.typesafe.tools.mima.core._ Seq( + // spurious errors on CI + ProblemFilters.exclude[IncompatibleSignatureProblem]("*"), // Methods that shouldn't have been there ProblemFilters.exclude[DirectMissingMethodProblem]("lmcoursier.credentials.FileCredentials.get"), ProblemFilters.exclude[DirectMissingMethodProblem]("lmcoursier.credentials.DirectCredentials.matches"), @@ -55,6 +57,8 @@ object Mima { import com.typesafe.tools.mima.core._ Seq( + // spurious errors on CI + ProblemFilters.exclude[IncompatibleSignatureProblem]("*"), // Should have been put under lmcoursier.internal? (pb: Problem) => pb.matchName.forall(!_.startsWith("lmcoursier.definitions.ToCoursier.")) )