Skip to content

Commit

Permalink
Remove sbt-partial-unification (#3217)
Browse files Browse the repository at this point in the history
* Replace partial-unification sbt plugin

* Remove unused sbt plugin

* Set -Ypartial-unification on binCompatTest project
  • Loading branch information
travisbrown authored and LukaJCB committed Dec 18, 2019
1 parent cbc50f4 commit 9624f5c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
4 changes: 3 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,8 @@ lazy val binCompatTest = project
useCoursier := false,
commonScalaVersionSettings,
addCompilerPlugin(("org.typelevel" %% "kind-projector" % kindProjectorVersion).cross(CrossVersion.full)),
libraryDependencies += mimaPrevious("cats-core", scalaVersion.value, version.value).last % Provided
libraryDependencies += mimaPrevious("cats-core", scalaVersion.value, version.value).last % Provided,
scalacOptions ++= (if (priorTo2_13(scalaVersion.value)) Seq("-Ypartial-unification") else Nil)
)
.settings(testingDependencies)
.dependsOn(core.jvm % Test)
Expand Down Expand Up @@ -802,6 +803,7 @@ def commonScalacOptions(scalaVersion: String) =
) ++ (if (priorTo2_13(scalaVersion))
Seq(
"-Yno-adapted-args",
"-Ypartial-unification",
"-Xfuture"
)
else
Expand Down
1 change: 0 additions & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")
addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.9.5")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8.1")
addSbtPlugin("com.47deg" % "sbt-microsites" % "0.9.7")
addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.2")
addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.6.13")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.1")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "0.6.1")
Expand Down
1 change: 0 additions & 1 deletion scalafix/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.11")
addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.2")

0 comments on commit 9624f5c

Please sign in to comment.