Merge branch 'master' into develop

This commit is contained in:
simon 2017-08-09 07:55:51 +01:00
commit 2f90f0bc1e
2 changed files with 42 additions and 26 deletions

View file

@ -11,9 +11,21 @@
[com.cemerick/url "0.1.1"]
[com.fzakaria/slf4j-timbre "0.3.7"]
[com.taoensso/encore "2.91.1"]
[lib-noir "0.9.9" :exclusions [org.clojure/tools.reader]]
[com.cemerick/url "0.1.1"]
[ring-server "0.4.0"]
[selmer "1.10.9"]
[org.clojure/tools.logging "0.4.0"]
[com.taoensso/timbre "4.10.0"]
[com.fzakaria/slf4j-timbre "0.3.7"]
[org.slf4j/slf4j-api "1.7.25"]
[org.slf4j/log4j-over-slf4j "1.7.25"]
[org.slf4j/jul-to-slf4j "1.7.25"]
[org.slf4j/jcl-over-slf4j "1.7.25"]
[com.taoensso/tower "3.0.2" :exclusions [com.taoensso/encore]]
[markdown-clj "0.9.99" :exclusions [com.keminglabs/cljx]]
[crypto-password "0.2.0"]
[clj-jgit "0.8.9"]
[environ "1.1.0"]
[im.chit/cronj "1.4.4"]
[lib-noir "0.9.9" :exclusions [org.clojure/tools.reader]]
@ -29,17 +41,20 @@
:repl-options {:init-ns smeagol.repl}
:jvm-opts ["-server"]
:plugins [[lein-ring "0.8.13" :exclusions [org.clojure/clojure]]
[lein-environ "1.0.0"]
:plugins [[lein-ancient "0.5.5" :exclusions [org.clojure/clojure org.clojure/data.xml]]
[lein-bower "0.5.1"]
[lein-ancient "0.5.5" :exclusions [org.clojure/clojure org.clojure/data.xml]]
[lein-codox "0.10.3"]
[io.sarnowski/lein-docker "1.0.0"]
[lein-environ "1.0.0"]
[lein-marginalia "0.7.1" :exclusions [org.clojure/clojure]]
[lein-codox "0.10.3"]]
[lein-ring "0.8.13" :exclusions [org.clojure/clojure]]]
:bower-dependencies [[simplemde "1.11.2"]
;; [vega-embed "3.0.0-beta.19"] vega-embed currently not loaded from Bower because of
;; dependency conflict which will hopefully be resolved soon.
[vega-lite "2.0.0-beta.10"]
[mermaid "6.0.0"]]
:docker {:image-name "simonbrooke/smeagol"
:dockerfile "Dockerfile"}
:ring {:handler smeagol.handler/app
:init smeagol.handler/init
:destroy smeagol.handler/destroy}