Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
  • 2 commits
  • 1 file changed
  • 0 commit comments
  • 1 contributor
Showing with 16 additions and 14 deletions.
  1. +16 −14 src/leiningen/voom.clj
View
30 src/leiningen/voom.clj
@@ -242,7 +242,8 @@
(defn install-versioned-artifact
[proot]
- ;; TODO: voom build-deps first, then wrap install:
+ (println "Calling recursive build-deps on:" proot)
+ (print (:out (sh "lein" "voom" "build-deps" :dir proot)))
(let [install-cmd ["lein" "voom" "wrap" "install" :dir proot]
_ (apply println "install-versioned-artifact:" install-cmd)
rtn (apply sh install-cmd)]
@@ -292,19 +293,20 @@
(close [])))
(defn try-once-resolve-voom-version [project]
- (try
- (with-log-level Level/OFF
- #(binding [*err* null-writer]
- (leiningen.core.classpath/resolve-dependencies :dependencies project)))
- :ok
- (catch Exception e
- ;; lein resolve-dependencies wraps a
- ;; DependencyResolutionException in an ex-info, so if we want
- ;; the real cause of failure we have to dig for it:
- (if-let [arts (seq (missing-artifacts-from-exception e))]
- (doseq [art arts]
- (resolve-artifact e art))
- (throw e)))))
+ (let [non-dev-proj (project/set-profiles project [] [:dev :user])]
+ (try
+ (with-log-level Level/OFF
+ #(binding [*err* null-writer]
+ (leiningen.core.classpath/resolve-dependencies :dependencies non-dev-proj)))
+ :ok
+ (catch Exception e
+ ;; lein resolve-dependencies wraps a
+ ;; DependencyResolutionException in an ex-info, so if we want
+ ;; the real cause of failure we have to dig for it:
+ (if-let [arts (seq (missing-artifacts-from-exception e))]
+ (doseq [art arts]
+ (resolve-artifact e art))
+ (throw e))))))
(defn build-deps
"Like 'lein deps', but also builds voom-versioned things as needed."

No commit comments for this range

Something went wrong with that request. Please try again.