Merge pull request #223 from SevereOverfl0w/java10

Use orchard for classpath information

Author: expez

project.clj

@@ -10,7 +10,7 @@
                  ^:source-dep [org.clojure/tools.analyzer.jvm "0.7.1"]
                  ^:source-dep [org.clojure/tools.namespace  "0.3.0-alpha3"]
                  ^:source-dep [org.clojure/tools.reader "1.1.1"]
-                 ^:source-dep [org.clojure/java.classpath "0.2.3"]
+                 ^:source-dep [cider/orchard "0.2.0"]
                  ^:source-dep [lein-cljfmt "0.3.0"]
                  ^:source-dep [me.raynes/fs "1.4.6"]
                  ^:source-dep [rewrite-clj "0.6.0"]

src/refactor_nrepl/core.clj

@@ -1,9 +1,9 @@
 (ns refactor-nrepl.core
-  (:require [clojure.java.classpath :as cp]
-            [clojure.java.io :as io]
+  (:require [clojure.java.io :as io]
             [clojure.string :as str]
             [clojure.tools.namespace.parse :as parse]
             [clojure.tools.reader.reader-types :as readers]
+            [orchard.classpath]
             [me.raynes.fs :as fs]
             [refactor-nrepl.util :refer [normalize-to-unix-path]]
             [refactor-nrepl.s-expressions :as sexp]
@@ -41,22 +41,13 @@
               false
               (:ignore-paths config/*config*))))
 
-(defn boot-project? []
-  ;; fake.class.path under boot contains the original directories with source
-  ;; files, see https://github.com/boot-clj/boot/issues/249
-  (not (nil? (System/getProperty "fake.class.path"))))
-
 (defn dirs-on-classpath
   "Return all dirs on classpath, filtering out our inlined deps
   directory and paths matching :ignore-paths specified in config.
-  For boot it considers `fake.class.path` rather than real classpath."
+  Follows the semantics of orchard classpath."
   []
-  (let [files-on-cp (if (boot-project?)
-                      (map io/file (str/split (System/getProperty "fake.class.path") #":"))
-                      (cp/classpath))]
-    (->> files-on-cp
-         (filter fs/directory?)
-         (remove #(-> % str normalize-to-unix-path ignore-dir-on-classpath?)))))
+  (->> (orchard.classpath/classpath-directories)
+       (remove #(-> % str normalize-to-unix-path (.endsWith "target/srcdeps")))))
 
 (defn project-root
   "Return the project root directory.

src/refactor_nrepl/ns/slam/hound/search.clj

@@ -3,7 +3,7 @@
 ;;;; Distributed under the Eclipse Public License, the same as Clojure.
 (ns refactor-nrepl.ns.slam.hound.search
   "Search the classpath for vars and classes."
-  (:require [clojure.java.classpath :as cp]
+  (:require [orchard.classpath]
             [clojure.java.io :refer [file]]
             [clojure.string :as string])
   (:import
@@ -111,7 +111,7 @@
   (into (map #(System/getProperty %) ["sun.boot.class.path"
                                       "java.ext.dirs"
                                       "java.class.path"])
-        (map #(.getName %) (cp/classpath-jarfiles))))
+        (map #(.getName %) (orchard.classpath/classpath-jarfiles))))
 
 (defn- get-available-classes []
   (into ()