From 7b0e090662300e03f746aeb6771f9fe94a9b2520 Mon Sep 17 00:00:00 2001 From: Johannes Rudolph Date: Sat, 14 Nov 2015 16:25:13 +0100 Subject: [PATCH] remove support for sbt 0.11 + 0.12 --- build.sbt | 9 +++++++- .../sbt/SbtDependencyGraphCompat.scala | 22 ------------------- .../sbt/SbtDependencyGraphCompat.scala | 21 ------------------ 3 files changed, 8 insertions(+), 44 deletions(-) delete mode 100644 src/main/scala-sbt-0.11/sbt/SbtDependencyGraphCompat.scala delete mode 100644 src/main/scala-sbt-0.12/sbt/SbtDependencyGraphCompat.scala diff --git a/build.sbt b/build.sbt index e3db9eed3..201ba01c7 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ crossBuildingSettings -CrossBuilding.crossSbtVersions := Seq("0.11.1", "0.11.2", "0.11.3", "0.12", "0.13") +CrossBuilding.crossSbtVersions := Seq("0.13") CrossBuilding.scriptedSettings @@ -17,3 +17,10 @@ libraryDependencies <+= scalaVersion { version => } scalacOptions ++= Seq("-deprecation", "-unchecked") + +sbt.CrossBuilding.latestCompatibleVersionMapper ~= { + original => { + case "0.13" => "0.13.8" + case x => original(x) + } +} diff --git a/src/main/scala-sbt-0.11/sbt/SbtDependencyGraphCompat.scala b/src/main/scala-sbt-0.11/sbt/SbtDependencyGraphCompat.scala deleted file mode 100644 index e6ff9bb49..000000000 --- a/src/main/scala-sbt-0.11/sbt/SbtDependencyGraphCompat.scala +++ /dev/null @@ -1,22 +0,0 @@ -package sbt - -import net.virtualvoid.sbt.graph.Plugin._ -import Keys._ - -object SbtDependencyGraphCompat { - /** - * This is copied directly from sbt/main/Defaults.java and then changed to update the UpdateConfiguration - * to ignore missing artifacts. - */ - def ignoreMissingUpdateT = - ignoreMissingUpdate <<= (ivyModule, thisProjectRef, updateConfiguration in ignoreMissingUpdate, cacheDirectory, scalaInstance, transitiveUpdate, streams) map { (module, ref, config, cacheDirectory, si, reports, s) => - val depsUpdated = reports.exists(!_.stats.cached) - - Classpaths.cachedUpdate(cacheDirectory / "update", Project.display(ref), module, config, Some(si), depsUpdated, s.log) - } - - import complete.DefaultParsers._ - lazy val StringBasic = NotSpaceClass.*.string - - def getTerminalWidth: Int = jline.Terminal.getTerminal.getTerminalWidth -} diff --git a/src/main/scala-sbt-0.12/sbt/SbtDependencyGraphCompat.scala b/src/main/scala-sbt-0.12/sbt/SbtDependencyGraphCompat.scala deleted file mode 100644 index 56df72740..000000000 --- a/src/main/scala-sbt-0.12/sbt/SbtDependencyGraphCompat.scala +++ /dev/null @@ -1,21 +0,0 @@ -package sbt - -import net.virtualvoid.sbt.graph.Plugin._ -import Keys._ - -object SbtDependencyGraphCompat { - /** - * This is copied directly from sbt/main/Defaults.java and then changed to update the UpdateConfiguration - * to ignore missing artifacts. - */ - def ignoreMissingUpdateT = - ignoreMissingUpdate <<= (ivyModule, thisProjectRef, updateConfiguration in ignoreMissingUpdate, cacheDirectory, scalaInstance, transitiveUpdate, executionRoots, resolvedScoped, skip in update, streams) map { - (module, ref, config, cacheDirectory, si, reports, roots, resolved, skip, s) => - val depsUpdated = reports.exists(!_.stats.cached) - val isRoot = roots contains resolved - - Classpaths.cachedUpdate(cacheDirectory / "update", Project.display(ref), module, config, Some(si), skip = skip, force = isRoot, depsUpdated = depsUpdated, log = s.log) - } tag(Tags.Update, Tags.Network) - - def getTerminalWidth: Int = JLine.usingTerminal(_.getTerminalWidth) -}