Skip to content

Commit

Permalink
Merge pull request #236 from xuwei-k/mima
Browse files Browse the repository at this point in the history
fix mima settings
  • Loading branch information
rickynils committed Apr 15, 2016
2 parents 3c5242c + e831eee commit 8b600d6
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -80,20 +80,20 @@ lazy val sharedSettings = MimaSettings.settings ++ Seq(
}
)

import com.typesafe.tools.mima.plugin.MimaKeys.previousArtifact
import com.typesafe.tools.mima.plugin.MimaKeys.mimaPreviousArtifacts

lazy val js = project.in(file("js"))
.settings(sharedSettings: _*)
.settings(
scalaJSStage in Global := FastOptStage,
previousArtifact := Some("org.scalacheck" % "scalacheck_sjs0.6_2.11" % "1.13.1"),
mimaPreviousArtifacts := Set("org.scalacheck" % s"scalacheck_sjs0.6_${scalaBinaryVersion.value}" % "1.13.1"),
libraryDependencies += "org.scala-js" %% "scalajs-test-interface" % scalaJSVersion
)
.enablePlugins(ScalaJSPlugin)

lazy val jvm = project.in(file("jvm"))
.settings(sharedSettings: _*)
.settings(
previousArtifact := Some("org.scalacheck" % "scalacheck_2.11" % "1.13.1"),
mimaPreviousArtifacts := Set("org.scalacheck" % s"scalacheck_${scalaBinaryVersion.value}" % "1.13.1"),
libraryDependencies += "org.scala-sbt" % "test-interface" % "1.0"
)
4 changes: 2 additions & 2 deletions project/MimaSettings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ object MimaSettings {
import com.typesafe.tools.mima
import mima.core._
import ProblemFilters.exclude
import mima.plugin.MimaKeys.{binaryIssueFilters, previousArtifact}
import mima.plugin.MimaKeys.mimaBinaryIssueFilters
import mima.plugin.MimaPlugin.mimaDefaultSettings

lazy val settings = mimaDefaultSettings ++ Seq(
binaryIssueFilters :=
mimaBinaryIssueFilters :=
removedPrivateMethods.map(exclude[MissingMethodProblem](_)) ++
newMethods.map(exclude[MissingMethodProblem](_)) ++
removedPrivateClasses.map(exclude[MissingClassProblem](_)) ++
Expand Down
4 changes: 3 additions & 1 deletion project/plugin.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.6")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.9")

addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")

addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.8")

scalacOptions += "-deprecation"

0 comments on commit 8b600d6

Please sign in to comment.