From 4b9150ee29adc9fd79586de170c464670dc6752f Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Fri, 25 Jun 2021 14:11:01 -0700
Subject: [PATCH] add JDK 17 to CI (& drop 3.0.0-RC3 & upgrade to 2.12.14)

empty .jvmopts is to work around dwijnand/sbt-extras#326
---
 .jvmopts                        |  0
 .travis.yml                     | 15 ++-------------
 project/MultiScalaProject.scala |  2 +-
 3 files changed, 3 insertions(+), 14 deletions(-)
 create mode 100644 .jvmopts

diff --git a/.jvmopts b/.jvmopts
new file mode 100644
index 00000000..e69de29b
diff --git a/.travis.yml b/.travis.yml
index dc6de108..ea2016d2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,9 +6,8 @@ language: scala
 
 scala:
   - 2.11.12
-  - 2.12.13
+  - 2.12.14
   - 2.13.6
-  - 3.0.0-RC3
   - 3.0.0
 
 env:
@@ -16,8 +15,7 @@ env:
   - SCALAJS_VERSION=1.5.1     ADOPTOPENJDK=8
   - SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=8
   - SCALAJS_VERSION=          ADOPTOPENJDK=11
-  - SCALAJS_VERSION=1.5.1     ADOPTOPENJDK=11
-  - SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=11
+  - SCALAJS_VERSION=          ADOPTOPENJDK=17
 
 matrix:
 
@@ -39,18 +37,9 @@ matrix:
 
     # Scala Native doesn't support Scala 3 yet
 
-    - scala: 3.0.0-RC3
-      env: SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=8
-
-    - scala: 3.0.0-RC3
-      env: SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=11
-
     - scala: 3.0.0
       env: SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=8
 
-    - scala: 3.0.0
-      env: SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=11
-
 install:
   - git fetch --tags # get all tags for sbt-dynver
 
diff --git a/project/MultiScalaProject.scala b/project/MultiScalaProject.scala
index 83bbb930..7710231d 100644
--- a/project/MultiScalaProject.scala
+++ b/project/MultiScalaProject.scala
@@ -23,7 +23,7 @@ import java.io.File
  *
  * // instanciate a sbt project
  * lazy val myProject211 = myProject("2.11.12", _.settings(...) /* scala version dependent configurations */)
- * lazy val myProject212 = myProject("2.12.13" , _.settings(...))
+ * lazy val myProject212 = myProject("2.12.14" , _.settings(...))
  * // ...
  * }}}
  */