Merge pull request scala#287 from Philippus/update/dotty-0.25.0-RC2

SethTisue · web-flow · commit cfeb61007133 · 2020-06-28T21:40:35.000-07:00
Update dotty 0.25.0-RC1 to 0.25.0-RC2
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ import: scala/scala-dev:travis/default.yml
 language: scala
 
 scala:
-  - 0.25.0-RC1
+  - 0.25.0-RC2
   - 2.11.12
   - 2.12.11
   - 2.13.2
@@ -17,7 +17,7 @@ env:
 
 matrix:
   exclude:
-    - scala: 0.25.0-RC1
+    - scala: 0.25.0-RC2
       env: ADOPTOPENJDK=8     SCALAJS_VERSION=1.1.0
   include:
     - scala: 2.11.12
diff --git a/build.sbt b/build.sbt
@@ -45,7 +45,7 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor
     libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test
   )
   .jsSettings(
-    crossScalaVersions -= "0.25.0-RC1",
+    crossScalaVersions -= "0.25.0-RC2",
     // Scala.js cannot run forked tests
     fork in Test := false
   )

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor`
`45`	`45`	`libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test`
`46`	`46`	`)`
`47`	`47`	`.jsSettings(`
`48`		`- crossScalaVersions -= "0.25.0-RC1",`
	`48`	`+ crossScalaVersions -= "0.25.0-RC2",`
`49`	`49`	`// Scala.js cannot run forked tests`
`50`	`50`	`fork in Test := false`
`51`	`51`	`)`