Update library dependency sources

Author: dmiller

src/dotnet/Cljr/clojure/tools/cli/api.cljc

@@ -417,7 +417,10 @@
   [{:keys [lib tool n] :or {n 8} :as args}]
   (let [{:keys [root-edn user-edn]} (deps/find-edn-maps)
         master-edn (deps/merge-edns [root-edn user-edn])
-        trunc-fn (if (= n :all) (fn [_n x] x) #(apply take-last %&))
+        trunc-fn (fn [n x]
+                   (if (= n :all)
+                     x
+                     (mapcat #(take-last n %) (vals (group-by keys x)))))
         coords (cond
                  tool
                  (if-let [{:keys [lib coord]} (tool/resolve-tool (name tool))]

src/dotnet/Cljr/clojure/tools/deps.cljc

@@ -24,12 +24,18 @@
     [clojure.lang PersistentQueue]
     #?(:clj [java.io File InputStreamReader BufferedReader]
 	   :cljr [System.IO  Path FileInfo DirectoryInfo])
-    #?(:clj [java.lang ProcessBuilder ProcessBuilder$Redirect] :cljr [System.Diagnostics ProcessStartInfo Process])
+    #?(:clj [java.lang ProcessBuilder ProcessBuilder$Redirect] )   ;;; :cljr [System.Diagnostics ProcessStartInfo Process]  -- defer until after we load the dll, if required.
     #?(:clj [java.util List] 
 	   :cljr [System.Collections ArrayList])
 	#?(:cljr [System.Threading CancellationTokenSource CancellationToken])   
 	   ))
 
+(try 
+  (assembly-load-from (str clojure.lang.RT/SystemRuntimeDirectory "System.Diagnostics.Process.dll"))
+  (catch Exception e))  ;; failing silently okay -- if we need it and didn't find it, a type reference will fail later
+
+(import '[System.Diagnostics Process ProcessStartInfo])
+
 (set! *warn-on-reflection* true)
 
 ;;;; deps.edn reading
@@ -489,7 +495,7 @@
              :ppath use-path
              :child-pred child-pred})]
     (loop [pendq nil ;; a resolved child-lookup thunk to look at first
-           q (into (PersistentQueue/EMPTY) (map vector deps)) ;; queue of nodes or child-lookups
+           q (into PersistentQueue/EMPTY (map vector deps)) ;; queue of nodes or child-lookups
            version-map nil ;; track all seen versions of libs and which version is selected
            exclusions nil ;; tracks exclusions marked in the tree
            cut nil ;; tracks cuts made of child nodes based on exclusions
@@ -536,7 +542,7 @@
                  :ppath use-path
                  :child-pred child-pred})]
         (loop [pendq nil ;; a resolved child-lookup thunk to look at first
-               q (into (PersistentQueue/EMPTY) (map vector deps)) ;; queue of nodes or child-lookups
+               q (into PersistentQueue/EMPTY (map vector deps)) ;; queue of nodes or child-lookups
                version-map {} ;; track all seen versions of libs and which version is selected
                exclusions nil ;; tracks exclusions marked in the tree
                cut nil ;; tracks cuts made of child nodes based on exclusions
@@ -667,7 +673,7 @@
 (defn- make-tree
   [lib-map]
   (let [{roots false, nonroots true} (group-by #(-> % val :dependents boolean) lib-map)]
-    (loop [q (into (PersistentQueue/EMPTY) roots)
+    (loop [q (into PersistentQueue/EMPTY roots)
            remaining nonroots
            tree {}]
       (let [[lib coord :as node] (peek q)

src/dotnet/Cljr/clojure/tools/deps/deps.edn

@@ -1,5 +1,5 @@
 {
-  :paths ["."]
+  :paths ["src"]
 
   ;;; eventually, we need to be able to declare the clojure version to use.
   ;;;:deps {

src/dotnet/Cljr/clojure/tools/deps/extensions.cljc

@@ -146,10 +146,11 @@
   (throw-bad-coord lib coord))
 
 (defn find-all-versions
-  "Find versions across all registered procurer types and return first that finds some.
-  Returns coll of coordinates for this lib (based on lib and partial coordinate)."
+  "Find versions across all registered procurer types.
+  Returns coll of coordinates for this lib (based on lib and partial coordinate).
+  For each procurer type, coordinates are returned in chronological order."
   [lib coord config]
-  (some #(find-versions lib coord % config) (procurer-types)))
+  (mapcat #(find-versions lib coord % config) (procurer-types)))
 
 ;; Methods switching on manifest type
 

src/dotnet/Cljr/clojure/tools/deps/tree.cljc

@@ -60,6 +60,7 @@
   subprocesses (tool, resolve-deps, make-classpath-map).
 
   Options:
+    :dir     - directory root path, defaults to current directory
     :root    - dep source, default = :standard
     :user    - dep source, default = :standard
     :project - dep source, default = :standard (\"./deps.edn\")