Skip to content

Commit 18fbfb3

Browse files
authored
Merge pull request #11 from sjrd/post-release-1.2.0
Post release 1.2.0.
2 parents c04ada5 + a4d1b97 commit 18fbfb3

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

build.sbt

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
val previousVersion: Option[String] = Some("1.1.1")
2-
val newScalaBinaryVersionsInThisRelease: Set[String] = Set("3")
1+
val previousVersion: Option[String] = Some("1.2.0")
2+
val newScalaBinaryVersionsInThisRelease: Set[String] = Set.empty
33

44
inThisBuild(Def.settings(
55
organization := "org.scala-js",
@@ -73,7 +73,6 @@ val commonSettings = Def.settings(
7373
mimaFailOnNoPrevious := newScalaBinaryVersionsInThisRelease.isEmpty,
7474
// MiMa auto-configuration
7575
mimaPreviousArtifacts ++= {
76-
val scalaV = scalaVersion.value
7776
val scalaBinaryV = scalaBinaryVersion.value
7877
val thisProjectID = projectID.value
7978
previousVersion match {
@@ -83,16 +82,7 @@ val commonSettings = Def.settings(
8382
// New in this release, no binary compatibility to comply to
8483
Set.empty
8584
case Some(prevVersion) =>
86-
/* Filter out e:info.apiURL as it expects 1.1.1-SNAPSHOT, whereas the
87-
* artifact we're looking for has 1.1.0 (for example).
88-
*/
89-
val prevExtraAttributes =
90-
thisProjectID.extraAttributes.filterKeys(_ != "e:info.apiURL")
91-
val prevProjectID =
92-
(thisProjectID.organization % thisProjectID.name % prevVersion)
93-
.cross(thisProjectID.crossVersion)
94-
.extra(prevExtraAttributes.toSeq: _*)
95-
Set(prevProjectID)
85+
Set(thisProjectID.organization %% thisProjectID.name % prevVersion)
9686
}
9787
},
9888
)

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0")
2-
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.8.1")
2+
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")
33
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2")

0 commit comments

Comments
 (0)