Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

add local-repo project attribute to subproject map if it exists

  • Loading branch information...
commit 87b671e08a6cf3552ba37ee7011e99119090f74e 1 parent 10fec71
Edwin Park authored
Showing with 13 additions and 11 deletions.
  1. +13 −11 plugin/src/leiningen/cljsbuild/subproject.clj
View
24 plugin/src/leiningen/cljsbuild/subproject.clj
@@ -90,15 +90,17 @@
(defn make-subproject [project crossover-path builds]
(with-meta
- {:local-repo-classpath true
- :dependencies (merge-dependencies (:dependencies project))
- :repositories (:repositories project)
- :source-paths (concat
- (:source-paths project)
- (mapcat :source-paths builds)
- [crossover-path])
- :jvm-opts (:jvm-opts project)
- :resource-paths (:resource-paths project)
- :checkout-deps-shares (:checkout-deps-shares project)
- :eval-in (:eval-in project)}
+ (merge
+ (select-keys project [:checkout-deps-shares
+ :eval-in
+ :jvm-opts
+ :local-repo
+ :repositories
+ :resource-paths])
+ {:local-repo-classpath true
+ :dependencies (merge-dependencies (:dependencies project))
+ :source-paths (concat
+ (:source-paths project)
+ (mapcat :source-paths builds)
+ [crossover-path])})
(meta project)))
Please sign in to comment.
Something went wrong with that request. Please try again.