Upgrade to Clojure 1.3 and compatible libraries.

project.clj

@@ -5,13 +5,12 @@
                  ;; it's binding something that isn't declared
                  ;; dynamic. I think it's something in swank-clojure,
                  ;; but I'm not sure.
-                 [org.clojure/clojure "1.2.1"]
+                 [org.clojure/clojure "1.3.0"]
                  [ring/ring-jetty-adapter "1.0.1"]
-                 [ring-json-params "0.1.3"]
                  [ring/ring-core "1.0.1"]
+                 [org.clojure/data.json "0.1.1"]
                  [compojure "1.0.0"]
                  [enlive "1.0.0"]]
-  :dev-dependencies [[swank-clojure "1.4.0-SNAPSHOT"]]
   :main artifact.core
   ;; This next option has to do with Clojure bug #322. Something
   ;; about transitive AOT results in not enough going into the

src/artifact/api.clj

@@ -1,6 +1,6 @@
 (ns artifact.api
   "Defines the JSON API used by clients to retrieve game state."
-  (:use [clojure.contrib.json :only [json-str read-json]]
+  (:use [clojure.data.json :only [json-str read-json]]
         artifact.tuplestore
         artifact.state
         artifact.game

src/artifact/core.clj

@@ -4,7 +4,7 @@
         [ring.middleware.multipart-params]
         [artifact.game :only (new-game)]
         [artifact.state :only (*game*)]
-        [clojure.contrib.json :only (read-json)]
+        [clojure.data.json :only (read-json)]
         compojure.core
         artifact.ui
         artifact.api

src/artifact/ui.clj

@@ -1,7 +1,6 @@
 (ns artifact.ui
   "Contains the HTML-y bits of the game."
-  (:use [clojure.contrib.prxml :only (prxml *prxml-indent* *html-compatible*)]
-        [clojure.contrib.json :only (json-str)]
+  (:use [clojure.data.json :only (json-str)]
         [ring.util.response :only (response)]
         compojure.core
         artifact.tuplestore
@@ -28,13 +27,6 @@
 game."
   ([token] (str "/api?token=" token)))
 
-(defn to-html-str [& content]
-  (binding [*prxml-indent* 2
-            *html-compatible* true
-            *out* (java.io.StringWriter.)]
-    (doseq [e content] (prxml e))
-    (.toString *out*)))
-
 ;;; Snippets
 
 (html/defsnippet flash (html/html-resource "html/snippets.html") [:p.flash]