Merge pull request #10 from sparsetech/feat/scala213

tindzk · web-flow · commit 04607868de2e · 2019-07-06T16:55:07.000+03:00
Add support for Scala 2.13
diff --git a/.drone.yml b/.drone.yml
@@ -2,13 +2,18 @@ kind: pipeline
 name: default
 steps:
   - name: build
-    image: tindzk/seed:0.1.1
+    image: tindzk/seed:0.1.4
     pull: always
     commands:
       - blp-server &
       - seed --build=build211.toml bloop
       - bloop compile toml-native-test
       - bloop test toml-js toml-jvm
+      - sleep 5
       - rm -rf .bloop build
       - seed --build=build212.toml bloop
       - bloop test toml-js toml-jvm
+      - sleep 5
+      - rm -rf .bloop build
+      - seed --build=build213.toml bloop
+      - bloop test toml-js toml-jvm
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,7 @@ language: java
 env:
   - TRAVIS_SCALA_VERSION=2.11.11
   - TRAVIS_SCALA_VERSION=2.12.8
+  - TRAVIS_SCALA_VERSION=2.13.0
 jdk:
   - oraclejdk8
 
@@ -24,6 +25,6 @@ before_script:
 script:
   - set -x &&
     if [[ "$TRAVIS_SCALA_VERSION" == 2.11.* ]]; then testNative=tomlNative/test; else testNative=""; fi &&
-    curl -o csbt https://raw.githubusercontent.com/coursier/sbt-launcher/master/csbt &&
+    curl -L -o csbt https://github.com/coursier/sbt-launcher/releases/download/v1.2.14/csbt &&
     chmod +x csbt &&
-    ./csbt --add-coursier=true ++$TRAVIS_SCALA_VERSION tomlJVM/test tomlJS/test $testNative
+    COURSIER_SBT_LAUNCHER_ADD_PLUGIN=true ./csbt ++$TRAVIS_SCALA_VERSION tomlJVM/test tomlJS/test $testNative
diff --git a/build.sbt b/build.sbt
@@ -3,18 +3,19 @@ import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}
 
 val Scala2_11  = "2.11.12"
 val Scala2_12  = "2.12.8"
-val FastParse  = "1.0.0"
+val Scala2_13  = "2.13.0"
+val FastParse  = "1.0.1"
 val Shapeless  = "2.3.3"
 val ScalaCheck = "1.14.0"
-val ScalaTest  = "3.0.5"
+val ScalaTest  = "3.0.8"
 val ScalaTestNative = "3.2.0-SNAP10"
 
 val SharedSettings = Seq(
   name         := "toml-scala",
   organization := "tech.sparse",
 
-  scalaVersion       := Scala2_12,
-  crossScalaVersions := Seq(Scala2_12, Scala2_11),
+  scalaVersion       := Scala2_13,
+  crossScalaVersions := Seq(Scala2_13, Scala2_12, Scala2_11),
 
   pomExtra :=
     <url>https://github.com/sparsetech/toml-scala</url>
@@ -47,8 +48,8 @@ lazy val toml =
     .settings(SharedSettings)
     .settings(
       libraryDependencies ++= Seq(
-        "com.lihaoyi" %%% "fastparse" % FastParse,
-        "com.chuusai" %%% "shapeless" % Shapeless
+        "org.scalameta" %%% "fastparse" % FastParse,
+        "com.chuusai"   %%% "shapeless" % Shapeless
       )
     )
     .jsSettings(
diff --git a/build.toml b/build.toml
@@ -1 +1 @@
-build212.toml
+build213.toml
diff --git a/build211.toml b/build211.toml
@@ -1,7 +1,7 @@
 [project]
 scalaVersion       = "2.11.12"
-scalaJsVersion     = "0.6.26"
-scalaNativeVersion = "0.3.8"
+scalaJsVersion     = "0.6.28"
+scalaNativeVersion = "0.3.9"
 scalaOptions       = [
   "-encoding", "UTF-8",
   "-unchecked",
@@ -21,7 +21,7 @@ root    = "shared"
 sources = ["shared/src/main/scala"]
 targets = ["js", "jvm", "native"]
 scalaDeps = [
-  ["com.lihaoyi", "fastparse", "1.0.0"],
+  ["org.scalameta", "fastparse", "1.0.1"],
   ["com.chuusai", "shapeless", "2.3.3"]
 ]
 
@@ -32,7 +32,7 @@ sources = ["jvm/src/main/scala"]
 [module.toml.test.jvm]
 sources = ["shared/src/test/scala", "jvm/src/test/scala"]
 scalaDeps = [
-  ["org.scalatest" , "scalatest" , "3.0.5" ],
+  ["org.scalatest" , "scalatest" , "3.0.8" ],
   ["org.scalacheck", "scalacheck", "1.14.0"]
 ]
 
@@ -43,7 +43,7 @@ sources = ["js/src/main/scala"]
 [module.toml.test.js]
 sources = ["shared/src/test/scala"]
 scalaDeps = [
-  ["org.scalatest" , "scalatest" , "3.0.5" ],
+  ["org.scalatest" , "scalatest" , "3.0.8" ],
   ["org.scalacheck", "scalacheck", "1.14.0"]
 ]
 
diff --git a/build212.toml b/build212.toml
@@ -1,7 +1,7 @@
 [project]
 scalaVersion       = "2.12.8"
-scalaJsVersion     = "0.6.26"
-scalaNativeVersion = "0.3.8"
+scalaJsVersion     = "0.6.28"
+scalaNativeVersion = "0.3.9"
 scalaOptions       = [
   "-encoding", "UTF-8",
   "-unchecked",
@@ -21,7 +21,7 @@ root    = "shared"
 sources = ["shared/src/main/scala"]
 targets = ["js", "jvm", "native"]
 scalaDeps = [
-  ["com.lihaoyi", "fastparse", "1.0.0"],
+  ["org.scalameta", "fastparse", "1.0.1"],
   ["com.chuusai", "shapeless", "2.3.3"]
 ]
 
@@ -32,7 +32,7 @@ sources = ["jvm/src/main/scala"]
 [module.toml.test.jvm]
 sources = ["shared/src/test/scala", "jvm/src/test/scala"]
 scalaDeps = [
-  ["org.scalatest" , "scalatest" , "3.0.5" ],
+  ["org.scalatest" , "scalatest" , "3.0.8" ],
   ["org.scalacheck", "scalacheck", "1.14.0"]
 ]
 
@@ -43,7 +43,7 @@ sources = ["js/src/main/scala"]
 [module.toml.test.js]
 sources = ["shared/src/test/scala"]
 scalaDeps = [
-  ["org.scalatest" , "scalatest" , "3.0.5" ],
+  ["org.scalatest" , "scalatest" , "3.0.8" ],
   ["org.scalacheck", "scalacheck", "1.14.0"]
 ]
 
diff --git a/build213.toml b/build213.toml
@@ -0,0 +1,64 @@
+[project]
+scalaVersion       = "2.13.0"
+scalaJsVersion     = "0.6.28"
+scalaNativeVersion = "0.3.9"
+scalaOptions       = [
+  "-encoding", "UTF-8",
+  "-unchecked",
+  "-deprecation",
+  "-Ywarn-numeric-widen",
+  "-feature"
+]
+testFrameworks = [
+  "org.scalatest.tools.Framework",
+  "org.scalacheck.ScalaCheckFramework"
+]
+
+[module.toml]
+root    = "shared"
+sources = ["shared/src/main/scala"]
+targets = ["js", "jvm", "native"]
+scalaDeps = [
+  ["org.scalameta", "fastparse", "1.0.1"],
+  ["com.chuusai", "shapeless", "2.3.3"]
+]
+
+[module.toml.jvm]
+root    = "jvm"
+sources = ["jvm/src/main/scala"]
+
+[module.toml.test.jvm]
+sources = ["shared/src/test/scala", "jvm/src/test/scala"]
+scalaDeps = [
+  ["org.scalatest" , "scalatest" , "3.0.8" ],
+  ["org.scalacheck", "scalacheck", "1.14.0"]
+]
+
+[module.toml.js]
+root    = "js"
+sources = ["js/src/main/scala"]
+
+[module.toml.test.js]
+sources = ["shared/src/test/scala"]
+scalaDeps = [
+  ["org.scalatest" , "scalatest" , "3.0.8" ],
+  ["org.scalacheck", "scalacheck", "1.14.0"]
+]
+
+[module.toml.native]
+root         = "native"
+scalaVersion = "2.11.12"
+sources      = ["native/src/main/scala"]
+
+[module.toml.test.native]
+# Exclude GeneratedSpec.scala and Generators.scala
+sources = [
+  "shared/src/test/scala/toml/CodecSpec.scala",
+  "shared/src/test/scala/toml/EmbedSpec.scala",
+  "shared/src/test/scala/toml/GenerationSpec.scala",
+  "shared/src/test/scala/toml/RulesSpec.scala",
+  "shared/src/test/scala/toml/TestHelpers.scala",
+]
+scalaDeps = [
+  ["org.scalatest", "scalatest", "3.2.0-SNAP10"]
+]
diff --git a/js/src/main/scala/toml/PlatformRules.scala b/js/src/main/scala/toml/PlatformRules.scala
@@ -1,6 +1,6 @@
 package toml
 
-import fastparse.all._
+import scala.meta.internal.fastparse.all._
 
 trait PlatformRules {
   val date = StringIn().map(_ => null.asInstanceOf[Value])
diff --git a/jvm/src/main/scala/toml/PlatformRules.scala b/jvm/src/main/scala/toml/PlatformRules.scala
@@ -2,7 +2,7 @@ package toml
 
 import java.time._
 
-import fastparse.all._
+import scala.meta.internal.fastparse.all._
 
 trait PlatformRules { this: Rules.type =>
   private val TenPowers =
diff --git a/jvm/src/test/scala/toml/DateGenSpec.scala b/jvm/src/test/scala/toml/DateGenSpec.scala
@@ -2,11 +2,12 @@ package toml
 
 import org.scalatest.prop._
 import org.scalatest.{Matchers, PropSpec}
+import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
 
-import fastparse.all._
-import fastparse.core.Parsed.{Failure, Success}
+import scala.meta.internal.fastparse.all._
+import scala.meta.internal.fastparse.core.Parsed.{Failure, Success}
 
-class DateGenSpec extends PropSpec with PropertyChecks with Matchers {
+class DateGenSpec extends PropSpec with ScalaCheckPropertyChecks with Matchers {
   import TestHelpers._
 
   property("parse dates following the RFC 3339 spec (`date` parser)") {
diff --git a/jvm/src/test/scala/toml/DateSpec.scala b/jvm/src/test/scala/toml/DateSpec.scala
@@ -3,7 +3,7 @@ package toml
 import java.time._
 
 import org.scalatest.{FunSuite, Matchers}
-import fastparse.core.Parsed._
+import scala.meta.internal.fastparse.core.Parsed._
 
 class DateSpec extends FunSuite with Matchers {
   import TestHelpers._
diff --git a/jvm/src/test/scala/toml/FileSpec.scala b/jvm/src/test/scala/toml/FileSpec.scala
@@ -4,7 +4,7 @@ import java.time._
 import java.io.File
 
 import org.scalatest.{FunSuite, Matchers}
-import fastparse.core.Parsed._
+import scala.meta.internal.fastparse.core.Parsed._
 
 class FileSpec extends FunSuite with Matchers {
   import TestHelpers._
diff --git a/native/src/main/scala/toml/PlatformRules.scala b/native/src/main/scala/toml/PlatformRules.scala
@@ -1,6 +1,6 @@
 package toml
 
-import fastparse.all._
+import scala.meta.internal.fastparse.all._
 
 trait PlatformRules {
   val date = StringIn().map(_ => null.asInstanceOf[Value])
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,6 +1,6 @@
 logLevel := Level.Warn
 
-addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject"      % "0.6.0")
-addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "0.6.0")
-addSbtPlugin("org.scala-js"       % "sbt-scalajs"                   % "0.6.26")
-addSbtPlugin("org.scala-native"   % "sbt-scala-native"              % "0.3.8")
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject"      % "0.6.1")
+addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "0.6.1")
+addSbtPlugin("org.scala-js"       % "sbt-scalajs"                   % "0.6.28")
+addSbtPlugin("org.scala-native"   % "sbt-scala-native"              % "0.3.9")
diff --git a/shared/src/main/scala/toml/Rules.scala b/shared/src/main/scala/toml/Rules.scala
@@ -1,6 +1,6 @@
 package toml
 
-import fastparse.all._
+import scala.meta.internal.fastparse.all._
 
 private[toml] case class NamedFunction[T, V](f: T => V, name: String)
   extends (T => V)
@@ -100,7 +100,7 @@ object Rules extends PlatformRules {
       .map(p => Value.Tbl(p.toMap))
 
   val tableIds: Parser[Seq[String]] =
-    P(validKey.rep(min = 1, sep = whitespaces.? ~ "." ~ whitespaces.?))
+    P(validKey.rep(min = 1, sep = whitespaces.? ~ "." ~ whitespaces.?).map(_.toSeq))
   val tableDef: Parser[Seq[String]] =
     P("[" ~ whitespaces.? ~ tableIds ~ whitespaces.? ~ "]")
   val tableArrayDef: Parser[Seq[String]] =
diff --git a/shared/src/main/scala/toml/Toml.scala b/shared/src/main/scala/toml/Toml.scala
@@ -2,7 +2,7 @@ package toml
 
 import shapeless._
 
-import fastparse.core.Parsed._
+import scala.meta.internal.fastparse.core.Parsed._
 
 object Toml {
   def parse(toml: String): Either[String, Value.Tbl] =
diff --git a/shared/src/test/scala/toml/GeneratedSpec.scala b/shared/src/test/scala/toml/GeneratedSpec.scala
@@ -2,8 +2,8 @@ package toml
 
 import org.scalatest.prop._
 import org.scalatest.{Matchers, PropSpec}
-import fastparse.all._
-import fastparse.core.Parsed.{Failure, Success}
+import scala.meta.internal.fastparse.all._
+import scala.meta.internal.fastparse.core.Parsed.{Failure, Success}
 
 import scala.util.Try
 
diff --git a/shared/src/test/scala/toml/Generators.scala b/shared/src/test/scala/toml/Generators.scala
@@ -21,9 +21,9 @@ object Generators {
     def invalidStrGen: Gen[String] = for {
       s <- Gen.alphaStr
       f <- Gen.oneOf(
-        SingleQuote + s,
+        s"$SingleQuote$s",
         s + SingleQuote,
-        DoubleQuote + s,
+        s"$DoubleQuote$s",
         s + DoubleQuote
       )
     } yield f
diff --git a/shared/src/test/scala/toml/RulesSpec.scala b/shared/src/test/scala/toml/RulesSpec.scala
@@ -1,7 +1,7 @@
 package toml
 
 import org.scalatest.{FunSuite, Matchers}
-import fastparse.core.Parsed._
+import scala.meta.internal.fastparse.core.Parsed._
 
 class RulesSpec extends FunSuite with Matchers {
   import TestHelpers._
diff --git a/shared/src/test/scala/toml/TestHelpers.scala b/shared/src/test/scala/toml/TestHelpers.scala
@@ -1,7 +1,7 @@
 package toml
 
-import fastparse.all._
-import fastparse.core.Parsed._
+import scala.meta.internal.fastparse.all._
+import scala.meta.internal.fastparse.core.Parsed._
 
 import org.scalatest.Matchers
 
