Merge branch 'cleanup-deps'

Author: cldwalker

lein-light-nrepl/project.clj

@@ -6,12 +6,9 @@
   :dependencies [[org.clojure/clojure "1.5.1"]
                  [org.clojure/tools.nrepl "0.2.3"]
                  [commons-io/commons-io "2.4"]
-                 [ibdknox/tools.reader "0.8.1"]
-                 [org.clojure/tools.reader "0.7.10"]
-                 [ibdknox/analyzer "0.0.2"]
+                 [org.clojure/tools.reader "0.8.16"]
                  [clj-stacktrace "0.2.7"]
                  [org.clojure/clojurescript "0.0-2202"
                    :exclusions [org.apache.ant/ant]]
-                 [clojure-complete "0.2.3"]
-                 [cheshire "5.2.0"]]
+                 [clojure-complete "0.2.3"]]
   :jvm-opts ["-Xmx1g"])

lein-light-nrepl/src/lighttable/nrepl/cljs.clj

@@ -1,6 +1,5 @@
 (ns lighttable.nrepl.cljs
-  (:require [clj-stacktrace.repl :as stack]
-            [clojure.pprint :refer [pprint]]
+  (:require [clojure.pprint :refer [pprint]]
             [clojure.test :as test]
             [clojure.string :as string]
             [lighttable.nrepl.fs :as fs]
@@ -19,8 +18,8 @@
             [clojure.tools.nrepl.middleware :refer [set-descriptor!]]
             [clojure.tools.nrepl.middleware.interruptible-eval :refer [interruptible-eval *msg*]]
             [clojure.tools.nrepl.misc :refer [response-for returning]]
-            [ibdknox.tools.reader :as reader]
-            [ibdknox.tools.reader.reader-types :as rt])
+            [clojure.tools.reader :as reader]
+            [clojure.tools.reader.reader-types :as rt])
   (:import java.io.Writer))
 
 (def js-dependency-index

lein-light-nrepl/src/lighttable/nrepl/core.clj

@@ -5,8 +5,7 @@
             [clojure.tools.nrepl.middleware.interruptible-eval :refer [interruptible-eval *msg*]]
             [clojure.tools.nrepl.misc :refer [response-for returning]]
             [clojure.tools.nrepl.middleware :refer [set-descriptor!]]
-            [cheshire.core :as cheshire]
-            [clj-stacktrace.repl :refer [pst+]]
+            [clojure.data.json :as json]
             [lighttable.nrepl.fs :as fs]
             [clojure.repl :as repl]))
 
@@ -60,7 +59,7 @@
   ([msg op data encoding]
    (let [data (case encoding
                 "edn" (binding [*print-readably* true] (pr-str data))
-                "json" (cheshire/generate-string data))]
+                "json" (json/write-str data))]
      (if-not (:transport msg)
        (.println old-out (str "no transport: " msg))
        (transport/send (:transport msg) (response-for msg {:op (name op) :id (or (:id msg) (:client-id @my-settings)) :encoding encoding :data data}))))))

lein-light-nrepl/src/lighttable/nrepl/eval.clj

@@ -1,6 +1,5 @@
 (ns lighttable.nrepl.eval
-  (:require [clj-stacktrace.repl :as stack]
-            [clojure.pprint :refer [pprint]]
+  (:require [clojure.pprint :refer [pprint]]
             [clojure.test :as test]
             [lighttable.nrepl.core :as core]
             [lighttable.nrepl.exception :as exception]
@@ -9,8 +8,8 @@
             [clojure.tools.nrepl.middleware :refer [set-descriptor!]]
             [clojure.tools.nrepl.middleware.interruptible-eval :refer [interruptible-eval *msg*]]
             [clojure.tools.nrepl.misc :refer [response-for returning]]
-            [ibdknox.tools.reader :as reader]
-            [ibdknox.tools.reader.reader-types :as rt])
+            [clojure.tools.reader :as reader]
+            [clojure.tools.reader.reader-types :as rt])
   (:import java.io.Writer))
 
 (defn try-read [rdr]

lein-light-nrepl/src/lighttable/nrepl/handler.clj

@@ -11,7 +11,6 @@
             [lighttable.nrepl.cljs :as cljs]
             [lighttable.nrepl.doc :as doc]
             lighttable.nrepl.auto-complete
-            [clj-stacktrace.repl :as stack :refer [pst+]]
             [clojure.repl :as repl]))
 
 (defn with-lt-data [msg]

lein-light-nrepl/src/lighttable/nrepl/sonar.clj

@@ -7,7 +7,7 @@
             [clojure.walk :as walk]
             [cljs.compiler :as compiler]
             [cljs.env :as cljs-env]
-            [ibdknox.analyzer :as cljs]
+            [cljs.analyzer :as cljs]
             [clojure.set :as set]))
 
 (def ^{:dynamic true} *logs* (atom {}))