From 7e3919a71ea683d0966ccc888f636dcefe5a0430 Mon Sep 17 00:00:00 2001 From: Philippus Date: Thu, 13 May 2021 19:23:30 +0200 Subject: [PATCH 1/2] Add scala 3.0.0, dropping 3.0.0-RC2 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d1469b73..fc43bd60 100644 --- 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 From 2464a1925d4c106e63116f08430e4b3e5800e36c Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 13 May 2021 14:07:30 -0700 Subject: [PATCH 2/2] upgrade to scala-collection-compat version with Scala 3.0.0 support --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 01a26cdf..ce5d40f0 100644 --- 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") =>