diff options
| author | Jakob Odersky <jakob@odersky.com> | 2017-04-01 11:50:09 -0700 |
|---|---|---|
| committer | Jakob Odersky <jakob@odersky.com> | 2017-04-01 11:50:09 -0700 |
| commit | ba23529987b1414154e2479e5934e3e131f67411 (patch) | |
| tree | 9495edaae65bdb6b7ea3e24336bf5a1d2df2e40b /home | |
| parent | 7713542363e9917156edb985231767f07a312b15 (diff) | |
| download | dotfiles-ba23529987b1414154e2479e5934e3e131f67411.tar.gz dotfiles-ba23529987b1414154e2479e5934e3e131f67411.tar.bz2 dotfiles-ba23529987b1414154e2479e5934e3e131f67411.zip | |
Upgrade plugins
Diffstat (limited to 'home')
| -rw-r--r-- | home/.sbt/0.13/build.sbt | 12 | ||||
| -rw-r--r-- | home/.sbt/0.13/plugins/plugins.sbt | 4 |
2 files changed, 10 insertions, 6 deletions
diff --git a/home/.sbt/0.13/build.sbt b/home/.sbt/0.13/build.sbt index 061ddd0..2c529c1 100644 --- a/home/.sbt/0.13/build.sbt +++ b/home/.sbt/0.13/build.sbt @@ -1,19 +1,23 @@ +// configure gpg import com.typesafe.sbt.pgp.PgpKeys._ gpgCommand in Global := "gpg2" pgpSigningKey in Global := Some(0x2CED17AB2B6D6F37l) useGpgAgent in Global := true useGpg in Global := true +// use ensime snapshot version import org.ensime.EnsimeCoursierKeys._ ensimeServerVersion in ThisBuild := "2.0.0-SNAPSHOT" +// don't create target directory when starting sbt in non-project directory +// (e.g. when running sbt-new) import java.nio.file.Files target := { - val buildSbt = baseDirectory.value / "build.sbt" - val projectSbt = baseDirectory.value / "project.sbt" - val project = baseDirectory.value / "project" + val buildSbt = new File("build.sbt") + val projectSbt = new File("project.sbt") + val project = new File("project") - if (buildSbt.exists() || projectSbt.exists() || project.exists()) + if (buildSbt.exists || projectSbt.exists || project.exists) target.value else Files.createTempDirectory("sbt-new").toFile diff --git a/home/.sbt/0.13/plugins/plugins.sbt b/home/.sbt/0.13/plugins/plugins.sbt index c34be7c..ca78c12 100644 --- a/home/.sbt/0.13/plugins/plugins.sbt +++ b/home/.sbt/0.13/plugins/plugins.sbt @@ -7,11 +7,11 @@ addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.10") addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2") // ENSIME brings Scala and Java IDE-like features to your favourite text editor -addSbtPlugin("org.ensime" % "sbt-ensime" % "1.12.5") +addSbtPlugin("org.ensime" % "sbt-ensime" % "1.12.8") // Enable fast dependency resolution // can be disabled with `sbt -Dcoursier=false` sys.props.get("coursier") match { case Some("false") => Seq() - case _ => addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M15-1") + case _ => addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M15-5") } |