Build: Update dependencies

Update a subset of dependencies. Bloop was upgraded only to v1.4.0-RC1
since later versions would require more invasive changes. These will be
addressed in follow-up pull requests.

Author: tindzk

Diff for: BLOOP

@@ -1 +1 @@
-1.3.2
+1.4.0-RC1

Diff for: COURSIER

@@ -1,3 +1,3 @@
 # Must be the same version as Bloop uses
-# See bloop/project/Dependencies.scala
+# See https://github.com/scalacenter/bloop/blob/v$BLOOP/project/Dependencies.scala
 1.1.0-M14-4

Diff for: README.md

@@ -168,6 +168,8 @@ This compiles the module to `build/` and runs it.
     * Tiny code base
 
 ## Build Configuration
+The [TOML file format](https://github.com/toml-lang/toml) is used for all configuration files. A language extension was enabled to [allow line breaks in inline tables](https://github.com/toml-lang/toml/issues/516).
+
 The default build file is named `build.toml`. You can specify a custom path with the `--build` parameter. A build file corresponds to a *project* which can contain multiple *modules*.
 
 This section explains the components of build configurations and provides examples you can use in your own build files.

Diff for: build.sbt

@@ -51,8 +51,8 @@ libraryDependencies ++= Seq(
   "com.lihaoyi"                  %% "fansi"            % "0.2.7",
   "io.get-coursier"              %% "coursier"         % bloopCoursierVersion,
   "io.get-coursier"              %% "coursier-cache"   % bloopCoursierVersion,
-  "tech.sparse"                  %% "toml-scala"       % "0.2.0",
-  "tech.sparse"                  %% "pine"             % "0.1.4",
+  "tech.sparse"                  %% "toml-scala"       % "0.2.2",
+  "tech.sparse"                  %% "pine"             % "0.1.6",
   "ch.epfl.scala"                %% "bloop-config"     % bloopVersion,
   "ch.epfl.scala"                % "bsp4j"             % "2.0.0-M4",
   "ch.epfl.scala"                % "directory-watcher" % "0.8.0+6-f651bd93",
@@ -69,7 +69,7 @@ libraryDependencies ++= Seq(
   "org.java-websocket"           % "Java-WebSocket"    % "1.4.0",
   "org.slf4j"                    % "slf4j-simple"      % "1.7.25",
   "com.kohlschutter.junixsocket" % "junixsocket-core"  % "2.2.0",
-  "io.monix"                     %% "minitest"         % "2.5.0" % "test",
+  "io.monix"                     %% "minitest"         % "2.7.0" % "test",
   scalaOrganization.value        % "scala-reflect"     % scalaVersion.value
 )
 

Diff for: src/main/scala/seed/build/Bloop.scala

@@ -23,7 +23,7 @@ import scala.collection.JavaConverters
 import java.nio.file.{Files, Path}
 
 import org.newsclub.net.unix.{AFUNIXSocket, AFUNIXSocketAddress}
-import seed.Log
+import seed.{Log, LogLevel}
 import seed.config.BuildConfig
 import seed.config.BuildConfig.Build
 import seed.generation.util.PathUtil
@@ -411,6 +411,8 @@ object Bsp {
     val (bspSocketPath, bspProcess) = runBspServer(
       projectPath,
       new Log(log.f, log.map, log.level, log.unicode) {
+        var lastLogLevel: Option[LogLevel] = None
+
         override def error(message: String, detail: Boolean = false): Unit = {
           // Remove log level ("[E] ") from message since it contains escape
           // codes. Furthermore, the tab character is replaced by spaces.
@@ -421,12 +423,23 @@ object Bsp {
              else message).replaceAllLiterally("\t", "  ")
 
           if (messageText.trim.nonEmpty) {
+            // TODO The BSP server should not indicate the log level in the message
+            val logLevel = (if (message.contains("[D]")) Some(LogLevel.Debug)
+                            else if (message.contains("[E]"))
+                              Some(LogLevel.Error)
+                            else lastLogLevel).getOrElse(LogLevel.Info)
+            lastLogLevel = Some(logLevel)
+
             // This message is printed to stderr, but it is not an error,
             // therefore change the log level to 'debug'
             if (messageText.contains("BSP server cancelled, closing socket..."))
               debug(messageText)
-            else
-              super.error(messageText, detail)
+            else {
+              if (logLevel == LogLevel.Debug) super.debug(messageText, detail)
+              else if (logLevel == LogLevel.Error)
+                super.error(messageText, detail)
+              else super.info(messageText, detail)
+            }
           }
         }
       },

Diff for: src/main/scala/seed/cli/Scaffold.scala

@@ -558,16 +558,16 @@ class Scaffold(log: Log, silent: Boolean = false) {
     Root(List(
       NamedTable(
         List("project"),
-        Map("scalaVersion" -> Str(jvmScalaVersion)) ++
-        (if (organisation == Organisation.Lightbend) Map()
-         else Map("scalaOrganisation" -> Str(organisation.packageName))) ++
-        (if (scalaJsVersion.isEmpty) Map()
-         else Map("scalaJsVersion" -> Str(scalaJsVersion.get))) ++
-        (if (scalaNativeVersion.isEmpty) Map() else
-         Map("scalaNativeVersion" -> Str(scalaNativeVersion.get))
+        List("scalaVersion" -> Str(jvmScalaVersion)) ++
+        (if (organisation == Organisation.Lightbend) List()
+         else List("scalaOrganisation" -> Str(organisation.packageName))) ++
+        (if (scalaJsVersion.isEmpty) List()
+         else List("scalaJsVersion" -> Str(scalaJsVersion.get))) ++
+        (if (scalaNativeVersion.isEmpty) List() else
+         List("scalaNativeVersion" -> Str(scalaNativeVersion.get))
         ) ++ (
-          if (testFrameworks.isEmpty) Map()
-          else Map(
+          if (testFrameworks.isEmpty) List()
+          else List(
             "testFrameworks" -> Arr(
               testFrameworks.map(tf => Str(tf.mainClass)).toList
             )
@@ -578,7 +578,7 @@ class Scaffold(log: Log, silent: Boolean = false) {
     (if (platforms.size == 1) List() else List(
       NamedTable(
         List("module", moduleName),
-        Map(
+        List(
           "root" -> Str("shared"),
           "sources" -> Arr(List(Str("shared/src"))),
           "targets" -> Arr(
@@ -591,19 +591,19 @@ class Scaffold(log: Log, silent: Boolean = false) {
       else List(
         NamedTable(
           List("module", moduleName, "test"),
-          Map("sources" -> Arr(List(Str("shared/test"))))
+          List("sources" -> Arr(List(Str("shared/test"))))
         )
       )
     )) ++
     (if (scalaJsVersion.isEmpty) List() else List(
       NamedTable(
         List("module", moduleName, "js"),
-        Map("root" -> (if (platforms.size == 1) Str(".") else Str("js"))) ++
+        List("root" -> (if (platforms.size == 1) Str(".") else Str("js"))) ++
         (if (
           jsScalaVersion.isDefined && !jsScalaVersion.contains(jvmScalaVersion)
-         ) Map("scalaVersion" -> Str(jsScalaVersion.get)) else Map()
+         ) List("scalaVersion" -> Str(jsScalaVersion.get)) else List()
         ) ++
-        Map(
+        List(
           "sources" -> Arr(List(
             if (platforms.size == 1) Str("src") else Str("js/src")
           ))
@@ -614,7 +614,7 @@ class Scaffold(log: Log, silent: Boolean = false) {
       else List(
         NamedTable(
           List("module", moduleName, "test", "js"),
-          Map(
+          List(
             "sources" -> Arr(List(
               if (platforms.size == 1) Str("test") else Str("js/test")
             ))
@@ -625,7 +625,7 @@ class Scaffold(log: Log, silent: Boolean = false) {
     (if (!platforms.contains(JVM)) List() else List(
       NamedTable(
         List("module", moduleName, "jvm"),
-        Map(
+        List(
           "root" -> (if (platforms.size == 1) Str(".") else Str("jvm")),
           "sources" -> Arr(List(
             if (platforms.size == 1) Str("src") else Str("jvm/src")
@@ -637,7 +637,7 @@ class Scaffold(log: Log, silent: Boolean = false) {
       else List(
         NamedTable(
           List("module", moduleName, "test", "jvm"),
-          Map(
+          List(
             "sources" -> Arr(List(
               if (platforms.size == 1) Str("test") else Str("jvm/test")
             ))
@@ -648,12 +648,12 @@ class Scaffold(log: Log, silent: Boolean = false) {
     (if (scalaNativeVersion.isEmpty) List() else List(
       NamedTable(
         List("module", moduleName, "native"),
-        Map("root" -> (if (platforms.size == 1) Str(".") else Str("native"))) ++
+        List("root" -> (if (platforms.size == 1) Str(".") else Str("native"))) ++
         (if (
           nativeScalaVersion.isDefined &&
           !nativeScalaVersion.contains(jvmScalaVersion)
-         ) Map("scalaVersion" -> Str(nativeScalaVersion.get)) else Map()
-        ) ++ Map(
+         ) List("scalaVersion" -> Str(nativeScalaVersion.get)) else List()
+        ) ++ List(
           "sources" -> Arr(List(
             if (platforms.size == 1) Str("src") else Str("native/src")
           ))
@@ -664,7 +664,7 @@ class Scaffold(log: Log, silent: Boolean = false) {
       else List(
         NamedTable(
           List("module", moduleName, "test", "native"),
-          Map(
+          List(
             "sources" -> Arr(List(
               if (platforms.size == 1) Str("test") else Str("native/test")
             ))

Diff for: src/main/scala/seed/config/SeedConfig.scala

@@ -24,9 +24,9 @@ object SeedConfig {
     def parse(tomlPath: Path) = {
       def parseRaw(
         toml: String
-      ): Either[_root_.toml.Codec.Error, List[Value.Tbl]] =
+      ): Either[_root_.toml.Parse.Error, List[Value.Tbl]] =
         Toml.parse(toml) match {
-          case Left(l) => Left(List() -> l)
+          case Left(l) => Left(l)
           case Right(r) =>
             r.values.get("import") match {
               case Some(Value.Arr(values))
@@ -45,7 +45,7 @@ object SeedConfig {
             }
         }
 
-      def f(toml: String): Either[Codec.Error, Config] =
+      def f(toml: String): Either[_root_.toml.Parse.Error, Config] =
         parseRaw(toml).right.flatMap { configurations =>
           val parsedAll = configurations.foldLeft(Map[String, Value]()) {
             case (acc, cur) =>

Diff for: src/main/scala/seed/config/util/TomlUtils.scala

@@ -7,11 +7,13 @@ import seed.{Log, LogLevel}
 import seed.cli.util.Ansi
 import seed.model.Build.{ModuleKindJs, PlatformModule, VersionTag}
 import seed.model.{Licence, Platform, TomlBuild}
-import toml.{Codec, Value}
+import toml.{Codec, Extension, Parse, Value}
 
 import scala.util.Try
 
 object TomlUtils {
+  val Extensions: Set[Extension] = Set(Extension.MultiLineInlineTables)
+
   object Codecs {
     implicit val logLevelCodec: Codec[LogLevel] = Codec {
       case (Value.Str(level), _, _) if level == "detail" =>
@@ -132,7 +134,7 @@ object TomlUtils {
 
   def parseFile[T](
     path: Path,
-    f: String => Either[Codec.Error, T],
+    f: String => Either[Parse.Error, T],
     description: String,
     log: Log
   ): Option[T] =
@@ -168,13 +170,13 @@ object TomlUtils {
 
   def parseBuildToml(
     projectPath: Path
-  )(content: String): Either[Codec.Error, TomlBuild] = {
+  )(content: String): Either[Parse.Error, TomlBuild] = {
     import toml._
     import toml.Codecs._
     import seed.config.util.TomlUtils.Codecs._
 
     implicit val pCodec = pathCodec(fixPath(projectPath, _))
 
-    Toml.parseAs[TomlBuild](content)
+    Toml.parseAs[TomlBuild](content, Extensions)
   }
 }

Diff for: src/main/scala/seed/generation/Bloop.scala

@@ -49,6 +49,7 @@ object Bloop {
     val project = Config.Project(
       name = name,
       directory = projectPath.toAbsolutePath,
+      workspaceDir = Some(projectPath.toAbsolutePath),
       sources = sources.map(_.toAbsolutePath),
       dependencies = dependencies,
       classpath = scalaCompiler.fold(List[Path]())(

Diff for: src/test/scala/seed/cli/ScaffoldSpec.scala

@@ -19,17 +19,27 @@ object ScaffoldSpec extends SimpleTestSuite {
     )
 
     val project = result.nodes(0).asInstanceOf[NamedTable]
-    assert(project.values("scalaVersion").asInstanceOf[Str].value.nonEmpty)
     assert(
-      project.values("scalaNativeVersion").asInstanceOf[Str].value.nonEmpty
+      project.values.toMap
+        .apply("scalaVersion")
+        .asInstanceOf[Str]
+        .value
+        .nonEmpty
     )
-    assert(!project.values.isDefinedAt("testFrameworks"))
+    assert(
+      project.values.toMap
+        .apply("scalaNativeVersion")
+        .asInstanceOf[Str]
+        .value
+        .nonEmpty
+    )
+    assert(!project.values.toMap.isDefinedAt("testFrameworks"))
 
     val module = result.nodes(1).asInstanceOf[NamedTable]
     assertEquals(module.ref, List("module", "example", "native"))
     assertEquals(
       module.values,
-      Map("root" -> Str("."), "sources" -> Arr(List(Str("src"))))
+      List("root" -> Str("."), "sources" -> Arr(List(Str("src"))))
     )
 
     assertEquals(result.nodes.length, 2)

Diff for: src/test/scala/seed/generation/BloopIntegrationSpec.scala

@@ -3,9 +3,7 @@ package seed.generation
 import java.nio.file.{Files, Path, Paths}
 
 import bloop.config.Config.JsConfig
-import bloop.config.ConfigEncoderDecoders
 import minitest.TestSuite
-import org.apache.commons.io.FileUtils
 import seed.{Log, cli}
 import seed.Cli.{Command, PackageConfig}
 import seed.cli.util.RTS

Diff for: src/test/scala/seed/generation/BloopSpec.scala

@@ -2,17 +2,13 @@ package seed.generation
 
 import java.nio.file.{Files, Path}
 
-import bloop.config.ConfigEncoderDecoders
+import bloop.config.ConfigCodecs
 import minitest.SimpleTestSuite
 import org.apache.commons.io.FileUtils
+import seed.generation.util.BloopUtil
 import seed.generation.util.BuildUtil.tempPath
 
 object BloopSpec extends SimpleTestSuite {
-  def parseBloopFile(path: Path): bloop.config.Config.File = {
-    val json = FileUtils.readFileToString(path.toFile, "UTF-8")
-    io.circe.parser.decode(json)(ConfigEncoderDecoders.allDecoder).right.get
-  }
-
   test("Inherit javaDeps in child modules") {
     val projectPath = tempPath.resolve("inherit-javadeps")
     Files.createDirectory(projectPath)
@@ -22,19 +18,19 @@ object BloopSpec extends SimpleTestSuite {
 
     assertEquals(build("example").module.jvm.get.moduleDeps, List("base"))
 
-    val base = parseBloopFile(bloopPath.resolve("base.json"))
+    val base = BloopUtil.readJson(bloopPath.resolve("base.json"))
     assert(
       base.project.classpath
         .exists(_.toString.contains("/org/postgresql/postgresql/"))
     )
 
-    val example = parseBloopFile(bloopPath.resolve("example.json"))
+    val example = BloopUtil.readJson(bloopPath.resolve("example.json"))
     assert(
       example.project.classpath
         .exists(_.toString.contains("/org/postgresql/postgresql/"))
     )
 
-    val exampleTest = parseBloopFile(bloopPath.resolve("example-test.json"))
+    val exampleTest = BloopUtil.readJson(bloopPath.resolve("example-test.json"))
     assert(
       exampleTest.project.classpath
         .exists(_.toString.contains("/org/postgresql/postgresql/"))

Diff for: src/test/scala/seed/generation/util/BloopUtil.scala

@@ -2,16 +2,12 @@ package seed.generation.util
 
 import java.nio.file.Path
 
-import bloop.config.ConfigEncoderDecoders
+import bloop.config.ConfigCodecs
 import org.apache.commons.io.FileUtils
 
 object BloopUtil {
   def readJson(path: Path): bloop.config.Config.File = {
-    val content = FileUtils.readFileToString(path.toFile, "UTF-8")
-
-    import io.circe.parser._
-    decode[bloop.config.Config.File](content)(
-      ConfigEncoderDecoders.allDecoder
-    ).right.get
+    val bytes = FileUtils.readFileToByteArray(path.toFile)
+    ConfigCodecs.read(bytes).right.get
   }
 }