update for clojure 1.3 (depends on downstream versions of clj-oauth / clj-apache-http)

tavisrudd · tavisrudd · commit d94a7388ce18 · 2012-01-13T15:41:37.000-08:00
diff --git a/project.clj b/project.clj
@@ -1,7 +1,6 @@
-(defproject clojure-twitter "1.2.5"
+(defproject clojure-twitter "1.2.6-SNAPSHOT"
   :description "Twitter Client API for Clojure"
-  :dependencies [[org.clojure/clojure "1.2.0"]
-                 [org.clojure/clojure-contrib "1.2.0"]
-                 [clj-oauth "1.2.10"]
-                 [com.twinql.clojure/clj-apache-http "2.3.1"]]
-  :dev-dependencies [[swank-clojure "1.2.1"]])
+  :dependencies [[org.clojure/clojure "1.3.0"]
+                 [org.clojure/data.json "0.1.2"]
+                 [clj-oauth "1.3.1-SNAPSHOT"]
+                 [com.twinql.clojure/clj-apache-http "2.3.2-SNAPSHOT"]])
diff --git a/src/twitter.clj b/src/twitter.clj
@@ -1,6 +1,5 @@
 (ns twitter
-  (:use [clojure.contrib.json :only [read-json]]
-        [clojure.contrib.java-utils :only [as-str]])
+  (:use [clojure.data.json :only [read-json]])
   (:require [clojure.set :as set]
             [clojure.string :as string]
             [com.twinql.clojure.http :as http]
@@ -13,10 +12,10 @@
 
 (declare status-handler)
 
-(def *oauth-consumer* nil)
-(def *oauth-access-token* nil)
-(def *oauth-access-token-secret* nil)
-(def *protocol* "http")
+(def ^:dynamic *oauth-consumer* nil)
+(def ^:dynamic *oauth-access-token* nil)
+(def ^:dynamic *oauth-access-token-secret* nil)
+(def ^:dynamic *protocol* "http")
 
 ;; Get JSON from clj-apache-http
 (defmethod http/entity-as :json [entity as state]
