Skip to content

Commit a518aaf

Browse files
rrudakovbbatsov
authored andcommitted
Fix code after updating dependencies
1 parent ffa7f49 commit a518aaf

File tree

3 files changed

+20
-14
lines changed

3 files changed

+20
-14
lines changed

project.clj

+13-9
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
:url "https://github.com/clojure-emacs/refactor-nrepl"
77
:license {:name "Eclipse Public License"
88
:url "https://www.eclipse.org/legal/epl-v10.html"}
9-
:dependencies [[nrepl "1.0.0"]
9+
:dependencies [[nrepl "1.3.1" :exclusions [org.clojure/clojure]]
1010
^:inline-dep [compliment "0.7.0"]
1111
^:inline-dep [http-kit "2.5.0"]
1212
^:inline-dep [org.clojure/data.json "2.5.0"]
1313
^:inline-dep [org.clojure/tools.analyzer.jvm "1.3.2"]
1414
^:inline-dep [org.clojure/tools.namespace "1.5.0" :exclusions [org.clojure/tools.reader]]
1515
^:inline-dep [org.clojure/tools.reader "1.5.2"]
16-
^:inline-dep [cider/orchard "0.34.3"]
16+
^:inline-dep [cider/orchard "0.34.3" :exclusions [org.clojure/clojure]]
1717
^:inline-dep [cljfmt "0.9.2" :exclusions [rewrite-clj rewrite-cljs]]
1818
^:inline-dep [clj-commons/fs "1.6.310"]
19-
^:inline-dep [rewrite-clj "1.1.47"]
20-
^:inline-dep [version-clj "2.0.2"]]
21-
:exclusions [org.clojure/clojure] ; see versions matrix below
19+
^:inline-dep [rewrite-clj "1.1.49"]
20+
^:inline-dep [version-clj "2.0.3"]]
21+
; see versions matrix below
2222

2323
:pedantic? ~(if (System/getenv "CI")
2424
:abort
@@ -34,8 +34,8 @@
3434
:unresolved-tree false}
3535
:filespecs [{:type :bytes :path "refactor-nrepl/refactor-nrepl/project.clj" :bytes ~(slurp "project.clj")}]
3636
:profiles {;; Clojure versions matrix
37-
:provided {:dependencies [[cider/cider-nrepl "0.44.0"]
38-
[org.clojure/clojure "1.11.1"]
37+
:provided {:dependencies [[cider/cider-nrepl "0.55.7"]
38+
[org.clojure/clojure "1.12.0"]
3939
;; For satisfying `:pedantic?`:
4040
[com.google.code.findbugs/jsr305 "3.0.2"]
4141
[com.google.errorprone/error_prone_annotations "2.20.0"]]}
@@ -47,10 +47,14 @@
4747
:dependencies [[org.clojure/clojure "1.12.0-master-SNAPSHOT"]
4848
[org.clojure/clojure "1.12.0-master-SNAPSHOT" :classifier "sources"]]}
4949
:dev {}
50-
:test {:dependencies [[cider/piggieback "0.5.3"]
50+
:test {:dependencies [[cider/piggieback "0.6.0"]
5151
[org.clojure/clojurescript "1.11.60"]
5252
[org.clojure/core.async "1.6.673" :exclusions [org.clojure/clojure org.clojure/tools.reader]]
53-
[commons-io/commons-io "2.13.0"]]
53+
[commons-io/commons-io "2.13.0"]
54+
[leiningen-core "2.11.2"
55+
:exclusions [org.clojure/clojure
56+
commons-codec
57+
com.google.code.findbugs/jsr305]]]
5458
:repl-options {:nrepl-middleware [cider.piggieback/wrap-cljs-repl]}
5559
:jvm-opts ["-Dorchard.use-dynapath=false"]
5660
:resource-paths ["test-resources"

src/refactor_nrepl/ns/class_search.clj

+1-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010
(java.io File)))
1111

1212
(defn- get-available-classes []
13-
(let [classes (->> (dissoc (compliment.utils/classes-on-classpath)
14-
"")
15-
(vals)
16-
(reduce into))]
13+
(let [classes (compliment.utils/classes-on-classpath)]
1714
(into []
1815
(comp (keep (fn [s]
1916
;; https://github.com/alexander-yakushev/compliment/issues/105

test/refactor_nrepl/ns/class_search_test.clj

+6-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,12 @@
3131
;; Odd stuff brought in by the `fs` dependency:
3232
"Implementing class"
3333
"org.apache.commons.compress.harmony.pack200.Segment can not implement"
34-
"javax/xml/bind/ModuleUtil (wrong name: META-INF/versions/9/javax/xml/bind/ModuleUtil)"])
34+
"javax/xml/bind/ModuleUtil (wrong name: META-INF/versions/9/javax/xml/bind/ModuleUtil)"
35+
"META-INF/versions/9/javax/xml/bind/ModuleUtil (wrong name: javax/xml/bind/ModuleUtil)"
36+
;; Stuff brought in by the `leiningen-core` dependency:
37+
"com/google/inject"
38+
"org/osgi"
39+
"org/codehaus/plexus"])
3540
(do
3641
(.printStackTrace e)
3742
false))

0 commit comments

Comments
 (0)