Skip to content

Commit c1c3973

Browse files
committed
Fix mima checks, make sure to run them
1 parent 0e9f7f2 commit c1c3973

File tree

2 files changed

+9
-14
lines changed

2 files changed

+9
-14
lines changed

build.sbt

+8-13
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ lazy val root = project
5151
publish := {},
5252
publishLocal := {},
5353
name := "metrics4-scala-root",
54-
sonatypeProfileName := "nl.grons"
54+
sonatypeProfileName := "nl.grons",
55+
mimaPreviousArtifacts := Set.empty,
5556
)
5657

5758
lazy val metricsScala = project
@@ -65,7 +66,7 @@ lazy val metricsScala = project
6566
"io.dropwizard.metrics" % "metrics-core" % "4.2.27",
6667
"io.dropwizard.metrics" % "metrics-healthchecks" % "4.2.27"
6768
),
68-
mimaPreviousArtifacts := mimaPrevious(scalaVersion.value)
69+
mimaPreviousArtifacts := mimaPrevious(name.value, scalaVersion.value)
6970
)
7071

7172
lazy val metricsScalaHdr = project
@@ -81,7 +82,7 @@ lazy val metricsScalaHdr = project
8182
// Override version that hdrhistogram-metrics-reservoir depends on:
8283
"org.hdrhistogram" % "HdrHistogram" % "2.2.2"
8384
),
84-
mimaPreviousArtifacts := mimaPrevious(scalaVersion.value)
85+
mimaPreviousArtifacts := mimaPrevious(name.value, scalaVersion.value)
8586
)
8687

8788
lazy val metricsPekko = project
@@ -116,7 +117,7 @@ lazy val metricsAkka26 = project
116117
// scala-steward:on
117118
),
118119
sourceDirectory := baseDirectory.value.getParentFile / "metrics-akka" / "src",
119-
mimaPreviousArtifacts := mimaPrevious(scalaVersion.value)
120+
mimaPreviousArtifacts := mimaPrevious(name.value, scalaVersion.value)
120121
)
121122

122123
lazy val metricsAkka25 = project
@@ -135,20 +136,14 @@ lazy val metricsAkka25 = project
135136
// scala-steward:on
136137
),
137138
sourceDirectory := baseDirectory.value.getParentFile / "metrics-akka" / "src",
138-
mimaPreviousArtifacts := mimaPrevious(scalaVersion.value)
139+
mimaPreviousArtifacts := mimaPrevious(name.value, scalaVersion.value)
139140
)
140141

141142
// 2.11.x are the only pre-2.12 scala versions that are used in this build
142143
def before212(scalaVersion: String): Boolean = scalaVersion.startsWith("2.11.")
143144

144-
def mimaPrevious(scalaVersion: String): Set[ModuleID] = {
145-
if (scalaVersion.startsWith("3."))
146-
Set("nl.grons" %% "metrics4-scala" % "4.2.8")
147-
else if (scalaVersion.startsWith("2.13."))
148-
Set("nl.grons" %% "metrics4-scala" % "4.0.7")
149-
else
150-
Set("nl.grons" %% "metrics4-scala" % "4.0.1")
151-
}
145+
def mimaPrevious(module: String, scalaVersion: String): Set[ModuleID] =
146+
Set("nl.grons" %% module % "4.2.8")
152147

153148
def scalacTargets(scalaVersion: String): Seq[String] = {
154149
if (scalaVersion.startsWith("2.11.") || scalaVersion.startsWith("2.12.")) Seq("-target:jvm-1.8")

crossrelease.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
# Does a full cross build of all scala/akka versions.
33

4-
DEFAULT_COMMAND="+publishSigned; sonatypeBundleRelease"
4+
DEFAULT_COMMAND="; +clean; +test; +package; +mimaFindBinaryIssues; +publishSigned; sonatypeBundleRelease"
55

66
# Assumes osx
77
export JAVA_HOME=`/usr/libexec/java_home -v 11`

0 commit comments

Comments
 (0)