Merge branch 'cgore-update-dependencies'

xeqi · Aug 16, 2015 · fd094d5 · fd094d5
2 parents 1992aad + adccd65
commit fd094d5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# kerodon [![Build Status](https://travis-ci.org/xeqi/kerodon.svg?branch=master)](http://travis-ci.org/xeqi/kerodon)
+# kerodon [![Build Status](https://travis-ci.org/xeqi/kerodon.svg?branch=master)](http://travis-ci.org/xeqi/kerodon) [![Dependencies Status](http://jarkeeper.com/xeqi/kerodon/status.png)](http://jarkeeper.com/xeqi/kerodon)
 
 kerodon is an interaction and testing library for [ring](https://github.com/ring-clojure/ring) html based apps. It is intended to look like the interaction a user would have.  It is inspired by [capybara](https://github.com/jnicklas/capybara).
 

diff --git a/project.clj b/project.clj
@@ -4,21 +4,20 @@
   :min-lein-version "2.0.0"
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
-  :dependencies [[org.clojure/clojure "1.4.0"]
+  :dependencies [[org.clojure/clojure "1.7.0"]
                  [peridot "0.4.0"]
-                 [enlive "1.1.5" :exclusions [org.clojure/clojure]]
+                 [enlive "1.1.6" :exclusions [org.clojure/clojure]]
                  [ring/ring-codec "1.0.0"]
-                 [org.flatland/ordered "1.5.2"]]
+                 [org.flatland/ordered "1.5.3"]]
   :profiles {:test {:dependencies [[net.cgrand/moustache "1.1.0"
                                     :exclusions
                                     [[org.clojure/clojure]
                                      [ring/ring-core]]]
-                                   [ring/ring-core "1.3.2"]
+                                   [ring/ring-core "1.4.0"]
                                    [javax.servlet/servlet-api "2.5"]
                                    [hiccup "1.0.5"]]
                     :resource-paths ["test-resources"]}
-             :dev  {:dependencies [^:replace [org.clojure/clojure "1.6.0"]]}
-             :1.4  {:dependencies [^:replace [org.clojure/clojure "1.4.0"]]}
              :1.5  {:dependencies [^:replace [org.clojure/clojure "1.5.1"]]}
-             :1.6  {:dependencies [^:replace [org.clojure/clojure "1.6.0"]]}}
-  :aliases {"all" ["with-profile" "test,1.4:test,1.5:test,1.6"]})
+             :1.6  {:dependencies [^:replace [org.clojure/clojure "1.6.0"]]}
+             :1.7  {:dependencies [^:replace [org.clojure/clojure "1.7.0"]]}}
+  :aliases {"all" ["with-profile" "test,1.5:test,1.6:test,1.7"]})