Upgrade deps again

miikka · Aug 22, 2020 · f2ec986 · f2ec986
1 parent 1d0a73d
commit f2ec986
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/deps.edn b/deps.edn
@@ -1,4 +1,4 @@
-{:deps {nvd-clojure/nvd-clojure      {:mvn/version "1.4.0"}
+{:deps {nvd-clojure/nvd-clojure      {:mvn/version "1.4.1"}
         metosin/jsonista             {:mvn/version "0.2.6"}
         org.clojure/tools.cli        {:mvn/version "1.0.194"}
-        org.clojure/tools.deps.alpha {:mvn/version "0.8.709"}}}
+        org.clojure/tools.deps.alpha {:mvn/version "0.9.763"}}}
diff --git a/src/clj_nvd/core.clj b/src/clj_nvd/core.clj
@@ -1,16 +1,17 @@
 (ns clj-nvd.core
-  (:require [clojure.java.io :as io]
-            [clojure.string :as string]
+  (:require [clojure.string :as string]
             [clojure.tools.cli :as cli]
             [clojure.tools.deps.alpha :as deps]
-            [clojure.tools.deps.alpha.reader :as deps.reader]
             [jsonista.core :as json]
             [nvd.task.check]
             [nvd.task.purge-database]
             [nvd.task.update-database]))
 
+(defn read-deps []
+  (deps/merge-edns ((juxt :root-edn :user-edn :project-edn) (deps/find-edn-maps))))
+
 (defn make-classpath [aliases]
-  (let [deps-map (deps.reader/read-deps (deps.reader/default-deps))
+  (let [deps-map (read-deps)
         args-map (deps/combine-aliases deps-map aliases)
         lib-map  (deps/resolve-deps deps-map args-map)]
     (mapcat :paths (vals lib-map))))