Skip to content

Commit 7f4d4e4

Browse files
committed
libs tests: minor cleanup
Found a couple of spots where generic deps patchers could be used.
1 parent b45c0ff commit 7f4d4e4

File tree

1 file changed

+3
-14
lines changed

1 file changed

+3
-14
lines changed

script/test_libs.clj

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -160,22 +160,11 @@
160160
:additions [['org.clojure/tools.reader "1.3.6"]
161161
['rewrite-clj rewrite-clj-version]]}))
162162

163-
;;
164-
;; clojure-lsp
165-
;;
166-
(defn- clojure-lsp-patch [{:keys [home-dir rewrite-clj-version]}]
167-
(patch-deps {:filename (str (fs/file home-dir "deps.edn"))
168-
:removals #{'rewrite-clj/rewrite-clj}
169-
:additions [['rewrite-clj/rewrite-clj {:mvn/version rewrite-clj-version}]]}))
170-
171-
172163
;;
173164
;; depot
174165
;;
175-
(defn depot-patch [{:keys [home-dir rewrite-clj-version]}]
176-
(patch-deps {:filename (str (fs/file home-dir "deps.edn"))
177-
:removals #{'rewrite-clj/rewrite-clj}
178-
:additions [['rewrite-clj/rewrite-clj {:mvn/version rewrite-clj-version}]]})
166+
(defn depot-patch [{:keys [home-dir] :as lib}]
167+
(deps-edn-v1-patch lib)
179168
(status/line :detail "=> depot uses but does not require rewrite-clj.node, need to adjust for rewrite-clj v1")
180169
(replace-in-file (str (fs/file home-dir "src/depot/zip.clj"))
181170
"[rewrite-clj.zip :as rzip]"
@@ -293,7 +282,7 @@
293282
:platforms [:clj]
294283
:version "2021.11.16-16.52.14"
295284
:github-release {:repo "clojure-lsp/clojure-lsp"}
296-
:patch-fn clojure-lsp-patch
285+
:patch-fn deps-edn-v1-patch
297286
:show-deps-fn cli-deps-tree
298287
:test-cmds ["make test"]}
299288
{:name "depot"

0 commit comments

Comments
 (0)