From a8bcea6fbe2dbc6201d3f8d2a4dddd620bb8c2b9 Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Sat, 19 Dec 2020 16:04:53 -0800
Subject: [PATCH 1/2] add Scala 3.0.0-M3 (drop M2)

---
 .travis.yml | 2 +-
 build.sbt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a84fbe65..ff851a6a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ import: scala/scala-dev:travis/default.yml
 language: scala
 
 scala:
-  - 3.0.0-M2
+  - 3.0.0-M3
   - 2.11.12
   - 2.12.12
   - 2.13.4
diff --git a/build.sbt b/build.sbt
index d4518e28..2f40f5d6 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.3.1" % Test,
+    libraryDependencies += "org.scala-lang.modules" %% "scala-collection-compat" % "2.3.2" % Test,
 
     apiMappings ++= scalaInstance.value.libraryJars.collect {
       case file if file.getName.startsWith("scala-library") && file.getName.endsWith(".jar") =>

From 58eb05d1690d9054d5edc99d4aaf2826f29c40a7 Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Sat, 19 Dec 2020 16:44:30 -0800
Subject: [PATCH 2/2] set dummy environment variable to work around Travis-CI
 cache issue

see #335 for details. at some point we should be able to remove this
---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ff851a6a..c2b3e2cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,9 +11,9 @@ scala:
   - 2.13.4
 
 env:
-  - ADOPTOPENJDK=8     SCALAJS_VERSION=
-  - ADOPTOPENJDK=8     SCALAJS_VERSION=1.3.1
-  - ADOPTOPENJDK=11    SCALAJS_VERSION=
+  - ADOPTOPENJDK=8     SCALAJS_VERSION=       CACHE_WORKAROUND=see-PR-335
+  - ADOPTOPENJDK=8     SCALAJS_VERSION=1.3.1  CACHE_WORKAROUND=see-PR-335
+  - ADOPTOPENJDK=11    SCALAJS_VERSION=       CACHE_WORKAROUND=see-PR-335
 
 matrix:
   include: