Scala 2.13.0-RC1 (#161)

Author: marcospereira

.travis.yml

@@ -34,8 +34,7 @@ matrix:
 scala:
   - 2.11.12
   - 2.12.8
-  - 2.13.0-M3
-  - 2.13.0-M5
+  - 2.13.0-RC1
 
 script:
   - sbt ++$TRAVIS_SCALA_VERSION validateCode

build.sbt

@@ -4,7 +4,7 @@ import com.typesafe.tools.mima.core._
 
 val commonSettings = Seq(
   scalaVersion := Version.scala212,
-  crossScalaVersions := Seq(Version.scala213, Version.scala213M3, Version.scala212, Version.scala211),
+  crossScalaVersions := Seq(Version.scala213, Version.scala212, Version.scala211),
   javacOptions ++= Seq("-source", "1.8", "-target", "1.8")
 )
 
@@ -26,18 +26,9 @@ lazy val sslConfigCore = project.in(file("ssl-config-core"))
       case _ => // 2.13 we don't have a library capable of this
         Set.empty[ModuleID]
     }), // "sbt mimaReportBinaryIssues"
+    libraryDependencies += Library.parserCombinators(scalaVersion.value),
     libraryDependencies ++= Dependencies.sslConfigCore,
-    libraryDependencies ++= (
-      scalaVersion.value match {
-        case Version.scala213M3 => Seq(Library.parserCombinators213M3)
-        case _      => Seq(Library.parserCombinators)
-      }),
-    libraryDependencies ++= (
-      scalaVersion.value match {
-        case Version.scala213M3 => Dependencies.testDependencies213M3
-        case _ => Dependencies.testDependencies
-      }
-    ),
+    libraryDependencies ++= Dependencies.testDependencies,
     OsgiKeys.bundleSymbolicName := s"${organization.value}.sslconfig",
     OsgiKeys.exportPackage := Seq(s"com.typesafe.sslconfig.*;version=${version.value}"),
     OsgiKeys.importPackage := Seq("!sun.misc", "!sun.security.*", configImport(), "*"),

project/Dependencies.scala

@@ -6,22 +6,19 @@ object Version {
   val jodaTime       = "2.10.1"
   val jodaTimeConvert = "2.2.0"
 
-  val parserCombinators = "1.1.1"
-  val parserCombinators213M3 = "1.1.0"
-
-  val specs2Scala213M3 = "4.2.0"
-  val specs2          = "4.3.5"
+  // Because of https://github.com/sbt/sbt/issues/4609
+  val parserCombinators211 = "1.1.1"
+  val parserCombinators = "1.1.2"
+  val specs2          = "4.5.1"
 
   val scala211       = "2.11.12"
-  val scala212       = "2.12.6"
-  val scala213M3     = "2.13.0-M3"
-  val scala213       = "2.13.0-M5"
+  val scala212       = "2.12.8"
+  val scala213       = "2.13.0-RC1"
 }
 
 object Library {
   val typesafeConfig  = "com.typesafe"           % "config"                     % Version.typesafeConfig // Apache2
 
-
   // TESTS
   val specs2 = Seq(
   "org.specs2" %% "specs2-core"          % Version.specs2 % "test",
@@ -30,25 +27,19 @@ object Library {
   "org.specs2" %% "specs2-matcher-extra" % Version.specs2 % "test"
   )
 
-  val specs2Scala213M3 = Seq(
-    "org.specs2" %% "specs2-core"          % Version.specs2Scala213M3 % "test",
-    "org.specs2" %% "specs2-junit"         % Version.specs2Scala213M3 % "test",
-    "org.specs2" %% "specs2-mock"          % Version.specs2Scala213M3 % "test",
-    "org.specs2" %% "specs2-matcher-extra" % Version.specs2Scala213M3 % "test"
-  )
-
-  val parserCombinators = "org.scala-lang.modules" %% "scala-parser-combinators" % Version.parserCombinators
-  val parserCombinators213M3 = "org.scala-lang.modules" %% "scala-parser-combinators" % Version.parserCombinators213M3
-
   val jodaTime          = "joda-time"              % "joda-time"                % Version.jodaTime  % "test" // ONLY FOR TESTS!
   val jodaTimeConvert   = "org.joda"               % "joda-convert"             % Version.jodaTimeConvert  % "test" // ONLY FOR TESTS!
+
+  def parserCombinators(scalaVersion: String) = if (scalaVersion.equals(Version.scala211)) {
+    "org.scala-lang.modules" %% "scala-parser-combinators" % Version.parserCombinators211
+  } else {
+    "org.scala-lang.modules" %% "scala-parser-combinators" % Version.parserCombinators
+  }
 }
 
 object Dependencies {
   import Library._
 
   val sslConfigCore = Seq(typesafeConfig)
-  val testDependencies213M3 = Library.specs2Scala213M3 ++ Seq(jodaTime, jodaTimeConvert)
-
   val testDependencies = Library.specs2 ++ Seq(jodaTime, jodaTimeConvert)
 }