From f69c560b3aa4cd87bde2e1a5a7e64b3388ead2ff Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Fri, 10 Nov 2023 23:56:40 +0100 Subject: [PATCH 1/2] re-enable mima --- .github/workflows/format.yml | 2 +- .scalafmt.conf | 2 +- project/Common.scala | 12 ++++++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 76bdebe2..abbee257 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -22,5 +22,5 @@ jobs: - name: Check project is formatted uses: jrouly/scalafmt-native-action@v2 with: - version: '3.7.1' + version: '3.7.11' arguments: '--list --mode diff-ref=origin/main' diff --git a/.scalafmt.conf b/.scalafmt.conf index 1aae8a44..23ae7122 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.7.1 +version = 3.7.11 runner.dialect = scala213 project.git = true style = defaultWithAlign diff --git a/project/Common.scala b/project/Common.scala index 679173be..68f154a9 100644 --- a/project/Common.scala +++ b/project/Common.scala @@ -68,8 +68,16 @@ object Common extends AutoPlugin { // -q Suppress stdout for successful tests. Test / testOptions += Tests.Argument(TestFrameworks.JUnit, "-a", "-v", "-q"), Test / logBuffered := false, - // temporarily disable mima checks - mimaPreviousArtifacts := Set.empty) + mimaPreviousArtifacts := { + moduleName.value match { + case name if name.endsWith("-tests") => Set.empty + case _ => + Set( + organization.value %% moduleName.value % previousStableVersion.value + .getOrElse(throw new Error("Unable to determine previous version"))) + + } + }) override lazy val buildSettings = Seq( dynverSonatypeSnapshots := true) From 55c0bb3745d425ca4e3dd365c8f9854e3098b824 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 13 Nov 2023 09:47:54 +0100 Subject: [PATCH 2/2] hardcode version to compare to due to CI issues --- project/Common.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/project/Common.scala b/project/Common.scala index 68f154a9..4cc222ee 100644 --- a/project/Common.scala +++ b/project/Common.scala @@ -38,6 +38,8 @@ object Common extends AutoPlugin { url("https://github.com/apache/incubator-pekko-projection/graphs/contributors")), description := "Apache Pekko Projection.") + val mimaCompareVersion = "1.0.0" + override lazy val projectSettings = Seq( projectInfoVersion := (if (isSnapshot.value) "snapshot" else version.value), crossVersion := CrossVersion.binary, @@ -73,9 +75,7 @@ object Common extends AutoPlugin { case name if name.endsWith("-tests") => Set.empty case _ => Set( - organization.value %% moduleName.value % previousStableVersion.value - .getOrElse(throw new Error("Unable to determine previous version"))) - + organization.value %% moduleName.value % mimaCompareVersion) } })