Permalink
Browse files

move to cheshire, clojure 1.4 here we come

  • Loading branch information...
1 parent 149dbc6 commit 44f90282b3527148cb59e4291c9bac55485a96aa @hiredman committed Feb 27, 2013
View
@@ -7,7 +7,7 @@
[org.clojure/tools.logging "0.2.6"]
[conduit-irc "2.0.1-SNAPSHOT"]
[org.ccil.cowan.tagsoup/tagsoup "1.2"]
- [org.danlarkin/clojure-json "1.1"]
+ [cheshire "5.0.2"]
[clj-http "0.1.1"
:exclude [commons-logging]]
[swank-clojure "1.3.2"]
View
@@ -17,7 +17,6 @@
[clojurebot.eval :only [eval-request?]]
[clojure.tools.logging :only [info]]
[clojurebot.seenx :only [log-user seenx-query? seen-user]]
- [clojurebot.delicious :only [contains-url? delicious]]
[clojurebot.dice :only [roll-some-dice dice-roll?]]
[hiredman.clojurebot.google :only [google-search? google-search]]
[swank.swank :only [start-repl]]
@@ -28,10 +27,9 @@
notice target setup-crons]]
[clojurebot.plugin :only [load-from]]
[hiredman.clojurebot.simplyscala :only [scala-eval]]
- [com.thelastcitadel.apropos :refer [apropos]]
- [compojure.core :refer [defroutes]]
- [compojure.route :refer :all]
- [ring.adapter.jetty :refer [run-jetty]])
+ [compojure.core :only [defroutes GET]]
+ [ring.adapter.jetty :only [run-jetty]]
+ [com.thelastcitadel.apropos :only [apropos]])
(:require [clojure.tools.logging :as log])
(:gen-class))
View
@@ -0,0 +1,5 @@
+(ns clojurebot.json
+ (:require [cheshire.core :as json]))
+
+(defn decode-from-str [json]
+ (json/decode json true))
@@ -2,7 +2,7 @@
(ns hiredman.clojurebot.code-lookup
(:use (hiredman.clojurebot core))
(:use (hiredman utilities))
- (:require [org.danlarkin.json :as json])
+ (:require [clojurebot.json :as json])
(:import (java.io File InputStreamReader BufferedReader)))
(def google-code-url "http://code.google.com/p/clojure/source/browse/trunk/src/clj/")
@@ -2,7 +2,7 @@
(:import (java.text SimpleDateFormat ParsePosition FieldPosition))
(:require [hiredman.clojurebot.core :as core]
[hiredman.schedule :as sched]
- [org.danlarkin.json :as json]
+ [clojurebot.json :as json]
[hiredman.utilities :as util]))
(def api-url "http://github.com/api/v2/json/commits/list/richhickey/clojure/master")
@@ -2,7 +2,7 @@
(ns hiredman.clojurebot.google
(:use (hiredman.clojurebot core))
(:use (hiredman utilities))
- (:require [org.danlarkin.json :as json]))
+ (:require [clojurebot.json :as json]))
(def lmgtfy "http://lmgtfy.com/?q=")
@@ -1,7 +1,7 @@
(ns hiredman.clojurebot.stock-quote
(:require [hiredman.clojurebot.core :as core]
[hiredman.utilities :as util]
- [org.danlarkin.json :as json]))
+ [clojurebot.json :as json]))
(def url "http://www.google.com/finance/info?q=")
@@ -1,8 +1,7 @@
-;; requires danlarkin's clojure-json
(ns hiredman.clojurebot.translate
(:use (hiredman.clojurebot core))
(:use (hiredman utilities))
- (:require [org.danlarkin.json :as json]))
+ (:require [clojurebot.json :as json]))
(def url "http://ajax.googleapis.com/ajax/services/language/translate?v=1.0")

0 comments on commit 44f9028

Please sign in to comment.