Skip to content

Commit 75f5255

Browse files
mbuczkoexpez
authored andcommitted
Update orchard version to 0.5.4
1 parent e35af1d commit 75f5255

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

project.clj

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
^:inline-dep [org.clojure/tools.analyzer.jvm "0.7.2"]
1010
^:inline-dep [org.clojure/tools.namespace "0.3.1" :exclusions [org.clojure/tools.reader]]
1111
^:inline-dep [org.clojure/tools.reader "1.3.2"]
12-
^:inline-dep [cider/orchard "0.4.0"]
12+
^:inline-dep [cider/orchard "0.5.4"]
1313
^:inline-dep [cljfmt "0.6.4"]
1414
^:inline-dep [clj-commons/fs "1.5.0"]
1515
^:inline-dep [rewrite-clj "0.6.1"]

src/refactor_nrepl/core.clj

+7-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
[clojure.string :as str]
44
[clojure.tools.namespace.parse :as parse]
55
[clojure.tools.reader.reader-types :as readers]
6-
[orchard.classpath]
6+
[orchard.java.classpath :as cp]
7+
[orchard.misc :as misc]
78
[me.raynes.fs :as fs]
89
[refactor-nrepl.util :refer [normalize-to-unix-path]]
910
[refactor-nrepl.s-expressions :as sexp]
@@ -46,8 +47,11 @@
4647
directory and paths matching :ignore-paths specified in config.
4748
Follows the semantics of orchard classpath."
4849
[]
49-
(->> (orchard.classpath/classpath-directories)
50-
(remove #(-> % str normalize-to-unix-path (.endsWith "target/srcdeps")))))
50+
(->> (cp/classpath)
51+
(remove misc/archive?)
52+
(keep #(let [f (io/file %)]
53+
(when (.isDirectory ^File f) f)))
54+
(remove (comp ignore-dir-on-classpath? str))))
5155

5256
(defn project-root
5357
"Return the project root directory.
@@ -95,7 +99,6 @@
9599
are pruned by this function."
96100
[pred dir]
97101
(->> dir
98-
io/file
99102
file-seq
100103
(filter (every-pred fs/exists?
101104
(complement fs/hidden?)

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

+2-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
;;;; Distributed under the Eclipse Public License, the same as Clojure.
44
(ns refactor-nrepl.ns.slam.hound.search
55
"Search the classpath for vars and classes."
6-
(:require [orchard.classpath]
6+
(:require [orchard.java.classpath :as cp]
77
[clojure.java.io :refer [file]]
88
[clojure.string :as string])
99
(:import
@@ -108,10 +108,7 @@
108108
(StringTokenizer. path-str File/pathSeparator)))
109109

110110
(defn all-classpath-entries []
111-
(into (keep #(System/getProperty %) ["sun.boot.class.path"
112-
"java.ext.dirs"
113-
"java.class.path"])
114-
(map #(.getName %) (orchard.classpath/classpath-jarfiles))))
111+
(mapcat cp/classpath-seq (cp/classpath)))
115112

116113
(defn- get-available-classes []
117114
(into ()

0 commit comments

Comments
 (0)