Skip to content

Commit 6d78f6b

Browse files
authored
Merge pull request #120 from gzm0/enable-mima
Enable Mima
2 parents 0bc6753 + 712fab1 commit 6d78f6b

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

Diff for: build.sbt

+15-15
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import org.openqa.selenium.Capabilities
77
import org.scalajs.jsenv.selenium.SeleniumJSEnv
88
import org.scalajs.jsenv.selenium.TestCapabilities
99

10-
val previousVersion = None
10+
val previousVersion: Option[String] = Some("1.1.0")
1111

1212
val newScalaBinaryVersionsInThisRelease: Set[String] =
1313
Set()
@@ -29,31 +29,31 @@ val commonSettings: Seq[Setting[_]] = Seq(
2929
testOptions += Tests.Argument(TestFramework("com.novocode.junit.JUnitFramework"), "-v", "-a")
3030
)
3131

32-
val previousArtifactSetting = Def.settings()
33-
/* MiMa is completely disabled while we are in 1.0.0-SNAPSHOT.
32+
val previousArtifactSetting = Def.settings(
3433
mimaPreviousArtifacts ++= {
3534
val scalaV = scalaVersion.value
3635
val scalaBinaryV = scalaBinaryVersion.value
37-
if (newScalaBinaryVersionsInThisRelease.contains(scalaBinaryV)) {
38-
// New in this release, no binary compatibility to comply to
39-
Set.empty
40-
} else {
41-
previousVersion.map { pv =>
42-
val thisProjectID = projectID.value
36+
val thisProjectID = projectID.value
37+
previousVersion match {
38+
case None =>
39+
Set.empty
40+
case _ if newScalaBinaryVersionsInThisRelease.contains(scalaBinaryV) =>
41+
// New in this release, no binary compatibility to comply to
42+
Set.empty
43+
case Some(prevVersion) =>
4344
/* Filter out e:info.apiURL as it expects 0.6.7-SNAPSHOT, whereas the
4445
* artifact we're looking for has 0.6.6 (for example).
4546
*/
4647
val prevExtraAttributes =
4748
thisProjectID.extraAttributes.filterKeys(_ != "e:info.apiURL")
4849
val prevProjectID =
49-
(thisProjectID.organization % thisProjectID.name % pv)
50-
.cross(thisProjectID.crossVersion)
51-
.extra(prevExtraAttributes.toSeq: _*)
52-
CrossVersion(scalaV, scalaBinaryV)(prevProjectID).cross(CrossVersion.Disabled)
53-
}.toSet
50+
(thisProjectID.organization % thisProjectID.name % prevVersion)
51+
.cross(thisProjectID.crossVersion)
52+
.extra(prevExtraAttributes.toSeq: _*)
53+
Set(prevProjectID)
5454
}
5555
}
56-
*/
56+
)
5757

5858
val jsEnvCapabilities = settingKey[org.openqa.selenium.Capabilities](
5959
"Capabilities of the SeleniumJSEnv")

0 commit comments

Comments
 (0)