From 60ed5b545aa7951b0a0dfee48fb038b1ce700312 Mon Sep 17 00:00:00 2001 From: Brice Jaglin Date: Wed, 19 May 2021 15:17:47 +0200 Subject: [PATCH] remove coupling to sbt-projectmatrix, take 2 --- build.sbt | 6 ------ project/Dependencies.scala | 4 ---- project/plugins.sbt | 6 ------ src/sbt-test/sbt-1.5/testkit/project/plugins.sbt | 1 + 4 files changed, 1 insertion(+), 16 deletions(-) diff --git a/build.sbt b/build.sbt index ef2e723a..a645a52b 100644 --- a/build.sbt +++ b/build.sbt @@ -40,12 +40,6 @@ commands += Command.command("ci-windows") { s => // Dependencies resolvers += Resolver.sonatypeRepo("public") libraryDependencies ++= Dependencies.all -libraryDependencies ++= Dependencies.sbt1Plugins.flatMap { plugin => - val sbtV = (sbtBinaryVersion in pluginCrossBuild).value - val scalaV = (scalaBinaryVersion in update).value - if (sbtV.startsWith("0.13")) Nil - else Seq(sbt.Defaults.sbtPluginExtra(plugin, sbtV, scalaV)) -} libraryDependencies ++= List( "com.lihaoyi" %% "fansi" % "0.2.6" % Test, "org.scalatest" %% "scalatest" % "3.2.9" % Test diff --git a/project/Dependencies.scala b/project/Dependencies.scala index b5989927..b1bcbd3e 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -13,8 +13,4 @@ object Dependencies { "com.geirsson" %% "coursier-small" % "1.3.3", "io.get-coursier" % "interface" % "1.0.4" ) - - val sbt1Plugins = List( - "com.eed3si9n" % "sbt-projectmatrix" % "0.8.0" - ) } diff --git a/project/plugins.sbt b/project/plugins.sbt index a53e2af2..41f5e1c2 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -10,9 +10,3 @@ unmanagedSourceDirectories.in(Compile) ++= { ) } libraryDependencies ++= Dependencies.all -libraryDependencies ++= Dependencies.sbt1Plugins.flatMap { plugin => - val sbtV = (sbtBinaryVersion in pluginCrossBuild).value - val scalaV = (scalaBinaryVersion in update).value - if (sbtV.startsWith("0.13")) Nil - else Seq(sbt.Defaults.sbtPluginExtra(plugin, sbtV, scalaV)) -} diff --git a/src/sbt-test/sbt-1.5/testkit/project/plugins.sbt b/src/sbt-test/sbt-1.5/testkit/project/plugins.sbt index 2d3b4d3b..c3527a81 100644 --- a/src/sbt-test/sbt-1.5/testkit/project/plugins.sbt +++ b/src/sbt-test/sbt-1.5/testkit/project/plugins.sbt @@ -1,2 +1,3 @@ resolvers += Resolver.sonatypeRepo("public") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % sys.props("plugin.version")) +addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.8.0")