Merge pull request #1002 from cldwalker/upgrade-bultitude

upgrade to bultitude 0.2.1 to stop relying on bultitude private fn
This commit is contained in:
Michael Klishin 2013-02-12 18:08:44 -08:00
commit 62ae78236e
2 changed files with 2 additions and 6 deletions

View file

@ -8,7 +8,7 @@
:url "http://www.eclipse.org/legal/epl-v10.html"}
:dependencies [[leiningen-core "2.1.0-SNAPSHOT"]
[org.clojure/data.xml "0.0.3"]
[bultitude "0.1.7"]
[bultitude "0.2.1"]
[stencil "0.3.1"]
[org.apache.maven.indexer/indexer-core "4.1.3"
:exclusions [org.apache.maven/maven-model

View file

@ -109,13 +109,9 @@
'(fn [m & vars]
(some #(= (str "#'" %) (-> m ::var str)) vars))])
;; from bultitude's namespaces-in-dir
(defn- ns-form-for-file [file]
(with-open [r (PushbackReader. (io/reader file))] (@#'b/read-ns-form r)))
(defn- convert-to-ns [possible-file]
(if (and (.endsWith possible-file ".clj") (.exists (io/file possible-file)))
(str (ns-form-for-file possible-file))
(str (b/ns-form-for-file possible-file))
possible-file))
(defn- read-args [args project]