Scala 2.13.0-RC1 (playframework#213)

Backport won't be clean since here we are removing Scala 2.11 and we should keep it in branch 1.4.x. (cherry picked from commit d81deb6)
dwijnand · Apr 8, 2019 · ece85cf · ece85cf
1 parent f9cbcd6
commit ece85cf
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -27,6 +27,7 @@ scala:
   - 2.12.8
   - 2.11.12
   - 2.10.7
+  - 2.13.0-RC1
 
 script:
   - sbt "+++ $TRAVIS_SCALA_VERSION test"

diff --git a/build.sbt b/build.sbt
@@ -11,7 +11,7 @@ val binaryCompatibilitySettings = Seq(
 
 val commonSettings = Seq(
   scalaVersion := scala210,
-  crossScalaVersions := Seq(scalaVersion.value, scala211, scala212, scala213, "2.13.0-M3")
+  crossScalaVersions := Seq(scala210, "2.11.12", scala212, scala213)
 )
 
 lazy val twirl = project
@@ -77,6 +77,7 @@ lazy val plugin = project
     .settings(
       name := "sbt-twirl",
       organization := "com.typesafe.sbt",
+      scalaVersion := scala212,
       libraryDependencies += "org.scalatest" %%% "scalatest" % scalatest(scalaVersion.value) % "test",
       resourceGenerators in Compile += generateVersionFile.taskValue,
       scriptedDependencies := {
@@ -108,27 +109,22 @@ def generateVersionFile = Def.task {
 // Dependencies
 
 def scalatest(scalaV: String): String = scalaV match {
-  case "2.13.0-M3" => "3.0.5-M1"
-  case "2.13.0-M4" => "3.0.6-SNAP2"
-  case _ => "3.0.6-SNAP4"
+  case _ => "3.0.8-RC2"
 }
 
 def scalaCompiler(version: String) = "org.scala-lang" % "scala-compiler" % version
 
 def scalaParserCombinators(scalaVersion: String): Seq[ModuleID] = scalaVersion match {
   case interplay.ScalaVersions.scala210 => Seq.empty
-  case "2.13.0-M3" => Seq(
-    "org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.0" % "optional"
-  )
   case _ => Seq(
-    "org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.1" % "optional"
+    "org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.2" % "optional"
   )
 }
 
 def scalaXml = Def.setting {
   CrossVersion.partialVersion(scalaVersion.value) match {
     case Some((x, y)) if x > 2 || (x == 2 && y >= 11) =>
-      Seq("org.scala-lang.modules" %%% "scala-xml" % "1.1.0")
+      Seq("org.scala-lang.modules" %%% "scala-xml" % "1.2.0")
     case _ =>
       Seq.empty
   }

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,10 +1,10 @@
-addSbtPlugin("com.typesafe.play" % "interplay" % sys.props.get("interplay.version").getOrElse("2.0.5"))
+addSbtPlugin("com.typesafe.play" % "interplay" % sys.props.get("interplay.version").getOrElse("2.0.6"))
 
 // For the Cross Build
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.25")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.27")
 
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0")
 
 addSbtPlugin("com.eed3si9n" % "sbt-doge" % "0.1.5")
 
-addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.3.0")
+addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.3.0")
diff --git a/sbt-twirl/src/sbt-test/twirl/scalajs-compile/project/plugins.sbt b/sbt-twirl/src/sbt-test/twirl/scalajs-compile/project/plugins.sbt
@@ -1,3 +1,3 @@
 addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % sys.props("project.version"))
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.24")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.27")
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,7 @@ scala: @@
       - 2.12.8
       - 2.11.12
       - 2.10.7
+      - 2.13.0-RC1
     script:
       - sbt "+++ $TRAVIS_SCALA_VERSION test"
@@ Expand Down @@