yogsototh/leiningen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move init-settings to core.

Browse source
This commit is contained in:
Phil Hagelberg 2011-03-21 20:52:07 -07:00
parent 0ab3468022
commit 9c1bc2d97b
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/leiningen/core.clj
View file

@ -100,11 +100,20 @@
;; TODO: remove from defaults in 2.0.
"clojure-snapshots" {:url "http://build.clojure.org/snapshots"
:releases false}
"clojars" "http://clojars.org/repo/"})
"clojars" {:url "http://clojars.org/repo/"}})
(defn- init-settings [id settings]
(cond (string? settings) {:url settings}
;; infer snapshots/release policy from repository id
(= "releases" id) (merge {:snapshots false} settings)
(= "snapshots" id) (merge {:releases false} settings)
:else settings))
(defn repositories-for [project]
(merge (when-not (:omit-default-repositories project) default-repos)
(:repositories project)))
(merge (when-not (:omit-default-repositories project)
default-repos)
(into {} (for [[id settings] (:repositories project)]
[id (init-settings id settings)]))))
(defn read-project
([file]

10
src/leiningen/deps.clj
View file

@ -30,13 +30,6 @@
(.addSnapshots repo (make-policy snapshots (:snapshots settings true)))
(.addReleases repo (make-policy releases (:releases settings true))))
(defn- init-settings [id settings]
(cond (string? settings) {:url settings}
;; infer snapshots/release policy from repository id
(= "releases" id) (merge {:snapshots false} settings)
(= "snapshots" id) (merge {:releases false} settings)
:else settings))
(defn make-auth [settings]
(let [user-options (when-let [user-opts (resolve 'user/leiningen-auth)]
(get @user-opts (:url settings)))
@ -51,8 +44,7 @@
auth)))
(defn make-repository [[id settings]]
(let [repo (RemoteRepository.)
settings (init-settings id settings)]
(let [repo (RemoteRepository.)]
(set-policies repo settings)
(.setId repo id)
(.setUrl repo (:url settings))