Fix the order of make-dependency arguments.
Minor breaking change, but necessary; old arity was only just introduced.
This commit is contained in:
parent
03d811df3b
commit
1a7e9a70aa
3 changed files with 12 additions and 11 deletions
|
@ -96,7 +96,7 @@
|
|||
(doseq [repo (make-repositories project)]
|
||||
(.addConfiguredRemoteRepository deps-task repo))
|
||||
(doseq [dep (project deps-set)]
|
||||
(.addDependency deps-task (make-dependency project dep)))
|
||||
(.addDependency deps-task (make-dependency dep project)))
|
||||
deps-task))
|
||||
|
||||
(defn use-dev-deps? [project skip-dev]
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
(ns leiningen.pom
|
||||
"Write a pom.xml file to disk for Maven interop."
|
||||
(:use [leiningen.util.maven :only [make-exclusion make-dependency
|
||||
make-model]]
|
||||
(:use [leiningen.util.maven :only [make-model]]
|
||||
[leiningen.core :only [abort]]
|
||||
[clojure.java.io :only [copy file]])
|
||||
(:import (java.io StringWriter ByteArrayOutputStream)
|
||||
|
|
|
@ -147,11 +147,13 @@ the :classifier key (if present) is the classifier on the
|
|||
dependency (as a string). The value for the :exclusions key, if
|
||||
present, is a seq of symbols, identifying group ids and artifact ids
|
||||
to exclude from transitive dependencies."
|
||||
([dependency scope]
|
||||
(make-dependency {} dependency scope))
|
||||
([project dependency scope]
|
||||
(when-not (vector? dependency)
|
||||
(abort "Dependencies must be specified as vector:" dependency))
|
||||
([dependency]
|
||||
(make-dependency dependency {}))
|
||||
([dependency project]
|
||||
(make-dependency dependency project nil))
|
||||
([dependency project scope]
|
||||
(when (and dependency (not (vector? dependency)))
|
||||
(throw (Exception. "Dependencies must be specified as vector:" #_dependency)))
|
||||
(let [[dep version & extras] dependency
|
||||
extras-map (apply hash-map extras)
|
||||
exclusions (:exclusions extras-map)
|
||||
|
@ -167,7 +169,7 @@ to exclude from transitive dependencies."
|
|||
(or (namespace dep) (name dep))))
|
||||
(.setArtifactId (name dep))
|
||||
(.setVersion version)
|
||||
(.setScope scope)
|
||||
(.setScope scope)
|
||||
(.setClassifier classifier)
|
||||
(.setType (or type "jar"))
|
||||
(.setExclusions es)))))
|
||||
|
@ -225,9 +227,9 @@ to exclude from transitive dependencies."
|
|||
(.setUrl (:url project))
|
||||
(.setBuild (make-build project)))]
|
||||
(doseq [dep (:dependencies project)]
|
||||
(.addDependency model (make-dependency dep nil)))
|
||||
(.addDependency model (make-dependency dep project)))
|
||||
(doseq [dev (:dev-dependencies project)]
|
||||
(.addDependency model (make-dependency dev "test")))
|
||||
(.addDependency model (make-dependency dev project "test")))
|
||||
(doseq [repo (repositories-for project)]
|
||||
(.addRepository model (make-repository repo)))
|
||||
(when-let [scm (make-git-scm (file (:root project) ".git"))]
|
||||
|
|
Loading…
Reference in a new issue