Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Use :version-mvn for version ranges in dep metadata

  • Loading branch information...
commit 04319889e2f7936b7824433fe5982cb77aa0f324 1 parent 85c1d95
@Chouser Chouser authored
Showing with 11 additions and 11 deletions.
  1. +11 −11 src/leiningen/voom.clj
View
22 src/leiningen/voom.clj
@@ -1061,7 +1061,7 @@
- g. narrow proj dir changes to candidates by finding proj dir changes
with no childer proj dir changes in this set
"
- [proj-name {:keys [sha version repo branch path allow-snaps]
+ [proj-name {:keys [sha version-mvn repo branch path allow-snaps]
:or {allow-snaps true sha (l/lvar)}}]
(for [gitdir (all-repos-dirs)
:when (or (nil? repo) (= repo (-> (remotes gitdir) :origin :fetch)))
@@ -1091,16 +1091,16 @@
(conj shas-c branch-sha)
shas-c)
gvs (GenericVersionScheme.)
- version-constraint (when version
- (.parseVersionConstraint gvs version))
- candidates-d (if version
- (keep #(let [[candidate] (get sha-candidates-a %)]
- (when (.containsVersion
- version-constraint
- (.parseVersion gvs (:version candidate)))
- candidate))
- shas-c)
- (map (comp first sha-candidates-a) shas-c))
+ version-constraint (when version-mvn
+ (.parseVersionConstraint gvs version-mvn))
+ candidates-d (if version-mvn
+ (keep #(let [[candidate] (get sha-candidates-a %)]
+ (when (.containsVersion
+ version-constraint
+ (.parseVersion gvs (:version candidate)))
+ candidate))
+ shas-c)
+ (map (comp first sha-candidates-a) shas-c))
[_ max-ver-e] (apply compare-max
(map #(vector (when % (.parseVersion gvs %)) %)
(distinct (map :version candidates-d))))
Please sign in to comment.
Something went wrong with that request. Please try again.