From 3607a3910b86cead0adc28b004480a592151acf8 Mon Sep 17 00:00:00 2001 From: Milan van der Meer Date: Wed, 1 Mar 2023 23:37:38 +0100 Subject: [PATCH 1/4] Add Finagle 22.12.0 to MiMa --- project/FinaglePlugin.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/FinaglePlugin.scala b/project/FinaglePlugin.scala index a2d730e..0b09ac6 100644 --- a/project/FinaglePlugin.scala +++ b/project/FinaglePlugin.scala @@ -20,7 +20,7 @@ object FinaglePlugin extends AutoPlugin { * because the newest release is not binary compatible with the older * versions it was checked against. */ - val versions = Seq("22.7.0") + val versions = Seq("22.12.0", "22.7.0") lazy val modules = Seq( "com.twitter" %% "finagle-core" % versions.head From bf563b7efd9acb980b489dc0d723abadc7d09d65 Mon Sep 17 00:00:00 2001 From: Milan van der Meer <5628925+milanvdm@users.noreply.github.com> Date: Wed, 1 Mar 2023 23:48:31 +0100 Subject: [PATCH 2/4] Update Finagle to 22.12.0 --- project/FinaglePlugin.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/FinaglePlugin.scala b/project/FinaglePlugin.scala index a2d730e..0b09ac6 100644 --- a/project/FinaglePlugin.scala +++ b/project/FinaglePlugin.scala @@ -20,7 +20,7 @@ object FinaglePlugin extends AutoPlugin { * because the newest release is not binary compatible with the older * versions it was checked against. */ - val versions = Seq("22.7.0") + val versions = Seq("22.12.0", "22.7.0") lazy val modules = Seq( "com.twitter" %% "finagle-core" % versions.head From 59b8e00e23dbecaf6f6c5052e15734a55e315c72 Mon Sep 17 00:00:00 2001 From: Milan van der Meer Date: Fri, 3 Mar 2023 11:19:59 +0100 Subject: [PATCH 3/4] Add MiMa check to the root --- build.sbt | 4 ++-- project/FinaglePlugin.scala | 38 ++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/build.sbt b/build.sbt index 1775084..ab510a8 100644 --- a/build.sbt +++ b/build.sbt @@ -50,7 +50,7 @@ lazy val allSettings = baseSettings lazy val root = project .in(file(".")) - .enablePlugins(GhpagesPlugin, ScalaUnidocPlugin, NoPublishPlugin) + .enablePlugins(GhpagesPlugin, ScalaUnidocPlugin, NoPublishPlugin, FinaglePlugin) .settings(allSettings) .settings( ScalaUnidoc / unidoc / unidocProjectFilter := inAnyProject -- inProjects( @@ -72,7 +72,7 @@ lazy val root = project |import org.typelevel.catbird.util._ """.stripMargin ) - .aggregate(util, effect, effect3, finagle, benchmark, `scalafix-rules`, `scalafix-tests`) + .aggregate(util, effect, effect3, finagle, benchmark, `scalafix-rules`, `scalafix-tests`, FinaglePlugin.rootFinagle) .dependsOn(util, effect, finagle) lazy val util = project diff --git a/project/FinaglePlugin.scala b/project/FinaglePlugin.scala index 0b09ac6..950c112 100644 --- a/project/FinaglePlugin.scala +++ b/project/FinaglePlugin.scala @@ -20,31 +20,29 @@ object FinaglePlugin extends AutoPlugin { * because the newest release is not binary compatible with the older * versions it was checked against. */ - val versions = Seq("22.12.0", "22.7.0") + val versions = Seq("22.12.0") lazy val modules = Seq( "com.twitter" %% "finagle-core" % versions.head ) - override lazy val extraProjects = { - val subprojects = modules.map { module => - Project(module.name, file(s".${module.name}")) - .enablePlugins(NoPublishPlugin) - .settings( - libraryDependencies += module, - mimaCurrentClassfiles := { - (Compile / dependencyClasspath).value.seq.map(_.data).find(_.getName.startsWith(module.name)).get - }, - mimaPreviousArtifacts := versions.tail.map { v => - module.withRevision(v) - }.toSet - ) - } - - val rootFinagle = - project.in(file(s".rootFinagle")).enablePlugins(NoPublishPlugin).aggregate(subprojects.map(_.project): _*) - - rootFinagle +: subprojects + private lazy val subprojects = modules.map { module => + Project(module.name, file(s".${module.name}")) + .enablePlugins(NoPublishPlugin) + .settings( + libraryDependencies += module, + mimaCurrentClassfiles := { + (Compile / dependencyClasspath).value.seq.map(_.data).find(_.getName.startsWith(module.name)).get + }, + mimaPreviousArtifacts := versions.tail.map { v => + module.withRevision(v) + }.toSet + ) } + lazy val rootFinagle = + project.in(file(s".rootFinagle")).enablePlugins(NoPublishPlugin).aggregate(subprojects.map(_.project): _*) + + override lazy val extraProjects: Seq[Project] = rootFinagle +: subprojects + } From bd016c08c6f4363bddc0d8559b0f4d0d02b1ea37 Mon Sep 17 00:00:00 2001 From: Milan van der Meer Date: Fri, 3 Mar 2023 11:22:01 +0100 Subject: [PATCH 4/4] Remove Finagle --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index ab510a8..ee2a834 100644 --- a/build.sbt +++ b/build.sbt @@ -50,7 +50,7 @@ lazy val allSettings = baseSettings lazy val root = project .in(file(".")) - .enablePlugins(GhpagesPlugin, ScalaUnidocPlugin, NoPublishPlugin, FinaglePlugin) + .enablePlugins(GhpagesPlugin, ScalaUnidocPlugin, NoPublishPlugin) .settings(allSettings) .settings( ScalaUnidoc / unidoc / unidocProjectFilter := inAnyProject -- inProjects(