Update Ammonite to 3.0.0-M0-10-addf882b (#1069)

almond-sh · Apr 7, 2023 · e173fca · e173fca
1 parent 0802ed5
commit e173fca
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/modules/scala/scala-interpreter/src/main/scala/almond/amm/AmmInterpreter.scala b/modules/scala/scala-interpreter/src/main/scala/almond/amm/AmmInterpreter.scala
@@ -106,23 +106,26 @@ object AmmInterpreter {
 
       log.info("Creating Ammonite interpreter")
 
-      val ammInterp0: ammonite.interp.Interpreter =
-        new ammonite.interp.Interpreter(
-          ammonite.compiler.CompilerBuilder,
-          ammonite.compiler.Parsers,
+      val interpParams = ammonite.interp.Interpreter.Parameters(
           printer = execute0.printer,
           storage = storage0,
           wd = os.pwd,
           colors = replApi.colors,
           verboseOutput = true, // ???
+          alreadyLoadedDependencies =
+            ammonite.main.Defaults.alreadyLoadedDependencies("almond/almond-user-dependencies.txt")
+      )
+      val ammInterp0: ammonite.interp.Interpreter =
+        new ammonite.interp.Interpreter(
+          ammonite.compiler.CompilerBuilder,
+          () => ammonite.compiler.Parsers,
           getFrame = () => frames0().head,
           createFrame = () => {
             val f = replApi.sess.childFrame(frames0().head); frames0() = f :: frames0(); f
           },
           replCodeWrapper = codeWrapper,
           scriptCodeWrapper = codeWrapper,
-          alreadyLoadedDependencies =
-            ammonite.main.Defaults.alreadyLoadedDependencies("almond/almond-user-dependencies.txt")
+          parameters = interpParams
         ) {
           override val compilerManager = new AlmondCompilerLifecycleManager(
             storage0.dirOpt.map(_.toNIO),

diff --git a/project/deps.sc b/project/deps.sc
@@ -2,7 +2,7 @@ import mill._
 import mill.scalalib._
 
 object Versions {
-  def ammonite      = "2.5.8"
+  def ammonite      = "3.0.0-M0-10-addf882b"
   def caseApp       = "2.0.6"
   def jsoniterScala = "2.13.5"
   def scalafmt      = "2.7.5"