From c5bf1b53cb3be9072a659efe9613726b570d5b9c Mon Sep 17 00:00:00 2001 From: Phil Hagelberg Date: Tue, 16 Jan 2018 15:32:37 -0800 Subject: [PATCH] Fix a bug where :eval-in :leiningen was shadowed. --- leiningen-core/src/leiningen/core/project.clj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/leiningen-core/src/leiningen/core/project.clj b/leiningen-core/src/leiningen/core/project.clj index 8ab3b198..4145980b 100644 --- a/leiningen-core/src/leiningen/core/project.clj +++ b/leiningen-core/src/leiningen/core/project.clj @@ -224,6 +224,7 @@ ["vcs" "push"]] :pedantic? (quote ^:top-displace ranges) :jar-exclusions [#"^\."] + :eval-in :default :offline? (not (nil? (System/getenv "LEIN_OFFLINE"))) :uberjar-exclusions [#"(?i)^META-INF/[^/]*\.(SF|RSA|DSA)$"] :uberjar-merge-with {"META-INF/plexus/components.xml" @@ -343,8 +344,7 @@ (assoc :jvm-opts (or (:jvm-opts raw-map) (:java-opts raw-map))) (assoc :eval-in (or (:eval-in raw-map) (if (:eval-in-leiningen raw-map) - :leiningen - :default))) + :leiningen))) (dissoc :eval-in-leiningen :java-opts) (normalize-values))) (meta raw-map)))