Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #881 from hyPiRion/alias-java-opts-to-jvm-opts

Add :java-opts as an alias for :jvm-opts
  • Loading branch information...
commit 2b004681f97facc31cd10f1c9f46da8664fe952e 2 parents 5c59d28 + 493adef
@technomancy authored
View
4 leiningen-core/src/leiningen/core/project.clj
@@ -161,7 +161,9 @@
:resource-paths empty-paths
:test-paths empty-paths}
(-> (merge defaults project)
- (dissoc :eval-in-leiningen :omit-default-repositories)
+ (assoc :jvm-opts (or (:jvm-opts project) (:java-opts project)
+ (:jvm-opts defaults)))
+ (dissoc :eval-in-leiningen :omit-default-repositories :java-opts)
(assoc :eval-in (or (:eval-in project)
(if (:eval-in-leiningen project)
:leiningen, :subprocess))
View
1  sample.project.clj
@@ -248,6 +248,7 @@
;; symbol values will be resolved to find a function to call.
"Grunge-level" my.plugin/calculate-grunginess}
;; You can set JVM-level options here.
+ ;; It is also possible to use :java-opts, which is an alias for :jvm-opts.
:jvm-opts ["-Xmx1g"]
;; Control the context in which your project code is evaluated.
;; Defaults to :subprocess, but can also be :leiningen (for plugins)
Please sign in to comment.
Something went wrong with that request. Please try again.