From 46768519e733ab83f49178d824a5f0be10760d81 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 6 Nov 2017 19:11:45 -0800
Subject: [PATCH] Fix jdk 9 build.

---
 .circleci/config.yml | 57 ++++++++++++++++++++++++++++++--------------
 1 file changed, 39 insertions(+), 18 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2070e3e..c07915b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,5 @@
 defaults: &defaults
   working_directory: ~/repo
-  docker:
-    - image: circleci/openjdk:8-jdk
   environment:
     JVM_OPTS: -Xmx3200m
     TERM: dumb
@@ -9,17 +7,13 @@ defaults: &defaults
 version: 2.0
 
 jobs:
-  jdk8:
-    docker:
-      - image: circleci/openjdk:8-jdk
-
-  jdk9:
-    docker:
-      - image: circleci/openjdk:9-jdk
 
   build_gradle:
     <<: *defaults
 
+    docker:
+      - image: circleci/openjdk:8-jdk
+
     steps:
       - checkout
       - restore_cache:
@@ -49,6 +43,9 @@ jobs:
   build_kobalt:
     <<: *defaults
 
+    docker:
+      - image: circleci/openjdk:8-jdk
+
     steps:
       - checkout
       - restore_cache:
@@ -75,18 +72,42 @@ jobs:
       - store_test_results:
           path: kobaltBuild/test-output/
 
+  build_gradle_jdk9:
+    <<: *defaults
+
+    docker:
+      - image: circleci/openjdk:9-jdk
+
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+          - gradle-dependencies-{{ checksum "build.gradle" }}
+          # 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" }}
+
+      - run:
+          name: Run All Checks
+          command: ./gradlew check
+
+      - store_artifacts:
+          path: build/reports/
+          destination: reports
+      - store_test_results:
+          path: build/reports/
+
 workflows:
   version: 2
   build_jdk8:
     jobs:
       - build_gradle
-          requires:
-            - jdk8
       - build_kobalt
-          requires:
-            - jdk8
-  build_jdk9:
-    jobs:
-      - build_gradle
-          requires:
-            - jdk9
\ No newline at end of file
+      - build_gradle_jdk9
\ No newline at end of file