Merge pull request #11 from alexarchambault/topic/ammonite-1.5.0

Switch to ammonite 1.5.0
alexarchambault · Dec 11, 2018 · bd8ec39 · bd8ec39
2 parents 5fbce26 + c5e9378
commit bd8ec39
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,14 +22,14 @@ jobs:
   - env: MASTER=local
     scala: 2.11.12
   - env: MASTER=local
-    scala: 2.12.7
+    scala: 2.12.8
   - env: MASTER=standalone STANDALONE_CACHE=$HOME/standalone-stuff
     scala: 2.11.12
   - env: MASTER=yarn-distrib YARN_CACHE=$HOME/yarn-stuff STANDALONE_CACHE=$HOME/yarn-cache
     scala: 2.11.12
   - env: MASTER=yarn YARN_CACHE=$HOME/yarn-stuff
     scala: 2.11.12
   - env: MASTER=yarn YARN_CACHE=$HOME/yarn-stuff
-    scala: 2.12.7
+    scala: 2.12.8
   - stage: release
     script: sbt ci-release
diff --git a/project/Deps.scala b/project/Deps.scala
@@ -5,7 +5,7 @@ import sbt.Keys._
 
 object Deps {
 
-  def ammoniteRepl = ("com.lihaoyi" % "ammonite-repl" % "1.3.2").cross(CrossVersion.full)
+  def ammoniteRepl = ("com.lihaoyi" % "ammonite-repl" % "1.5.0").cross(CrossVersion.full)
   def jettyServer = "org.eclipse.jetty" % "jetty-server" % "8.1.14.v20131031"
   def utest = "com.lihaoyi" %% "utest" % "0.6.4"
 

diff --git a/project/Settings.scala b/project/Settings.scala
@@ -16,7 +16,7 @@ object Settings {
   }
 
   private val scala211 = "2.11.12"
-  private val scala212 = "2.12.7"
+  private val scala212 = "2.12.8"
 
   lazy val isAtLeast212 = setting {
     CrossVersion.partialVersion(scalaVersion.value) match {
@@ -77,10 +77,10 @@ object Settings {
     resourceGenerators.in(Compile) += Def.task {
 
       val dir = classDirectory.in(Compile).value / "ammonite" / "spark"
-      val res = coursier.CoursierPlugin.autoImport.coursierResolutions
+      val res = coursier.sbtcoursier.CoursierPlugin.autoImport.coursierResolutions
         .value
         .collectFirst {
-          case (scopes, r) if scopes("compile") =>
+          case (scopes, r) if scopes(coursier.core.Configuration.compile) =>
             r
         }
         .getOrElse(

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.1.5
+sbt.version=1.2.7
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.1.2")
+addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.2.2")
 addSbtCoursier
diff --git a/project/project/plugins.sbt b/project/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.1.0-M6")
+addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.1.0-M9")