Don't remove core specs when they are in deps map

This commit is contained in:
Michiel Borkent 2021-12-08 17:20:05 +01:00
parent 8b3e89fbcc
commit f5fd11fd78

View file

@ -60,6 +60,7 @@
(when-let [paths (:paths deps-map)] (when-let [paths (:paths deps-map)]
(cp/add-classpath (str/join cp/path-sep paths))) (cp/add-classpath (str/join cp/path-sep paths)))
(when-let [deps-map (not-empty (dissoc deps-map :paths :tasks :raw :min-bb-version))] (when-let [deps-map (not-empty (dissoc deps-map :paths :tasks :raw :min-bb-version))]
(binding [*print-namespace-maps* false]
(let [deps-map (assoc-in deps-map [:aliases :org.babashka/defaults] (let [deps-map (assoc-in deps-map [:aliases :org.babashka/defaults]
{:replace-paths [] ;; babashka sets paths manually {:replace-paths [] ;; babashka sets paths manually
:classpath-overrides (cond-> :classpath-overrides (cond->
@ -78,7 +79,7 @@
(apply deps/-main args))) (apply deps/-main args)))
cp (str/trim cp) cp (str/trim cp)
cp (str/replace cp (re-pattern (str cp/path-sep "+$")) "")] cp (str/replace cp (re-pattern (str cp/path-sep "+$")) "")]
(cp/add-classpath cp))))) (cp/add-classpath cp))))))
(def deps-namespace (def deps-namespace
{'add-deps (sci/copy-var add-deps dns) {'add-deps (sci/copy-var add-deps dns)