Upgrade plugins

3 files changed, 33 insertions, 25 deletions

diff --git a/home/.sbt/0.13/build.sbt b/home/.sbt/0.13/build.sbt
index cb86f56..a343312 100644
--- a/home/.sbt/0.13/build.sbt
+++ b/home/.sbt/0.13/build.sbt
@@ -10,26 +10,3 @@ useGpg in Global := true
  * Bintray
  */
 bintray.BintrayKeys.bintrayReleaseOnPublish := false
-
-/*
- * Ensime
- */
-//ignore source and doc jars in ensime
-//transitiveClassifiers in Global := List("")
-
-/*
-import org.ensime.{ EnsimeConfig, EnsimeModule }
-import org.ensime.Imports._
-
-EnsimeKeys.configTransformer := {(cfg: EnsimeConfig) => {
-  val config = EnsimeKeys.configTransformer.value(cfg)
-  val cleanedModules = config.modules.map{ case (name, module) =>
-    val goodSrcJars = module.sourceJars.filterNot{f =>
-      f.name.startsWith("stax-api")
-    }
-    name -> module.copy(sourceJars = goodSrcJars)
-  }
-
-  config.copy(modules = cleanedModules)
-}}
- */
diff --git a/home/.sbt/0.13/plugins/EnsimeProjectSettings.scala b/home/.sbt/0.13/plugins/EnsimeProjectSettings.scala
new file mode 100644
index 0000000..b8b4f7e
--- /dev/null
+++ b/home/.sbt/0.13/plugins/EnsimeProjectSettings.scala
@@ -0,0 +1,27 @@
+import sbt._
+
+import com.typesafe.sbt.SbtScalariform.ScalariformKeys
+import org.ensime.Imports.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.scalariform := ScalariformKeys.preferences.value, // workaround for ensime-sbt #148
+    EnsimeKeys.configTransformer := {(cfg: EnsimeConfig) => {
+      val config = EnsimeKeys.configTransformer.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 0c3873f..25c3c16 100644
--- a/home/.sbt/0.13/plugins/plugins.sbt
+++ b/home/.sbt/0.13/plugins/plugins.sbt
@@ -1,11 +1,15 @@
+addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M11")
+
 addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0")
 
 addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2")
 
 addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "4.0.0")
 
-//addSbtPlugin("org.ensime" % "ensime-sbt" % "0.4.1-local")
+addSbtPlugin("org.ensime" % "sbt-ensime" % "0.5.0")
 
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
 
-addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.9")
+addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.10")
+
+addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.6.0")