Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dependency refresh #2

Closed
wants to merge 1 commit into from
Closed

dependency refresh #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
(defproject mycroft "0.0.3-SNAPSHOT"
:description "It's your data"
:dependencies [[org.clojure/clojure "1.3.0-master-SNAPSHOT"]
[org.clojure/tools.logging "0.1.2"]
[org.clojure/java.jmx "0.1"]
[ring/ring-jetty-adapter "0.3.8"]
[compojure "0.6.3" :exclusions [org.clojure/clojure]]
[hiccup "0.3.5" :exclusions [org.clojure/clojure]]]
:dev-dependencies [[swank-clojure "1.3.0-SNAPSHOT" :exclusions [org.clojure/clojure]]]
:dependencies [[org.clojure/clojure "1.5.0-master-SNAPSHOT"]
[org.clojure/tools.logging "0.2.3"]
[org.clojure/java.jmx "0.2.0"]
[ring/ring-jetty-adapter "1.1.6"]
[compojure "1.1.3" :exclusions [org.clojure/clojure]]
[hiccup "1.0.2" :exclusions [org.clojure/clojure]]]
:dev-dependencies [[swank-clojure "1.3.0-SNAPSHOT"
:exclusions [org.clojure/clojure]]]
:repositories {"sonatype-oss-public" "https://oss.sonatype.org/content/groups/public/"})
7 changes: 5 additions & 2 deletions src/mycroft/breadcrumb.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
(ns mycroft.breadcrumb
(:use mycroft.selector
[hiccup.page-helpers :only (encode-params)]
[hiccup.core :only (escape-html)])
[hiccup.util :only [escape-html
url-encode]])
(:require [mycroft.docs :as docs]))

(defn encode-params [params]
(url-encode params))

(defn params->query-string
"Generate query string for the params provided. Params include

Expand Down
6 changes: 3 additions & 3 deletions src/mycroft/data.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
(ns mycroft.data
(:use clojure.pprint
(:use [clojure.pprint]
[clojure.tools.logging :only (info)]
mycroft.selector
[hiccup.core :only (escape-html)])
[mycroft.selector]
[hiccup.util :only [escape-html]])
(:require [mycroft.docs :as docs]
[mycroft.breadcrumb :as breadcrumb]))

Expand Down
5 changes: 3 additions & 2 deletions src/mycroft/layouts/application.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
(:use [clojure.string :only (split)]
[clojure.tools.logging :only (info)]
[hiccup.core :only (html)]
[hiccup.page-helpers :only (include-css include-js)])
[hiccup.page :only [include-css
include-js]])
(:require [mycroft.namespace :as namespace]
[mycroft.class :as class]
[mycroft.data :as data]))
Expand Down Expand Up @@ -56,4 +57,4 @@
(minib-layout qname
(if var
(data/render (find-var (symbol qname)) (normalize-params params))
(namespace/var-browser ns)))))
(namespace/var-browser ns)))))