Merge pull request #385 from Philippus/update/scala-3.0.0

scala · May 13, 2021 · eb606c5 · eb606c5
2 parents a1606f6 + 2464a19
commit eb606c5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,8 +5,8 @@ import: scala/scala-dev:travis/default.yml
 language: scala
 
 scala:
+  - 3.0.0
   - 3.0.0-RC3
-  - 3.0.0-RC2
   - 2.11.12
   - 2.12.13
   - 2.13.5

diff --git a/build.sbt b/build.sbt
@@ -21,7 +21,7 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor
     libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test,
     // so we can `@nowarn` in test code, but only in test code, so the dependency
     // doesn't leak downstream
-    libraryDependencies += "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.3" % Test,
+    libraryDependencies += "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.4" % Test,
 
     apiMappings ++= scalaInstance.value.libraryJars.collect {
       case file if file.getName.startsWith("scala-library") && file.getName.endsWith(".jar") =>
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,8 +5,8 @@ import: scala/scala-dev:travis/default.yml @@
     language: scala
     scala:
+      - 3.0.0
       - 3.0.0-RC3
-      - 3.0.0-RC2
       - 2.11.12
       - 2.12.13
       - 2.13.5
@@ Expand Down @@