[Fix #306] Replace cheshire with data.json

clojure-emacs · Jul 1, 2021 · 5c60db6 · 5c60db6
1 parent dd5677f
commit 5c60db6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/project.clj b/project.clj
@@ -5,7 +5,7 @@
             :url "http://www.eclipse.org/legal/epl-v10.html"}
   :dependencies [[nrepl "0.8.3"]
                  ^:inline-dep [http-kit "2.5.1"]
-                 ^:inline-dep [cheshire "5.10.0"]
+                 ^:inline-dep [org.clojure/data.json "2.3.1"]
                  ^:inline-dep [org.clojure/tools.analyzer.jvm "1.1.0"]
                  ^:inline-dep [org.clojure/tools.namespace "1.1.0" :exclusions [org.clojure/tools.reader]]
                  ^:inline-dep [org.clojure/tools.reader "1.3.5"]
@@ -29,11 +29,9 @@
              :provided {:dependencies [[cider/cider-nrepl "0.25.9"]
                                        [org.clojure/clojure "1.9.0"]]}
              :1.8 {:dependencies [[org.clojure/clojure "1.8.0"]
-                                  [org.clojure/clojurescript "1.8.51"]
-                                  [javax.xml.bind/jaxb-api "2.3.1"]]}
+                                  [org.clojure/clojurescript "1.8.51"]]}
              :1.9 {:dependencies [[org.clojure/clojure "1.9.0"]
-                                  [org.clojure/clojurescript "1.9.946"]
-                                  [javax.xml.bind/jaxb-api "2.3.1"]]}
+                                  [org.clojure/clojurescript "1.9.946"]]}
              :1.10 {:dependencies [[org.clojure/clojure "1.10.2"]
                                    [org.clojure/clojurescript "1.10.520"]]}
 

diff --git a/src/refactor_nrepl/artifacts.clj b/src/refactor_nrepl/artifacts.clj
@@ -1,5 +1,5 @@
 (ns refactor-nrepl.artifacts
-  (:require [cheshire.core :as json]
+  (:require [clojure.data.json :as json]
             [clojure
              [edn :as edn]
              [string :as str]]
@@ -69,7 +69,7 @@
         search-suffix "%22+AND+p:%22jar%22&rows=2000&wt=json"
         search-url (str search-prefix group-id search-suffix)
         {:keys [_ _ body _]} @(http/get search-url (assoc (get-proxy-opts) :as :text))
-        search-result (json/parse-string body true)]
+        search-result (json/read-str body :key-fn keyword)]
     (map :a (-> search-result :response :docs))))
 
 (defn- get-mvn-versions!
@@ -83,7 +83,7 @@
                                              artifact
                                              "%22&core=gav&rows=100&wt=json")
                                         (assoc (get-proxy-opts) :as :text))]
-    (->> (json/parse-string body true)
+    (->> (json/read-str body :key-fn keyword)
          :response
          :docs
          (map :v))))
@@ -102,7 +102,7 @@
   (let [{:keys [body status]} @(http/get (str "https://clojars.org/api/artifacts/"
                                               artifact))]
     (when (= 200 status)
-      (map :version (:recent_versions (json/parse-string body true))))))
+      (map :version (:recent_versions (json/read-str body :key-fn keyword))))))
 
 (defn- get-artifacts-from-clojars!
   []