Update dependencies, apply scalafmt, and resolve warnings

.gitignore

@@ -9,3 +9,4 @@ bin
 .ensime*
 shared/src/main/scala/Empty.scala
 .idea/
+.bsp/

.scalafmt.conf

@@ -0,0 +1,53 @@
+version = 2.1.0
+
+style = defaultWithAlign
+
+docstrings                 = JavaDoc
+indentOperator             = spray
+maxColumn                  = 120
+rewrite.rules              = [RedundantParens, SortImports, AvoidInfix]
+unindentTopLevelOperators  = true
+align.tokens               = [{code = "=>", owner = "Case"}]
+align.openParenDefnSite    = false
+align.openParenCallSite    = false
+optIn.breakChainOnFirstMethodDot = false
+optIn.configStyleArguments = false
+danglingParentheses = false
+spaces.inImportCurlyBraces = true
+rewrite.neverInfix.excludeFilters = [
+  and
+  min
+  max
+  until
+  to
+  by
+  eq
+  ne
+  "should.*"
+  "contain.*"
+  "must.*"
+  in
+  ignore
+  be
+  taggedAs
+  thrownBy
+  synchronized
+  have
+  when
+  size
+  only
+  noneOf
+  oneElementOf
+  noElementsOf
+  atLeastOneElementOf
+  atMostOneElementOf
+  allElementsOf
+  inOrderElementsOf
+  theSameElementsAs
+  theSameElementsInOrderAs
+]
+rewriteTokens = {
+  "⇒": "=>"
+  "→": "->"
+  "←": "<-"
+}

.travis.yml

@@ -6,15 +6,13 @@ jdk: openjdk8
 language: scala
 
 scala:
-  - "2.13.1"
-  - "2.12.10"
-
-jdk: openjdk8
+  - "2.13.8"
+  - "2.12.15"
 
 matrix:
   include:
-    - env: SBT_VERSION=1.3.8
-      scala: "2.12.10"
+    - env: SBT_VERSION=1.4.9
+      scala: "2.12.15"
 
 env:
   - TRAVIS_NODE_VERSION="10.17.0"
@@ -30,6 +28,3 @@ cache:
 script:
   - sbt ++$TRAVIS_SCALA_VERSION test
   - source travis/testSbtPlugin.sh
-cache:
-  directories:
-    - $HOME/.cache

build.sbt

@@ -2,103 +2,66 @@ import xerial.sbt.Sonatype._
 
 import sbtcrossproject.CrossPlugin.autoImport.crossProject
 
-lazy val root = project
-  .in(file("."))
-  .aggregate(parserJS, parserJVM, facadeJS, facadeJVM)
-  .settings(sonatypeSettings)
+lazy val root = project.in(file(".")).aggregate(parser.js, parser.jvm, facade.js, facade.jvm).settings(sonatypeSettings)
 
 lazy val fixResources =
   taskKey[Unit]("Fix application.conf presence on first clean build.")
 
 lazy val parser = crossProject(JSPlatform, JVMPlatform)
-  .in(file("."))
+  .in(file("parser"))
   .settings(
     name := "shocon-parser",
     scalacOptions ++=
-      Seq(
-        "-feature",
-        "-unchecked",
-        "-language:implicitConversions",
-        "-deprecation",
-      ),
-    publishTo := sonatypePublishTo.value
-  )
+      Seq("-feature", "-unchecked", "-language:implicitConversions", "-deprecation"),
+    publishTo := sonatypePublishTo.value)
   .settings(sonatypeSettings)
   .settings(
     fixResources := {
       val compileConf = (resourceDirectory in Compile).value / "application.conf"
-      if (compileConf.exists)
-        IO.copyFile(
-          compileConf,
-          (classDirectory in Compile).value / "application.conf"
-        )
+      if (compileConf.exists) {
+        IO.copyFile(compileConf, (classDirectory in Compile).value / "application.conf")
+      }
       val testConf = (resourceDirectory in Test).value / "application.conf"
       if (testConf.exists) {
-        IO.copyFile(
-          testConf,
-          (classDirectory in Test).value / "application.conf"
-        )
+        IO.copyFile(testConf, (classDirectory in Test).value / "application.conf")
       }
     },
     compile in Compile := (compile in Compile).dependsOn(fixResources).value,
     libraryDependencies ++= Seq(
-      "org.scala-lang.modules" %%% "scala-collection-compat" % "2.1.4",
-      "com.lihaoyi" %%% "fastparse" % "2.2.4",
-      "org.scala-lang" % "scala-reflect" % scalaVersion.value % "provided"
-    )
-  )
+        "org.scala-lang.modules" %%% "scala-collection-compat" % "2.6.0",
+        "com.lihaoyi" %%% "fastparse" % "2.3.3",
+        "org.scala-lang" % "scala-reflect" % scalaVersion.value % "provided"))
   .jsSettings(
     libraryDependencies += "org.scala-js" %%% "scalajs-java-time" % "1.0.0",
-    parallelExecution in Test := true
-  )
-
-lazy val parserJVM = parser.jvm
-lazy val parserJS = parser.js
+    parallelExecution in Test := true)
 
 lazy val facade = crossProject(JSPlatform, JVMPlatform)
   .in(file("facade"))
   .dependsOn(parser)
   .settings(
     name := "shocon",
     scalacOptions ++=
-      Seq(
-        "-feature",
-        "-unchecked",
-        "-language:implicitConversions",
-        "-deprecation",
-      ),
-    publishTo := sonatypePublishTo.value
-  )
+      Seq("-feature", "-unchecked", "-language:implicitConversions", "-deprecation"),
+    publishTo := sonatypePublishTo.value)
   .settings(sonatypeSettings)
   .settings(
     fixResources := {
       val compileConf = (resourceDirectory in Compile).value / "application.conf"
-      if (compileConf.exists)
-        IO.copyFile(
-          compileConf,
-          (classDirectory in Compile).value / "application.conf"
-        )
+      if (compileConf.exists) {
+        IO.copyFile(compileConf, (classDirectory in Compile).value / "application.conf")
+      }
       val testConf = (resourceDirectory in Test).value / "application.conf"
       if (testConf.exists) {
-        IO.copyFile(
-          testConf,
-          (classDirectory in Test).value / "application.conf"
-        )
+        IO.copyFile(testConf, (classDirectory in Test).value / "application.conf")
       }
     },
     compile in Compile := (compile in Compile).dependsOn(fixResources).value,
     testFrameworks += new TestFramework("utest.runner.Framework"),
     libraryDependencies ++= Seq(
-      "org.scala-lang.modules" %%% "scala-collection-compat" % "2.1.4",
-      "com.lihaoyi" %%% "fastparse" % "2.2.4",
-      "com.lihaoyi" %%% "utest" % "0.7.4" % "test",
-      "org.scala-lang" % "scala-reflect" % scalaVersion.value % "provided"
-    )
-  )
+        "org.scala-lang.modules" %%% "scala-collection-compat" % "2.6.0",
+        "com.lihaoyi" %%% "fastparse" % "2.3.3",
+        "com.lihaoyi" %%% "utest" % "0.7.11" % "test",
+        "org.scala-lang" % "scala-reflect" % scalaVersion.value % "provided"))
   .jsSettings(
     libraryDependencies += "org.scala-js" %%% "scalajs-java-time" % "1.0.0",
-    parallelExecution in Test := true
-  )
-
-lazy val facadeJVM = facade.jvm
-lazy val facadeJS = facade.js
+    parallelExecution in Test := true)

facade/js/src/test/scala/AkkaConf.scala → facade/js/src/test/scala/tests/AkkaConf.scala

@@ -1,7 +1,5 @@
 package tests
 
-import scala.scalajs.js.Dynamic.global
-
 object AkkaConf {
 
   def basic: String = """
@@ -73,7 +71,7 @@ akka {
 
 """
 
-  def long =
+  def long: String =
     """
 # This is an unmodified akka-reference.conf, except for this
 # comment and quoting one key that contained slashes.

facade/jvm/src/test/scala/tests/AkkaConf.scala

@@ -0,0 +1,11 @@
+package tests
+
+import scala.util.Using
+
+object AkkaConf {
+
+  def basic: String = Using.resource(io.Source.fromFile("facade/jvm/src/test/resources/akka.conf")) { _.mkString }
+
+  def long: String = Using.resource(io.Source.fromFile("facade/jvm/src/test/resources/akka-long.conf")) { _.mkString }
+
+}