Switch to ammonite 1.6.6 (#355)

almond-sh · Apr 11, 2019 · a4cffe0 · a4cffe0
1 parent 902ea1d
commit a4cffe0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/modules/scala/almond-rx/src/main/scala/almondrx/package.scala b/modules/scala/almond-rx/src/main/scala/almondrx/package.scala
@@ -16,7 +16,7 @@ package object almondrx {
 
     implicit val ownerCtx0 = ownerCtx
 
-    // only really needed when the code wrapper passed to ScalaInterpreter is Preprocessor.CodeClassWrapper
+    // only really needed when the code wrapper passed to ScalaInterpreter is CodeClassWrapper
     replApi.load("import _root_.rx.Ctx.Owner.Unsafe.Unsafe")
 
     replApi.pprinter() = {

diff --git a/modules/scala/scala-interpreter/src/main/scala/almond/ScalaInterpreter.scala b/modules/scala/scala-interpreter/src/main/scala/almond/ScalaInterpreter.scala
@@ -12,7 +12,7 @@ import almond.interpreter.input.InputManager
 import almond.interpreter.util.CancellableFuture
 import almond.logger.LoggerContext
 import almond.protocol.KernelInfo
-import ammonite.interp.{Parsers, Preprocessor}
+import ammonite.interp.{CodeClassWrapper, CodeWrapper, Parsers, Preprocessor}
 import ammonite.ops.read
 import ammonite.repl._
 import ammonite.runtime._
@@ -40,7 +40,7 @@ final class ScalaInterpreter(
   automaticDependencies: Map[String, Seq[String]] = Map(),
   forceMavenProperties: Map[String, String] = Map(),
   mavenProfiles: Map[String, Boolean] = Map(),
-  codeWrapper: Preprocessor.CodeWrapper = Preprocessor.CodeClassWrapper,
+  codeWrapper: CodeWrapper = CodeClassWrapper,
   initialColors: Colors = Colors.Default,
   initialClassLoader: ClassLoader = Thread.currentThread().getContextClassLoader,
   val logCtx: LoggerContext = LoggerContext.nop,

diff --git a/project/Deps.scala b/project/Deps.scala
@@ -6,11 +6,11 @@ import sbt.Keys.{scalaBinaryVersion, scalaVersion}
 object Deps {
 
   object Versions {
-    def ammonite = "1.6.5-7-189109d"
+    def ammonite = "1.6.6"
   }
 
   def ammoniteRepl = ("com.lihaoyi" % "ammonite-repl" % Versions.ammonite).cross(CrossVersion.full)
-  def ammoniteSpark = "sh.almond" %% "ammonite-spark" % "0.4.0"
+  def ammoniteSpark = "sh.almond" %% "ammonite-spark" % "0.4.1"
   def argonautShapeless = "com.github.alexarchambault" %% "argonaut-shapeless_6.2" % "1.2.0-M10"
   def caseAppAnnotations = "com.github.alexarchambault" %% "case-app-annotations" % "2.0.0-M6"
   def caseApp = "com.github.alexarchambault" %% "case-app" % "2.0.0-M6"