Skip to content

Commit e46984f

Browse files
committed
Move mimaSettings back to scalaModuleSettings
Running MiMa makes sense also for scala-js artifacts.
1 parent 74b093e commit e46984f

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/main/scala/ScalaModulePlugin.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,9 @@ object ScalaModulePlugin extends AutoPlugin {
143143
</developer>
144144
</developers>
145145
)
146-
)
146+
) ++ mimaSettings
147147

148-
lazy val scalaModuleSettingsJVM: Seq[Setting[_]] = Seq(
149-
mimaPreviousVersion := None
150-
) ++ mimaSettings ++ scalaModuleOsgiSettings
148+
lazy val scalaModuleSettingsJVM: Seq[Setting[_]] = scalaModuleOsgiSettings
151149

152150
// adapted from https://github.com/typesafehub/migration-manager/blob/0.1.6/sbtplugin/src/main/scala/com/typesafe/tools/mima/plugin/SbtMima.scala#L69
153151
private def artifactExists(organization: String, name: String, scalaBinaryVersion: String, version: String, ivy: IvySbt, s: TaskStreams): Boolean = {
@@ -176,6 +174,8 @@ object ScalaModulePlugin extends AutoPlugin {
176174
private val runMimaIfEnabled = taskKey[Unit]("Run MiMa if mimaPreviousVersion and the module can be resolved against the current scalaBinaryVersion.")
177175

178176
private lazy val mimaSettings: Seq[Setting[_]] = MimaPlugin.mimaDefaultSettings ++ Seq(
177+
mimaPreviousVersion := None,
178+
179179
// manual cross-versioning because https://github.com/typesafehub/migration-manager/issues/62
180180
mimaPreviousArtifacts := Set(organization.value % s"${name.value}_${scalaBinaryVersion.value}" % mimaPreviousVersion.value.getOrElse("dummy")),
181181

0 commit comments

Comments
 (0)