From de10d81f07c6ad9f9d3514abb59d788666410cba Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Fri, 15 Jan 2016 22:49:57 +0000
Subject: [PATCH] Upgrade sbt plugins. Fixes #2368

Cherry-picked 84cba9669c92c57db5783b436f695047bbb5545d from branch 0.13 to 1.0.x

Tested manually:

  $ grep 'version.*:=' build.sbt
  version := "0.13.10-SNAPSHOT",
  $ git archive --prefix=sbt-0.13.10-SNAPSHOT/ -o ~/Desktop/sbt-0.13.10-SNAPSHOT.tgz HEAD
  $ cd ~/Desktop
  $ ls
  sbt-0.13.10-SNAPSHOT.tgz
  $ tar xfz sbt-0.13.10-SNAPSHOT.tgz
  $ cd sbt-0.13.10-SNAPSHOT/
  $ sbt info
  [info] Loading global plugins from /Users/dnw/.dotfiles/.sbt/0.13/plugins
  [info] Loading project definition from /Users/dnw/Desktop/sbt-0.13.10-SNAPSHOT/project
  [info] Updating {file:/Users/dnw/Desktop/sbt-0.13.10-SNAPSHOT/project/}sbt-0-13-10-snapshot-build...
  [info] Resolving org.fusesource.jansi#jansi;1.4 ...
  [info] Done updating.
  [warn] There may be incompatibilities among your library dependencies.
  [warn] Here are some of the libraries that were evicted:
  [warn]  * com.typesafe.sbt:sbt-site:0.8.1 -> 0.8.2
  [warn] Run 'evicted' to see detailed eviction warnings
  [info] Compiling 12 Scala sources to /Users/dnw/Desktop/sbt-0.13.10-SNAPSHOT/project/target/scala-2.10/sbt-0.13/classes...
  [info] This is sbt 0.13.9
  [info] The current project is {file:/Users/dnw/Desktop/sbt-0.13.10-SNAPSHOT/}sbtRoot 0.13.10-SNAPSHOT
  [info] The current project is built against Scala 2.10.6
  [info] Available Plugins: sbt.plugins.IvyPlugin, sbt.plugins.JvmPlugin, sbt.plugins.CorePlugin...
  [info] sbt, sbt plugins, and build definitions are using Scala 2.10.5
---
 project/bintray.sbt |  2 --
 project/p.sbt       | 18 ------------------
 project/plugins.sbt |  9 +++++++++
 3 files changed, 9 insertions(+), 20 deletions(-)
 delete mode 100644 project/bintray.sbt
 delete mode 100644 project/p.sbt
 create mode 100644 project/plugins.sbt

diff --git a/project/bintray.sbt b/project/bintray.sbt
deleted file mode 100644
index 0e8fa42ab..000000000
--- a/project/bintray.sbt
+++ /dev/null
@@ -1,2 +0,0 @@
-addSbtPlugin("com.eed3si9n" % "bintray-sbt" % "0.3.0-a1934a5457f882053b08cbdab5fd4eb3c2d1285d")
-resolvers += Resolver.url("bintray-eed3si9n-sbt-plugins", url("https://dl.bintray.com/eed3si9n/sbt-plugins/"))(Resolver.ivyStylePatterns)
diff --git a/project/p.sbt b/project/p.sbt
deleted file mode 100644
index b2b8e4830..000000000
--- a/project/p.sbt
+++ /dev/null
@@ -1,18 +0,0 @@
-scalaVersion := "2.10.5"
-
-libraryDependencies ++= Seq(
-  "net.databinder" %% "dispatch-http" % "0.8.9",
-  "org.jsoup" % "jsoup" % "1.7.1"
-)
-
-addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.7.1")
-
-resolvers += "jgit-repo" at "http://download.eclipse.org/jgit/maven"
-
-addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.1")
-
-addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0")
-
-addSbtPlugin("com.typesafe.sbt" % "sbt-javaversioncheck" % "0.1.0")
-
-addSbtPlugin("com.eed3si9n" % "sbt-doge" % "0.1.3")
diff --git a/project/plugins.sbt b/project/plugins.sbt
new file mode 100644
index 000000000..611885f9a
--- /dev/null
+++ b/project/plugins.sbt
@@ -0,0 +1,9 @@
+scalaVersion := "2.10.6"
+
+addSbtPlugin("com.eed3si9n" % "sbt-doge" % "0.1.5")
+addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.4")
+addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.8.5")
+addSbtPlugin("com.typesafe.sbt" % "sbt-javaversioncheck" % "0.1.0")
+addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0") // 1.6.0 is out but is a hard upgrade
+addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.8.2")
+addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0")