From f601ea9204b6b7f38ae32d0d2ec8a676cd5ffbd3 Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jakob@odersky.com>
Date: Sun, 4 Dec 2016 13:32:55 -0800
Subject: Update sbt plugins

---
 home/.sbt/0.13/build.sbt                           |  6 +++---
 home/.sbt/0.13/plugins/EnsimeProjectSettings.scala | 25 ----------------------
 home/.sbt/0.13/plugins/plugins.sbt                 | 21 ++++++------------
 3 files changed, 9 insertions(+), 43 deletions(-)
 delete mode 100644 home/.sbt/0.13/plugins/EnsimeProjectSettings.scala

(limited to 'home/.sbt')

diff --git a/home/.sbt/0.13/build.sbt b/home/.sbt/0.13/build.sbt
index a9d3b22..364eece 100644
--- a/home/.sbt/0.13/build.sbt
+++ b/home/.sbt/0.13/build.sbt
@@ -1,8 +1,8 @@
-/*
- * PGP
- */
 import com.typesafe.sbt.pgp.PgpKeys._
 gpgCommand in Global := "gpg2"
 pgpSigningKey in Global := Some(0x2CED17AB2B6D6F37l)
 useGpgAgent in Global := true
 useGpg in Global := true
+
+import org.ensime.EnsimeCoursierKeys._
+ensimeServerVersion in ThisBuild := "2.0.0-SNAPSHOT"
diff --git a/home/.sbt/0.13/plugins/EnsimeProjectSettings.scala b/home/.sbt/0.13/plugins/EnsimeProjectSettings.scala
deleted file mode 100644
index deeb663..0000000
--- a/home/.sbt/0.13/plugins/EnsimeProjectSettings.scala
+++ /dev/null
@@ -1,25 +0,0 @@
-import sbt._
-
-import org.ensime.EnsimeKeys
-import org.ensime.{ EnsimeConfig, EnsimeModule }
-
-object EnsimeProjectSettings extends AutoPlugin {
-
-  override def requires = org.ensime.EnsimePlugin
-  override def trigger = allRequirements
-
-  override def projectSettings = Seq(
-    EnsimeKeys.ensimeConfigTransformer := {(cfg: EnsimeConfig) => {
-      val config = EnsimeKeys.ensimeConfigTransformer.value(cfg)
-      val cleanedModules = config.modules.map{ case (name, module) =>
-        def badJar(name: String) = (
-          name.startsWith("stax-api") ||
-          name.startsWith("antlr")
-        )
-        name -> module.copy(sourceJars = module.sourceJars.filterNot(f => badJar(f.name)))
-      }
-      config.copy(modules = cleanedModules)
-    }}
-    //transitiveClassifiers in Global := List("")
-  )
-}
diff --git a/home/.sbt/0.13/plugins/plugins.sbt b/home/.sbt/0.13/plugins/plugins.sbt
index 467ba44..4ad24d9 100644
--- a/home/.sbt/0.13/plugins/plugins.sbt
+++ b/home/.sbt/0.13/plugins/plugins.sbt
@@ -1,21 +1,12 @@
-
-sys.props.get("coursier") match {
-  case Some("false") => Seq()
-  case _ => addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M14-7")
-}
-
-//addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0")
-
-addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2")
-
-addSbtPlugin("org.ensime" % "sbt-ensime" % "1.11.1")
-
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
 
 addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.10")
 
-//addSbtPlugin("com.geirsson" %% "sbt-scalafmt" % "0.3.1")
+addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2")
 
-//resolvers += Resolver.sonatypeRepo("snapshots")
+addSbtPlugin("org.ensime" % "sbt-ensime" % "1.12.2")
 
-//addSbtPlugin("org.scala-native" % "sbtplugin"  % "0.1-SNAPSHOT")
+sys.props.get("coursier") match {
+  case Some("false") => Seq()
+  case _ => addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M15")
+}
-- 
cgit v1.2.3