From 026456218e9a49a0f90b2fa38375362056844818 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 21 Mar 2021 18:27:31 -0700
Subject: [PATCH] Added jdk14 to CIs.

---
 .circleci/config.yml | 64 +++++++++++++++++++++++++-------------------
 .travis.yml          | 20 +++++---------
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 21a1bf0..d21cbc7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,43 +4,51 @@ defaults: &defaults
   environment:
     JVM_OPTS: -Xmx3200m
     TERM: dumb
+    CI: true
+
+defaults_gradle: &defaults_gradle
+  steps:
+    - checkout
+    - restore_cache:
+        keys:
+          - gradle-dependencies-{{ checksum "build.gradle.kts" }}
+          # fallback to using the latest cache if no exact match is found
+          - gradle-dependencies-
+    - run:
+        name: Gradle Dependencies
+        command: ./gradlew dependencies
+    - save_cache:
+        paths: ~/.m2
+        key: gradle-dependencies-{{ checksum "build.gradle.kts" }}
+    - run:
+        name: Run All Checks
+        command: ./gradlew check
+    - store_artifacts:
+        path: build/reports/
+        destination: reports
+    - store_test_results:
+        path: build/reports/
 
 jobs:
+  build_gradle_jdk14:
+    <<: *defaults
 
-  build_gradle:
+    docker:
+      - image: openjdk:14-jdk
+
+    <<: *defaults_gradle
+
+  build_gradle_jdk8:
     <<: *defaults
 
     docker:
       - image: circleci/openjdk:8-jdk
 
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-          - gradle-dependencies-{{ checksum "build.gradle.kts" }}
-          # fallback to using the latest cache if no exact match is found
-          - gradle-dependencies-
-
-      - run:
-          name: Gradle Dependencies
-          command: ./gradlew dependencies
-
-      - save_cache:
-          paths: ~/.m2
-          key: gradle-dependencies-{{ checksum "build.gradle.kts" }}
-
-      - run:
-          name: Run All Checks
-          command: ./gradlew check
-
-      - store_artifacts:
-          path: build/reports/
-          destination: reports
-      - store_test_results:
-          path: build/reports/
+    <<: *defaults_gradle
 
 workflows:
   version: 2
   gradle:
-    jobs:
-      - build_gradle
+        jobs:
+        - build_gradle_jdk8
+        - build_gradle_jdk14
diff --git a/.travis.yml b/.travis.yml
index 36134ea..48c5805 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,30 +5,22 @@ env:
   global:
     - CI=true
 
-jdk:
-  - oraclejdk8
+#install:
+#  - git fetch --unshallow --tags
 
 addons:
   sonarcloud:
     organization: "ethauvin-github"
 
-before_cache:
-  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
-  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+jdk:
+  - oraclejdk8
+  - openjdk14
 
 before_install:
   - chmod +x gradlew
 
-script:
-  - ./gradlew check
-
-cache:
-  directories:
-    - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/
-
 after_success:
   - |
-      if [ "${TRAVIS_TEST_RESULT}" == 0 ]; then
+      if [ "${TRAVIS_TEST_RESULT}" == 0 ] && [ "$TRAVIS_JDK_VERSION" == "openjdk14" ]; then
         ./gradlew sonarqube
       fi