From 9a9a2941aacdd74d22adeabebe3bc3f312774660 Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Thu, 15 Jul 2021 14:40:01 -0400
Subject: [PATCH 1/5] add JDK 17 to CI

note that we allow tests to fail on Scala 2.11 / JDK 17
---
 .travis.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 42f51eb..f640822 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,14 @@ scala:
 env:
   - ADOPTOPENJDK=8
   - ADOPTOPENJDK=11
+  - ADOPTOPENJDK=17
+
+# because it hits scala/bug#12419 which will almost certainly
+# never be fixed in the 2.11.x series
+jobs:
+  exclude:
+    - scala: 2.11.12
+      env: ADOPTOPENJDK=17
 
 install:
   - git fetch --tags # get all tags for sbt-dynver

From bfc9b126e440232fa300f43a8a6b4b19c056a121 Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Thu, 15 Jul 2021 14:40:18 -0400
Subject: [PATCH 2/5] drop Scala 3.0.0-RC3 from crossbuild

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f640822..929066a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,6 @@ language: scala
 
 scala:
   - 3.0.0
-  - 3.0.0-RC3
   - 2.11.12
   - 2.12.14
   - 2.13.5

From 2d76f3b2db6af3fd9a7d30643f04313f0dce7f8c Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Thu, 15 Jul 2021 14:40:37 -0400
Subject: [PATCH 3/5] Scala 2.13.6 (was 2.13.5)

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 929066a..49605c6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ scala:
   - 3.0.0
   - 2.11.12
   - 2.12.14
-  - 2.13.5
+  - 2.13.6
 
 env:
   - ADOPTOPENJDK=8

From 03a90e6bea4a4076d64f4320bb1eece6ef31a482 Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Thu, 15 Jul 2021 15:09:05 -0400
Subject: [PATCH 4/5] DO NOT MERGE - use 2.12 nightly for testing

---
 .travis.yml | 2 +-
 build.sbt   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 49605c6..872909a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ language: scala
 scala:
   - 3.0.0
   - 2.11.12
-  - 2.12.14
+  - 2.12.15-bin-92c21f2
   - 2.13.6
 
 env:
diff --git a/build.sbt b/build.sbt
index 5ae4b8c..8d3cbcb 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,3 +1,6 @@
+ThisBuild / resolvers += "scala-integration" at
+  "https://scala-ci.typesafe.com/artifactory/scala-integration/"
+
 val disableDocs =
   sys.props("nodocs") == "true" ||
     // on jdk 11 https://github.com/scala/scala-java8-compat/issues/160, seems to fail the build (not on 8)

From 95adac24088c9ef3bb370d86f9afbd33eb12e9bf Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Tue, 14 Sep 2021 13:20:56 -0700
Subject: [PATCH 5/5] wip

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 872909a..c12ec4e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,9 @@ import: scala/scala-dev:travis/default.yml
 language: scala
 
 scala:
-  - 3.0.0
+  - 3.0.2
   - 2.11.12
-  - 2.12.15-bin-92c21f2
+  - 2.12.15
   - 2.13.6
 
 env: