Skip to content

Commit

Permalink
Fix merge conflict caused by the addition of mima to the kernel project.
Browse files Browse the repository at this point in the history
The removal of provided artefacts is done inline because it is used in only
one place.
  • Loading branch information
rklaehn committed Jan 29, 2016
2 parents 69ad4e4 + e7affc9 commit 87f2f3c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
9 changes: 8 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import com.typesafe.sbt.pgp.PgpKeys.publishSigned
import com.typesafe.sbt.SbtSite.SiteKeys._
import com.typesafe.sbt.SbtGhPages.GhPagesKeys._
import com.typesafe.tools.mima.plugin.MimaPlugin.mimaDefaultSettings
import com.typesafe.tools.mima.plugin.MimaKeys.previousArtifacts
import sbtunidoc.Plugin.UnidocKeys._
import ReleaseTransformations._
import ScoverageSbtPlugin._
Expand Down Expand Up @@ -134,6 +136,11 @@ lazy val macrosJS = macros.js
lazy val kernel = crossProject.crossType(CrossType.Pure)
.settings(moduleName := "cats-kernel")
.settings(kernelSettings:_*)
.settings(mimaDefaultSettings:_*)
.settings(previousArtifacts := Set(
// TODO: Add cats-kernel artifacts as they are released, e.g.
// "org.spire-math" %% "cats-kernel" % "0.4.0"
))
.settings(pomPostProcess := { (node) =>
import scala.xml._
import scala.xml.transform._
Expand Down Expand Up @@ -235,7 +242,7 @@ lazy val publishSettings = Seq(
// These aliases serialise the build for the benefit of Travis-CI.
addCommandAlias("buildJVM", ";macrosJVM/compile;kernelJVM/compile;coreJVM/compile;kernelJVM/test;coreJVM/test;lawsJVM/compile;testsJVM/test;jvm/test;bench/test")

addCommandAlias("validateJVM", ";scalastyle;buildJVM;makeSite")
addCommandAlias("validateJVM", ";scalastyle;buildJVM;kernelJVM/mima-report-binary-issues;makeSite")

addCommandAlias("validateJS", ";macrosJS/compile;kernelJS/compile;coreJS/compile;lawsJS/compile;testsJS/test;js/test")

Expand Down
1 change: 1 addition & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.2.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.8.4")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.5")
addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.3.5")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.8")

0 comments on commit 87f2f3c

Please sign in to comment.