diff --git a/project.clj b/project.clj index 4c1833d..f031d30 100644 --- a/project.clj +++ b/project.clj @@ -6,16 +6,16 @@ :url "https://github.com/clojure-emacs/refactor-nrepl" :license {:name "Eclipse Public License" :url "https://www.eclipse.org/legal/epl-v10.html"} - :dependencies [[nrepl "1.3.1" :exclusions [org.clojure/clojure]] - ^:inline-dep [http-kit "2.5.0"] - ^:inline-dep [org.clojure/data.json "2.5.0"] - ^:inline-dep [org.clojure/tools.analyzer.jvm "1.3.2"] - ^:inline-dep [org.clojure/tools.namespace "1.5.0" :exclusions [org.clojure/tools.reader]] - ^:inline-dep [org.clojure/tools.reader "1.5.2"] - ^:inline-dep [cider/orchard "0.35.0" :exclusions [org.clojure/clojure]] + :dependencies [[nrepl "1.6.0" :exclusions [org.clojure/clojure]] + ^:inline-dep [http-kit "2.8.1"] + ^:inline-dep [org.clojure/data.json "2.5.2"] + ^:inline-dep [org.clojure/tools.analyzer.jvm "1.3.4"] + ^:inline-dep [org.clojure/tools.namespace "1.5.1" :exclusions [org.clojure/tools.reader]] + ^:inline-dep [org.clojure/tools.reader "1.6.0"] + ^:inline-dep [cider/orchard "0.39.0" :exclusions [org.clojure/clojure]] ^:inline-dep [cljfmt "0.9.2" :exclusions [rewrite-clj rewrite-cljs]] - ^:inline-dep [clj-commons/fs "1.6.310"] - ^:inline-dep [rewrite-clj "1.1.49"] + ^:inline-dep [clj-commons/fs "1.6.312"] + ^:inline-dep [rewrite-clj "1.2.52"] ^:inline-dep [version-clj "2.0.3"]] ; see versions matrix below diff --git a/test/refactor_nrepl/artifacts_test.clj b/test/refactor_nrepl/artifacts_test.clj index 637f4ad..36d84f0 100644 --- a/test/refactor_nrepl/artifacts_test.clj +++ b/test/refactor_nrepl/artifacts_test.clj @@ -22,18 +22,26 @@ "Retries a flaky fn `f`. In our case the flakiness is outside of our control since Maven Central, - Clojars, etc can always have hiccups." + Clojars, etc can always have hiccups. Retries on both exceptions and + empty results." ([f] (retry-flaky f 0)) ([f ^long attempts] - (try - (f) - (catch Exception e - ;; give Maven a break: - (Thread/sleep 18000) - (if (< attempts 7) - (retry-flaky f (inc attempts)) - (throw e)))))) + (let [result (try + (f) + (catch Exception e + (if (< attempts 7) + ::retry + (throw e))))] + (if (or (= result ::retry) + (and (coll? result) (empty? result))) + (do + ;; give Maven a break: + (Thread/sleep 18000) + (if (< attempts 7) + (retry-flaky f (inc attempts)) + result)) + result)))) (deftest get-mvn-artifacts!-test (is (> (count (retry-flaky (fn [] diff --git a/test/refactor_nrepl/ns/class_search_test.clj b/test/refactor_nrepl/ns/class_search_test.clj index eb49108..2a76a49 100644 --- a/test/refactor_nrepl/ns/class_search_test.clj +++ b/test/refactor_nrepl/ns/class_search_test.clj @@ -33,6 +33,7 @@ "org.apache.commons.compress.harmony.pack200.Segment can not implement" "javax/xml/bind/ModuleUtil (wrong name: META-INF/versions/9/javax/xml/bind/ModuleUtil)" "META-INF/versions/9/javax/xml/bind/ModuleUtil (wrong name: javax/xml/bind/ModuleUtil)" + "META-INF/versions/9/module-info" ;; Stuff brought in by the `leiningen-core` dependency: "com/google/inject" "org/osgi"