Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Calculate classpath using tools.deps and provide nvd-clojure as a regular -X function? #166

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
View how tools.deps alters the classpath
ivarref committed Sep 8, 2023
commit b7f8e943184b2982bb2d719219c756c3d2bec482
51 changes: 51 additions & 0 deletions test/nvd/tools_deps_conflict_test.clj
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
(ns nvd.tools-deps-conflict-test
(:require [clojure.set :as set]
[clojure.test :as t]
[clojure.tools.deps :as deps]
[clojure.edn :as edn]
[clojure.tools.deps.util.session :as session]))

(defn get-libs
[deps]
(let [master-edn (merge {:mvn/repos {"central" {:url "https://repo1.maven.org/maven2/"}, "clojars" {:url "https://repo.clojars.org/"}}}
{:deps deps})
combined-aliases (deps/combine-aliases master-edn [])
basis (session/with-session
(deps/calc-basis master-edn {:resolve-args (merge combined-aliases {:trace true})
:classpath-args combined-aliases}))
libs (:libs basis)]
(into (sorted-map) libs)))

(defn show-diff [lib]
(let [base-deps (-> (edn/read-string (slurp "deps.edn"))
:deps)
new-dep (get-libs {lib (get base-deps lib)})
base-deps (get-libs (dissoc base-deps lib))
td-set (into #{} (keys new-dep))
base-set (into #{} (keys base-deps))]
(doseq [shared-lib (into (sorted-set) (set/intersection td-set base-set))]
(when-not (= (get-in new-dep [shared-lib :mvn/version])
(get-in base-deps [shared-lib :mvn/version]))
(println shared-lib
"deps.edn:" (get-in base-deps [shared-lib :mvn/version])
"vs"
(str lib ":") (get-in new-dep [shared-lib :mvn/version]))))))

(comment
(show-diff 'org.clojure/tools.deps))

(t/deftest tools-deps-conflict-test
(let [td-deps (get-libs {'org.clojure/tools.deps {:mvn/version "0.18.1354"}})
base-deps (get-libs (-> (edn/read-string (slurp "deps.edn"))
:deps
(dissoc 'org.clojure/tools.deps)))
td-set (into #{} (keys td-deps))
base-set (into #{} (keys base-deps))]
(doseq [shared-lib (into (sorted-set) (set/intersection td-set base-set))]
(when-not (= (get-in td-deps [shared-lib :mvn/version])
(get-in base-deps [shared-lib :mvn/version]))
(println shared-lib
(get-in base-deps [shared-lib :mvn/version])
"vs"
(get-in td-deps [shared-lib :mvn/version]))))))