merge conflicts

metasoarous · Apr 29, 2017 · dcec350 · dcec350
2 parents 2c5c788 + 5834e6f
commit dcec350
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/dev/user.clj b/dev/user.clj
@@ -52,12 +52,11 @@
 
 
 ;; You can use this to add dependencies without rebooting your repl.
-;; Perhaps wrap into a helpful function which takes the lib name and version (ideally just optionally; newest would
-;; default) and installs that attribute using the code below.
-;; TODO XXX
-(comment
-  (use '[cemerick.pomegranate :only (add-dependencies)])
-  (add-dependencies :coordinates '[[slingshot "0.12.2"]]
-                       :repositories (merge cemerick.pomegranate.aether/maven-central
-                                            {"clojars" "http://clojars.org/repo"})))
-
+(defmacro add-dependency [dependency]
+  "A macro for adding a dependency via Pomegranate.
+   Usage: (add-dependency [cheshire \"5.7.0\"])
+   Remember that you still need to (require) or (use) the new namespaces."
+  `(do (~'require '[cemerick.pomegranate])
+       (~'cemerick.pomegranate/add-dependencies :coordinates '[~dependency]
+         :repositories (~'merge cemerick.pomegranate.aether/maven-central
+                         {"clojars" "http://clojars.org/repo"}))))
diff --git a/project.clj b/project.clj
@@ -124,7 +124,7 @@
                    {:dependencies [[alembic "0.3.2"]
                                    [figwheel "0.5.8"]
                                    [figwheel-sidecar "0.5.8"] ;;:exclusions [org.clojure/clojure org.clojure/clojurescript fipp.visit/boolean?]
-
+                                   [com.cemerick/pomegranate "0.3.1"]
                                    [com.cemerick/piggieback "0.2.1"]
                                    [org.clojure/tools.nrepl "0.2.12"]
                                    [devcards "0.2.2" :exclusions [cljsjs/react-dom]]]