Skip to content

replace cheshire dependency with clojure.data.json #26

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

Open
edenworky wants to merge 1 commit into
base: master
Choose a base branch
from
Open

replace cheshire dependency with clojure.data.json #26

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 @@ -8,14 +8,14 @@
org.clojure/core.match {:mvn/version "1.1.0"}
org.clojure/data.avl {:mvn/version "0.2.0"}
org.clojure/data.csv {:mvn/version "1.1.0"}
org.clojure/data.json {:mvn/version "2.5.0"}
org.clojure/data.xml {:mvn/version "0.2.0-alpha9"}
org.clojure/math.combinatorics {:mvn/version "0.3.0"}
org.clojure/spec.alpha {:mvn/version "0.5.238"}
org.clojure/test.check {:mvn/version "1.1.1"}
org.clojure/tools.reader {:mvn/version "1.4.2"}

camel-snake-kebab/camel-snake-kebab {:mvn/version "0.4.3"}
cheshire/cheshire {:mvn/version "5.13.0"} ; #todo switch to muuntaja/jsonista
clj-time/clj-time {:mvn/version "0.15.2"}
criterium/criterium {:mvn/version "0.4.6"}
danlentz/clj-uuid {:mvn/version "0.1.9"}
Expand Down
5 changes: 1 addition & 4 deletions old/project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
[org.clojure/core.match "1.0.1"]
[org.clojure/data.avl "0.1.0"]
[org.clojure/data.csv "1.0.1"]
[org.clojure/data.json "2.5.0"]
[org.clojure/data.xml "0.2.0-alpha8"]
[org.clojure/math.combinatorics "0.1.6"]
[org.clojure/spec.alpha "0.3.218"]
Expand All @@ -34,7 +35,6 @@

; other libs
[camel-snake-kebab/camel-snake-kebab "0.4.3"]
[cheshire/cheshire "5.11.0"] ; #todo switch to muuntaja/jsonista
[clj-time/clj-time "0.15.2"]
[danlentz/clj-uuid "0.1.9"]
[joda-time/joda-time "2.12.2"]
Expand Down Expand Up @@ -113,6 +113,3 @@
; "--illegal-access=permit" ; may need for Java10+ [ permit, warn, debug, deny ]
]
)



10 changes: 5 additions & 5 deletions save/pom-orig.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@
<artifactId>data.csv</artifactId>
<version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.clojure</groupId>
<artifactId>data.json</artifactId>
<version>2.5.0</version>
</dependency>
<dependency>
<groupId>org.clj-commons</groupId>
<artifactId>claypoole</artifactId>
Expand All @@ -82,11 +87,6 @@
<artifactId>math.combinatorics</artifactId>
<version>0.1.6</version>
</dependency>
<dependency>
<groupId>cheshire</groupId>
<artifactId>cheshire</artifactId>
<version>5.11.0</version>
</dependency>
<dependency>
<groupId>org.clojure</groupId>
<artifactId>core.match</artifactId>
Expand Down
12 changes: 5 additions & 7 deletions src/tupelo/core.cljc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
[tupelo.core.impl :as impl]
[tupelo.lexical :as lex]
[tupelo.schema :as tsk])
#?(:clj (:require [cheshire.core :as cheshire]
#?(:clj (:require [clojure.data.json :as json]
[clojure.core.match :as ccm]
[flatland.ordered.map :as omap]
[flatland.ordered.set :as oset]
Expand Down Expand Up @@ -412,15 +412,15 @@
#?(:clj (do
; #todo add test & README
(s/defn json->edn
"Shortcut to cheshire.core/parse-string"
"Shortcut to clojure.data.json/read-str (keywordizing keys)"
[json-str :- s/Str]
(unlazy (cheshire/parse-string json-str true))) ; true => keywordize-keys
(unlazy (json/read-str json-str :key-fn keyword)))

; #todo add test & README
(s/defn edn->json :- s/Str
"Shortcut to cheshire.core/generate-string"
"Shortcut to clojure.data.json/write-string"
[arg]
(cheshire/generate-string arg)))
(json/write-str arg)))
:cljs (do
; #todo add test & README
(s/defn json->edn
Expand Down Expand Up @@ -3692,5 +3692,3 @@
;
; #todo make it handle either tst.orig.namespace or orig.namespace-test
; #todo make it a macro to accept unquoted namespace values