From 9c884d4d95d60e8ca875c2ac674bcb7b917b5fcc Mon Sep 17 00:00:00 2001 From: Nicolas Rouquette Date: Tue, 12 Oct 2021 20:36:07 -0700 Subject: [PATCH 1/5] building --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 944fb88e1..b788f717c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ target/ .bsp/ +.coursier/ .DS_Store .idea/ .bloop From 04b2613c4bab1a99437a06c33858e72ff404c208 Mon Sep 17 00:00:00 2001 From: Nicolas Rouquette Date: Sat, 13 Nov 2021 11:36:17 -0800 Subject: [PATCH 2/5] 3.0.1 builds ok; 3.1.0 needs refactoring w.r.t Logger macros --- build.sc | 12 ++++-------- project/deps.sc | 7 +++---- project/jupyterserver.sc | 6 ++++-- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/build.sc b/build.sc index ec272e10e..18ff5b09d 100644 --- a/build.sc +++ b/build.sc @@ -167,12 +167,8 @@ class ScalaInterpreter(val crossScalaVersion: String) extends AlmondModule with } object test extends Tests { def moduleDeps = { - val rx = - if (crossScalaVersion.startsWith("2.12.")) Seq(scala.`almond-rx`()) - else Nil - super.moduleDeps ++ - Seq(shared.kernel().test) ++ - rx + super.moduleDeps ++ + Seq(shared.kernel().test) } } } @@ -285,8 +281,8 @@ object scala extends Module { object `scala-kernel-api` extends Cross[ScalaKernelApi] (ScalaVersions.all: _*) object `scala-interpreter` extends Cross[ScalaInterpreter](ScalaVersions.all: _*) object `scala-kernel` extends Cross[ScalaKernel] (ScalaVersions.all: _*) - object `almond-spark` extends Cross[AlmondSpark] (ScalaVersions.scala212) - object `almond-rx` extends Cross[AlmondRx] (ScalaVersions.scala212) +// object `almond-spark` extends Cross[AlmondSpark] (ScalaVersions.scala212) +// object `almond-rx` extends Cross[AlmondRx] (ScalaVersions.scala212) } object echo extends Cross[Echo](ScalaVersions.binaries: _*) diff --git a/project/deps.sc b/project/deps.sc index fd2284f17..9a9d612f9 100644 --- a/project/deps.sc +++ b/project/deps.sc @@ -69,10 +69,9 @@ object ScalaVersions { def cross2_3Version = "2.13.6" def scala213 = "2.13.6" def scala212 = "2.12.14" - val binaries = Seq(scala3, scala213, scala212) + val binaries = Seq(scala3, scala213) val all = Seq( - scala3, "3.0.0", - scala213, "2.13.5", "2.13.4", "2.13.3", "2.13.2", "2.13.1", "2.13.0", - scala212, "2.12.13", "2.12.12", "2.12.11", "2.12.10", "2.12.9", "2.12.8" + scala3, + scala213, ) } diff --git a/project/jupyterserver.sc b/project/jupyterserver.sc index 944a7ea6a..a35e084f4 100644 --- a/project/jupyterserver.sc +++ b/project/jupyterserver.sc @@ -2,7 +2,7 @@ import java.nio.file._ def writeKernelJson(launcher: Path, jupyterDir: Path): Unit = { - val launcherPath = launcher.toAbsolutePath.toString + val launcherPath = launcher.toAbsolutePath.toString.replace("\\","\\\\") val dir = jupyterDir.resolve("kernels/scala-debug") Files.createDirectories(dir) val kernelJson = s"""{ @@ -24,7 +24,9 @@ def jupyterServer(launcher: Path, jupyterDir: Path, args: Seq[String]): Unit = { writeKernelJson(launcher, jupyterDir) os.makeDir.all(os.pwd / "notebooks") - val jupyterCommand = Seq("jupyter", "lab", "--notebook-dir", "notebooks") + val jupyterCommand = Seq( + if (mill.main.client.Util.isWindows) "jupyter.bat" else "jupyter", + "lab", "--notebook-dir", "notebooks") val b = new ProcessBuilder(jupyterCommand ++ args: _*).inheritIO() val env = b.environment() env.put("JUPYTER_PATH", jupyterDir.toAbsolutePath.toString) From b1afeee729c89988f3e6bd71cb1583c4fe3c3950 Mon Sep 17 00:00:00 2001 From: Nicolas Rouquette Date: Sat, 13 Nov 2021 12:04:11 -0800 Subject: [PATCH 3/5] Trying building with scala 3.1.0 --- .../shared/logger/src/main/scala-3/almond/logger/Logger.scala | 2 ++ .../logger/src/main/scala/almond/logger/LoggerContext.scala | 4 +++- .../scala/almond/logger/internal/LoggerCompanionMethods.scala | 2 ++ .../main/scala/almond/logger/internal/LoggerContextImpl.scala | 3 ++- project/deps.sc | 2 +- 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/modules/shared/logger/src/main/scala-3/almond/logger/Logger.scala b/modules/shared/logger/src/main/scala-3/almond/logger/Logger.scala index 81b7c7796..4c23ce41c 100644 --- a/modules/shared/logger/src/main/scala-3/almond/logger/Logger.scala +++ b/modules/shared/logger/src/main/scala-3/almond/logger/Logger.scala @@ -4,7 +4,9 @@ import almond.logger.internal._ import scala.language.experimental.macros import scala.quoted._ +import annotation.experimental +@experimental final case class Logger(underlying: ActualLogger) { def prefix(prefix: String): Logger = diff --git a/modules/shared/logger/src/main/scala/almond/logger/LoggerContext.scala b/modules/shared/logger/src/main/scala/almond/logger/LoggerContext.scala index 5306d6455..52792093f 100644 --- a/modules/shared/logger/src/main/scala/almond/logger/LoggerContext.scala +++ b/modules/shared/logger/src/main/scala/almond/logger/LoggerContext.scala @@ -1,9 +1,11 @@ package almond.logger import java.io.PrintStream +import annotation.experimental import almond.logger.internal.LoggerContextImpl +@experimental trait LoggerContext { def apply(prefix: String): Logger @@ -22,4 +24,4 @@ object LoggerContext { def stderr(level: Level): LoggerContext = LoggerContextImpl(Logger.stderr(level)) -} \ No newline at end of file +} diff --git a/modules/shared/logger/src/main/scala/almond/logger/internal/LoggerCompanionMethods.scala b/modules/shared/logger/src/main/scala/almond/logger/internal/LoggerCompanionMethods.scala index 30a3b26eb..a90dd0e1e 100644 --- a/modules/shared/logger/src/main/scala/almond/logger/internal/LoggerCompanionMethods.scala +++ b/modules/shared/logger/src/main/scala/almond/logger/internal/LoggerCompanionMethods.scala @@ -1,9 +1,11 @@ package almond.logger.internal import java.io.PrintStream +import annotation.experimental import almond.logger._ +@experimental trait LoggerCompanionMethods { def nop: Logger = diff --git a/modules/shared/logger/src/main/scala/almond/logger/internal/LoggerContextImpl.scala b/modules/shared/logger/src/main/scala/almond/logger/internal/LoggerContextImpl.scala index b6bfb30d9..5e0fc8f14 100644 --- a/modules/shared/logger/src/main/scala/almond/logger/internal/LoggerContextImpl.scala +++ b/modules/shared/logger/src/main/scala/almond/logger/internal/LoggerContextImpl.scala @@ -1,7 +1,8 @@ package almond.logger.internal - +import annotation.experimental import almond.logger.{Logger, LoggerContext} +@experimental final case class LoggerContextImpl(baseLogger: Logger) extends LoggerContext { def apply(prefix: String): Logger = baseLogger.prefix(prefix) diff --git a/project/deps.sc b/project/deps.sc index 9a9d612f9..73aa4fac8 100644 --- a/project/deps.sc +++ b/project/deps.sc @@ -65,7 +65,7 @@ object Deps { } object ScalaVersions { - def scala3 = "3.0.1" + def scala3 = "3.1.0" def cross2_3Version = "2.13.6" def scala213 = "2.13.6" def scala212 = "2.12.14" From d0d33735d6aeda9c82611bfc30c09ac635b3969f Mon Sep 17 00:00:00 2001 From: Nicolas Rouquette Date: Sun, 14 Nov 2021 12:43:09 -0800 Subject: [PATCH 4/5] doc about building with scala 3.0 vs. 3.1 --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index fb115a215..52a8e2dcf 100644 --- a/README.md +++ b/README.md @@ -26,3 +26,14 @@ People are expected to follow the [Scala Code of Conduct](https://www.scala-lang when discussing almond on GitHub, Gitter channel, or other venues. Feel free to open an issue if you notice a bug, have an idea for a feature, or have a question about the code. Pull requests are also gladly accepted. + +# Building with Scala 3 + +## Building with scala 3.0.1 + +checkout branch scala30 + +## Building with scala 3.1.0 + +checkout branch scala31 + From e2ee0f0fd7e5f361525442e201f60b13abf59e30 Mon Sep 17 00:00:00 2001 From: Nicolas Rouquette Date: Sun, 14 Nov 2021 16:59:19 -0800 Subject: [PATCH 5/5] scala 3.0.1 => 3.0.2 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 52a8e2dcf..5a129d5bd 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Feel free to open an issue if you notice a bug, have an idea for a feature, or h # Building with Scala 3 -## Building with scala 3.0.1 +## Building with scala 3.0.2 checkout branch scala30