diff --git a/project/deps.sc b/project/deps.sc index f27d3c8a5..e07bd1b5a 100644 --- a/project/deps.sc +++ b/project/deps.sc @@ -2,7 +2,7 @@ import mill._ import mill.scalalib._ object Versions { - def ammonite = "3.0.0-M0-41-26a93d9c" + def ammonite = "3.0.0-M0-45-9c598c7c" def caseApp = "2.1.0-M24" def coursier = "2.1.5" def jsoniterScala = "2.13.5" diff --git a/project/jupyterserver.sc b/project/jupyterserver.sc index 40d12c28c..10f196e36 100644 --- a/project/jupyterserver.sc +++ b/project/jupyterserver.sc @@ -3,25 +3,35 @@ import java.nio.file._ def kernelId = "scala-debug" def specialKernelId = "scala-special-debug" -def writeKernelJson(launcher: Path, jupyterDir: Path, kernelId: String, name: String): Unit = { +def writeKernelJson( + launcher: Path, + jupyterDir: Path, + kernelId: String, + name: String, + extraArgs: String* +): Unit = { val launcherPath = launcher.toAbsolutePath.toString val dir = jupyterDir.resolve(s"kernels/$kernelId") Files.createDirectories(dir) - val kernelJson = s"""{ - "language": "scala", - "display_name": "$name", - "argv": [ - "$launcherPath", - "--log", "debug", - "--connection-file", "{connection_file}", - "--variable-inspector", - "--toree-magics", - "--use-notebook-coursier-logger", - "--silent-imports", - "--quiet=false", - "--use-notebook-coursier-logger" - ] - }""" + val baseArgs = Seq( + launcherPath.toString, + "--log", + "debug", + "--connection-file", + "{connection_file}", + "--variable-inspector", + "--toree-magics", + "--use-notebook-coursier-logger", + "--silent-imports", + "--use-notebook-coursier-logger" + ) + val kernelJson = ujson.Obj( + "language" -> ujson.Str("scala"), + "display_name" -> ujson.Str(name), + "argv" -> ujson.Arr( + (baseArgs ++ extraArgs).map(ujson.Str(_)): _* + ) + ).render() Files.write(dir.resolve("kernel.json"), kernelJson.getBytes("UTF-8")) System.err.println(s"JUPYTER_PATH=$jupyterDir") } @@ -34,7 +44,13 @@ def jupyterServer( ): Unit = { writeKernelJson(launcher, jupyterDir, kernelId, "Scala (sources)") - writeKernelJson(specialLauncher, jupyterDir, specialKernelId, "Scala (special, sources)") + writeKernelJson( + specialLauncher, + jupyterDir, + specialKernelId, + "Scala (special, sources)", + "--quiet=false" + ) os.makeDir.all(os.pwd / "notebooks") val jupyterCommand = Seq("jupyter", "lab", "--notebook-dir", "notebooks")