From 58947bfec6ca26075375f4808da18bc1d9f7333e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Mickevi=C4=8Dius?= Date: Thu, 7 Sep 2017 17:04:59 +0200 Subject: [PATCH] Use sbt-compat lib --- build.sbt | 6 ++++++ project.sbt | 2 -- project/plugins.sbt | 1 + src/main/scala-sbt-0.13/sbt/compat/SbtCompat.scala | 11 ----------- src/main/scala-sbt-1.0/sbt/compat/SbtCompat.scala | 3 --- .../sbt/graph/DependencyGraphSettings.scala | 1 - src/main/scala/sbt/SbtAccess.scala | 3 --- 7 files changed, 7 insertions(+), 20 deletions(-) delete mode 100644 src/main/scala-sbt-0.13/sbt/compat/SbtCompat.scala delete mode 100644 src/main/scala-sbt-1.0/sbt/compat/SbtCompat.scala diff --git a/build.sbt b/build.sbt index f33b9585a..30a72a31a 100644 --- a/build.sbt +++ b/build.sbt @@ -10,6 +10,12 @@ libraryDependencies ++= { libraryDependencies += "org.specs2" %% "specs2-core" % "3.9.1" % "test" +libraryDependencies += Defaults.sbtPluginExtra( + "com.dwijnand" % "sbt-compat" % "1.0.0+2-ae121c50", + (sbtBinaryVersion in pluginCrossBuild).value, + (scalaBinaryVersion in update).value +) + scalacOptions ++= Seq("-deprecation", "-unchecked") ScalariformSupport.formatSettings diff --git a/project.sbt b/project.sbt index 0d211ee31..8d6305446 100644 --- a/project.sbt +++ b/project.sbt @@ -4,8 +4,6 @@ name := "sbt-dependency-graph" organization := "net.virtual-void" -version := "0.8.3-SNAPSHOT" - homepage := Some(url("http://github.com/jrudolph/sbt-dependency-graph")) licenses in GlobalScope += "Apache License 2.0" -> url("https://github.com/jrudolph/sbt-dependency-graph/raw/master/LICENSE") diff --git a/project/plugins.sbt b/project/plugins.sbt index 0a919c7d8..576698340 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,4 @@ libraryDependencies += "org.scala-sbt" % "scripted-plugin" % sbtVersion.value addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.2.1") +addSbtPlugin("com.dwijnand" % "sbt-dynver" % "2.0.0") diff --git a/src/main/scala-sbt-0.13/sbt/compat/SbtCompat.scala b/src/main/scala-sbt-0.13/sbt/compat/SbtCompat.scala deleted file mode 100644 index c3d8570bd..000000000 --- a/src/main/scala-sbt-0.13/sbt/compat/SbtCompat.scala +++ /dev/null @@ -1,11 +0,0 @@ -package sbt.compat - -object SbtCompat { - object librarymanagement - object internal { - object librarymanagement - object util { - val JLine: { def usingTerminal[T](f: jline.Terminal => T): T } = sbt.JLine - } - } -} \ No newline at end of file diff --git a/src/main/scala-sbt-1.0/sbt/compat/SbtCompat.scala b/src/main/scala-sbt-1.0/sbt/compat/SbtCompat.scala deleted file mode 100644 index 9da65489d..000000000 --- a/src/main/scala-sbt-1.0/sbt/compat/SbtCompat.scala +++ /dev/null @@ -1,3 +0,0 @@ -package sbt.compat - -object SbtCompat \ No newline at end of file diff --git a/src/main/scala/net/virtualvoid/sbt/graph/DependencyGraphSettings.scala b/src/main/scala/net/virtualvoid/sbt/graph/DependencyGraphSettings.scala index fd3828488..15f0d8da2 100644 --- a/src/main/scala/net/virtualvoid/sbt/graph/DependencyGraphSettings.scala +++ b/src/main/scala/net/virtualvoid/sbt/graph/DependencyGraphSettings.scala @@ -25,7 +25,6 @@ import net.virtualvoid.sbt.graph.backend.{ IvyReport, SbtUpdateReport } import net.virtualvoid.sbt.graph.rendering.{ AsciiGraph, DagreHTML } import net.virtualvoid.sbt.graph.util.IOUtil -import sbt.compat.SbtCompat._ import internal.librarymanagement._ import librarymanagement._ diff --git a/src/main/scala/sbt/SbtAccess.scala b/src/main/scala/sbt/SbtAccess.scala index 455e232e1..6ddc71f48 100644 --- a/src/main/scala/sbt/SbtAccess.scala +++ b/src/main/scala/sbt/SbtAccess.scala @@ -16,10 +16,7 @@ package sbt -import sbt.compat.SbtCompat._ -import librarymanagement._ import internal._ -import librarymanagement._ import Classpaths._ import LibraryManagement._ import internal.util.JLine