diff --git a/lein-template/resources/leiningen/new/duct/base/project.clj b/lein-template/resources/leiningen/new/duct/base/project.clj index cb7bf7b..ac318a2 100644 --- a/lein-template/resources/leiningen/new/duct/base/project.clj +++ b/lein-template/resources/leiningen/new/duct/base/project.clj @@ -3,14 +3,8 @@ :url "http://example.com/FIXME" :min-lein-version "2.0.0" :dependencies [[org.clojure/clojure "1.10.0"] - [duct/core "0.7.0"] - [duct/module.logging "0.4.0"]{{#web?}} - [duct/module.web "0.7.0"]{{/web?}}{{#ataraxy?}} - [duct/module.ataraxy "0.3.0"]{{/ataraxy?}}{{#cljs?}} - [duct/module.cljs "0.4.0"]{{/cljs?}}{{#jdbc?}} - [duct/module.sql "0.5.0"]{{/jdbc?}}{{#postgres?}} - [org.postgresql/postgresql "42.2.5"]{{/postgres?}}{{#sqlite?}} - [org.xerial/sqlite-jdbc "3.25.2"]{{/sqlite?}}] + [duct/core "0.7.0"]{{#deps}} + {{&.}}{{/deps}}] :plugins [[duct/lein-duct "0.11.2"]] :main ^:skip-aot {{namespace}}.main{{#uberjar-name}} :uberjar-name "{{uberjar-name}}"{{/uberjar-name}} @@ -28,5 +22,5 @@ :project/dev {:source-paths ["dev/src"] :resource-paths ["dev/resources"] :dependencies [[integrant/repl "0.3.1"] - [eftest "0.5.4"]{{#web?}} - [kerodon "0.9.0"]{{/web?}}]}}) + [eftest "0.5.4"]{{#dev-deps}} + {{&.}}{{/dev-deps}}]}}) diff --git a/lein-template/src/leiningen/new/duct.clj b/lein-template/src/leiningen/new/duct.clj index a7bc570..0372520 100644 --- a/lein-template/src/leiningen/new/duct.clj +++ b/lein-template/src/leiningen/new/duct.clj @@ -15,7 +15,8 @@ :profiles (set profiles)})) (defn base-profile [{:keys [project-name project-ns project-path raw-name]}] - {:vars + {:deps '[[duct/module.logging "0.4.0"]] + :vars {:raw-name raw-name :name project-name :namespace project-ns @@ -49,7 +50,7 @@ (var-get (resolve sym)))) (defn merge-deps [a b] - (-> {} (into a) (into b) vec)) + (-> (sorted-map) (into a) (into b) vec)) (defn merge-profiles [a b] {:vars (merge (:vars a) (:vars b))