Add support for Clojure 1.8 #39

liquidz · Nov 19, 2020 · 43d1922 · 43d1922
1 parent 7e3bf48
commit 43d1922
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/src/antq/dep/boot.clj b/src/antq/dep/boot.clj
@@ -36,7 +36,7 @@
         (r/map->Dependency {:project :boot
                             :type :java
                             :file file-path
-                            :name  (if (qualified-symbol? dep-name)
+                            :name  (if (u.dep/qualified-symbol?' dep-name)
                                      (str dep-name)
                                      (str dep-name "/" dep-name))
                             :version version

diff --git a/src/antq/dep/clojure.clj b/src/antq/dep/clojure.clj
@@ -19,20 +19,20 @@
         (and (:git/url opt) :git))))
 
 (defmethod extract-type-and-version :default
-  [{:mvn/keys [version]}]
+  [opt]
   {:type :java
-   :version version})
+   :version (:mvn/version opt)})
 
 (defmethod extract-type-and-version :git
-  [{:git/keys [url] :keys [sha]}]
+  [opt]
   {:type :git
-   :version sha
-   :extra {:url url}})
+   :version (:sha opt)
+   :extra {:url (:git/url opt)}})
 
 (defn extract-deps
   [file-path deps-edn-content-str]
   (let [deps (atom {})
-        {:mvn/keys [repos] :as edn} (edn/read-string deps-edn-content-str)]
+        edn (edn/read-string deps-edn-content-str)]
     (walk/postwalk (fn [form]
                      (when (and (sequential? form)
                                 (#{:deps :extra-deps} (first form)))
@@ -46,10 +46,10 @@
                      (seq (:version type-and-version)))]
       (-> {:project :clojure
            :file file-path
-           :name  (if (qualified-symbol? dep-name)
+           :name  (if (u.dep/qualified-symbol?' dep-name)
                     (str dep-name)
                     (str dep-name "/" dep-name))
-           :repositories repos}
+           :repositories (:mvn/repos edn)}
           (merge type-and-version)
           (r/map->Dependency)))))
 

diff --git a/src/antq/dep/leiningen.clj b/src/antq/dep/leiningen.clj
@@ -36,7 +36,7 @@
         (r/map->Dependency {:project :leiningen
                             :type :java
                             :file file-path
-                            :name  (if (qualified-symbol? dep-name)
+                            :name  (if (u.dep/qualified-symbol?' dep-name)
                                      (str dep-name)
                                      (str dep-name "/" dep-name))
                             :version version

diff --git a/src/antq/util/dep.clj b/src/antq/util/dep.clj
@@ -4,6 +4,11 @@
   (:import
    java.io.File))
 
+(defn qualified-symbol?'
+  "To support Clojure 1.8.0"
+  [x]
+  (boolean (and (symbol? x) (namespace x) true)))
+
 (defn compare-deps
   [x y]
   (let [prj (.compareTo ^String (:file x) ^String (:file y))]