Permalink
Browse files

Merged with bradford/master.

  • Loading branch information...
2 parents 09437d9 + 10113df commit 74eb6eecc861884eb29542e4ffe5a4c50a0c8092 @waratuman committed Mar 2, 2010
View
@@ -6,8 +6,6 @@
[org.clojure/clojure-contrib "1.1.0-master-SNAPSHOT"]
[cascading/cascading "1.0.17-SNAPSHOT"
:exclusions [javax.mail/mail janino/janino]]
- [clj-json "0.1.0-SNAPSHOT"]
- [clj-serializer "0.1.0-SNAPSHOT"]]
- :dev-dependencies [[lein-javac "0.0.2-SNAPSHOT"]]
- :namespaces [cascading.clojure.api
- cascading.clojure.testing])
+ [clj-json "0.2.0-SNAPSHOT"]]
+ :dev-dependencies [[lein-javac "0.0.2-SNAPSHOT"]
+ [org.clojure/swank-clojure "1.0"]])
@@ -1,7 +1,7 @@
(ns cascading.clojure.api
(:refer-clojure :exclude (count first filter mapcat map))
(:use [clojure.contrib.seq-utils :only [find-first indexed]])
- (:require [clj-json :as json])
+ (:require (clj-json [core :as json]))
(:import (cascading.tuple Tuple TupleEntry Fields)
(cascading.scheme TextLine)
(cascading.flow Flow FlowConnector)
@@ -4,7 +4,7 @@
(:import (cascading.tuple Fields)
(cascading.pipe Pipe)
(cascading.clojure Util ClojureMap))
- (:require [clj-json :as json])
+ (:require (clj-json [core :as json]))
(:require [clojure.contrib.duck-streams :as ds])
(:require [clojure.contrib.java-utils :as ju])
(:require (cascading.clojure [api :as c])))
@@ -6,7 +6,7 @@
(:import (cascading.tuple Fields)
(cascading.pipe Pipe)
(cascading.clojure Util ClojureMap))
- (:require [clj-json :as json])
+ (:require (clj-json [core :as json]))
(:require [clojure.contrib.duck-streams :as ds])
(:require [clojure.contrib.java-utils :as ju])
(:require (cascading.clojure [api :as c])))
@@ -4,7 +4,7 @@
(:import (cascading.tuple Fields)
(cascading.pipe Pipe)
(cascading.clojure Util ClojureMap))
- (:require [clj-json :as json])
+ (:require (clj-json [core :as json]))
(:require [clojure.contrib.duck-streams :as ds])
(:require [clojure.contrib.java-utils :as ju])
(:require (cascading.clojure [api :as c])))

0 comments on commit 74eb6ee

Please sign in to comment.