Upgrade Eastwood

Author: vemv

.circleci/config.yml

@@ -89,9 +89,12 @@ jobs:
       Running utility commands/checks (linter etc.)
       Always uses Java11 and Clojure 1.10
     parameters:
+      jdk_version:
+        description: Version of JDK to test against
+        type: string
       steps:
         type: steps
-    executor: openjdk11
+    executor: << parameters.jdk_version >>
     environment:
       VERSION: "1.10"
     steps:
@@ -191,7 +194,16 @@ workflows:
           clojure_version: "master"
           jdk_version: openjdk15
       - util_job:
-          name: Code Linting
+          name: Code Linting, JDK8 (Eastwood only)
+          jdk_version: openjdk8
+          steps:
+            - run:
+                name: Running Eastwood
+                command: |
+                  make eastwood
+      - util_job:
+          name: Code Linting, (latest LTS JDK)
+          jdk_version: openjdk11
           steps:
             - run:
                 name: Running Eastwood

Makefile

@@ -13,12 +13,8 @@ test:
 test-watch: test-resources/clojuredocs/export.edn
 	lein with-profile +$(VERSION),$(TEST_PROFILES) test-refresh
 
-# Eastwood can't handle orchard.java.legacy-parser at the moment, because
-# tools.jar isn't in the classpath when Eastwood runs.
-
 eastwood:
-	lein with-profile +$(VERSION),+eastwood,$(TEST_PROFILES) eastwood \
-	     "{:exclude-namespaces [orchard.java.legacy-parser]}"
+	lein with-profile +$(VERSION),+eastwood,$(TEST_PROFILES) eastwood
 
 cljfmt:
 	lein with-profile +$(VERSION),+cljfmt cljfmt check

eastwood.clj

@@ -57,5 +57,9 @@
                                          merge-meta [[:inner 0]]
                                          letfn [[:block 1] [:inner 2]]}}}
 
-             :eastwood {:plugins [[jonase/eastwood "0.3.4"]]
-                        :eastwood {:config-files ["eastwood.clj"]}}})
+             :eastwood  {:plugins  [[jonase/eastwood "0.4.0"]]
+                         :eastwood {:exclude-namespaces [~(if (-> "java.version"
+                                                                  System/getProperty
+                                                                  (.contains "1.8."))
+                                                            'orchard.java.parser
+                                                            'orchard.java.legacy-parser)]}}})