From a81711ad29171c4b0189cb6b41f005f73e2665ad Mon Sep 17 00:00:00 2001 From: Philippus Baalman Date: Wed, 17 Feb 2021 02:25:30 +0100 Subject: [PATCH] Update scala to 3.0.0-RC1 (#357) --- .travis.yml | 2 +- build.sbt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5712658a..6853b537 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ import: scala/scala-dev:travis/default.yml language: scala scala: - - 3.0.0-M3 + - 3.0.0-RC1 - 2.11.12 - 2.12.13 - 2.13.4 diff --git a/build.sbt b/build.sbt index 8887cdfc..d0e210e8 100644 --- a/build.sbt +++ b/build.sbt @@ -15,7 +15,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.1" % Test, + libraryDependencies += "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.2" % Test, apiMappings ++= scalaInstance.value.libraryJars.collect { case file if file.getName.startsWith("scala-library") && file.getName.endsWith(".jar") => @@ -43,7 +43,7 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor }), Compile / doc / scalacOptions ++= { if (isDotty.value) - Seq() // TODO see what flags might be desirable to pass to Scala3doc + Seq() // TODO see what flags might be desirable to pass to Scala 3's Scaladoc else Seq( "-diagrams",