diff --git a/build.sbt b/build.sbt index 1fabe01cb..e021f674d 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,4 @@ -import Aliases._ import Settings._ inThisBuild(List( @@ -21,24 +20,12 @@ val coursierVersion = "1.1.0-M8" lazy val `sbt-shared` = project .in(file("modules/sbt-shared")) .settings( - plugin, + shared, libraryDependencies ++= Seq( "io.get-coursier" %% "coursier" % coursierVersion, - "io.get-coursier" %% "coursier-cache" % coursierVersion - ), - // because we don't publish for 2.11 the following declaration - // is more wordy than usual - // once support for sbt 0.13 is removed, this dependency can go away - libraryDependencies ++= { - val dependency = "com.dwijnand" % "sbt-compat" % "1.2.6" - val sbtV = (sbtBinaryVersion in pluginCrossBuild).value - val scalaV = (scalaBinaryVersion in update).value - val m = Defaults.sbtPluginExtra(dependency, sbtV, scalaV) - CrossVersion.partialVersion(scalaVersion.value).collect { - case (2, 10) => m - case (2, 12) => m - }.toList - } + "io.get-coursier" %% "coursier-cache" % coursierVersion, + "org.scala-sbt" %% "librarymanagement-ivy" % "1.0.2" + ) ) lazy val `sbt-coursier` = project diff --git a/project/Aliases.scala b/project/Aliases.scala deleted file mode 100644 index c155ac6b8..000000000 --- a/project/Aliases.scala +++ /dev/null @@ -1,18 +0,0 @@ - -import sbt._ -import sbt.Defaults.itSettings -import sbt.Keys._ -import sbt.ScriptedPlugin.autoImport._ -import sbt.librarymanagement.CrossVersion.partialVersion - -object Aliases { - - def withScriptedTests: Seq[Def.Setting[_]] = - ScriptedPlugin.globalSettings ++ ScriptedPlugin.projectSettings.filterNot(_.key.key.label == libraryDependencies.key.label) ++ Seq( - libraryDependencies ++= Seq( - "org.scala-sbt" %% "scripted-sbt" % scriptedSbt.value % ScriptedConf, - "org.scala-sbt" % "sbt-launch" % scriptedSbt.value % ScriptedLaunchConf - ) - ) - -} diff --git a/project/Settings.scala b/project/Settings.scala index e2aa9bbb8..7a3687849 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -6,8 +6,6 @@ import sbt.ScriptedPlugin.autoImport.{scriptedBufferLog, scriptedLaunchOpts} import com.typesafe.sbt.pgp._ import coursier.ShadingPlugin.autoImport.{Shading, shadingNamespace} -import Aliases._ - object Settings { def scala212 = "2.12.7"