Merge pull request #3 from espeed/master

Fixes ClassNotFound exception from incompatible transitive dependencies
doo · Jul 2, 2012 · 587db24 · 587db24
2 parents 2d9a9e2 + 14f2c21
commit 587db24
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/project.clj b/project.clj
@@ -1,6 +1,6 @@
-(defproject clj-pubnub "0.0.1"
+(defproject clj-pubnub "0.0.2"
   :description "Clojure client for PubNub"
-  :dependencies [[clj-http "0.3.2"]
-                 [cheshire "2.2.2"]
+  :dependencies [[clj-http "0.4.3"]
+                 [cheshire "4.0.0"]
                  [digest "1.4.0"]]
-  :dev-dependencies [[swank-clojure "1.4.0"]])
+  :dev-dependencies [[swank-clojure "1.4.2"]])
diff --git a/src/clj_pubnub/client.clj b/src/clj_pubnub/client.clj
@@ -2,7 +2,7 @@
   (:use [digest :only [digest]])
   (:require [clj-http.client :as http]
             [cheshire.core :as json]
-            [clojure.contrib.string :as str]))
+            [clojure.string :as str]))
 
 (defonce ^{:dynamic true} config
   {})