Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace cheshire with clojure.data.json #102

Merged
merged 1 commit into from
Aug 6, 2021
Merged

Replace cheshire with clojure.data.json #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deps.edn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
org.clojure/data.zip {:mvn/version "1.0.0"}
org.clojure/tools.cli {:mvn/version "1.0.206"}
org.clojure/tools.deps.alpha {:mvn/version "0.12.1003"}
cheshire/cheshire {:mvn/version "5.10.1"}
org.clojure/data.json {:mvn/version "2.4.0"}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is meant to be kept alphabetized (within org.clojure), easy change

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No problem :)

clj-commons/clj-yaml {:mvn/version "0.7.107"}
version-clj/version-clj {:mvn/version "2.0.1"}
rewrite-clj/rewrite-clj {:mvn/version "1.0.644-alpha"}}
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@
<developerConnection>scm:git:ssh://[email protected]/liquidz/antq.git</developerConnection>
</scm>
<dependencies>
<dependency>
<groupId>org.clojure</groupId>
<artifactId>data.json</artifactId>
<version>2.4.0</version>
</dependency>
<dependency>
<groupId>org.clojure</groupId>
<artifactId>clojure</artifactId>
Expand Down Expand Up @@ -54,11 +59,6 @@
<artifactId>clj-yaml</artifactId>
<version>0.7.107</version>
</dependency>
<dependency>
<groupId>cheshire</groupId>
<artifactId>cheshire</artifactId>
<version>5.10.1</version>
</dependency>
<dependency>
<groupId>version-clj</groupId>
<artifactId>version-clj</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions src/antq/report/json.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
(ns antq.report.json
(:require
[antq.report :as report]
[cheshire.core :as json]))
[clojure.data.json :as json]))

(defmethod report/reporter "json"
[deps _options]
(println (json/generate-string deps)))
(println (json/write-str deps)))
4 changes: 2 additions & 2 deletions src/antq/ver/github_tag.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[antq.util.git :as u.git]
[antq.util.ver :as u.ver]
[antq.ver :as ver]
[cheshire.core :as json]
[clojure.data.json :as json]
[clojure.string :as str]
[version-clj.core :as version]))

Expand Down Expand Up @@ -34,7 +34,7 @@
[url]
(-> url
(slurp)
(json/parse-string true)
(json/read-str :key-fn keyword)
(->> (map :name)
(filter (comp u.ver/sem-ver? u.ver/normalize-version))
(sort (fn [& args]
Expand Down
4 changes: 2 additions & 2 deletions test/antq/ver/github_tag_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[antq.record :as r]
[antq.ver :as ver]
[antq.ver.github-tag :as sut]
[cheshire.core :as json]
[clojure.data.json :as json]
[clojure.java.shell :as sh]
[clojure.string :as str]
[clojure.test :as t]))
Expand All @@ -22,7 +22,7 @@
(ver/get-sorted-versions (dep (merge {:version "1.0.0"} m))))

(def ^:private dummy-json
(json/generate-string
(json/write-str
[{:name "v1.0.0"}
{:name "v2.0.0"}
{:name "v3.0.0"}]))
Expand Down