java-command - TBUILD-14 Use :jvm-opts from aliases in basis, if provided

Author: puredanger

CHANGELOG.md

@@ -1,6 +1,8 @@
 Changelog
 ===========
 
+* next
+  * java-command - TBUILD-14 Use :jvm-opts from aliases in basis, if provided
 * v0.9.4 76b78fe on Mar 6, 2023
   * uber - exclude Emacs backup files from uberjar inclusion (useful with local/git deps)
   * uber - improve error message when file in local or git lib can't be read

deps.edn

@@ -2,7 +2,7 @@
 
  :deps
  {org.clojure/clojure {:mvn/version "1.11.1"}
-  org.clojure/tools.deps {:mvn/version "0.17.1297"}
+  org.clojure/tools.deps {:mvn/version "0.18.1354"}
   ;org.clojure/tools.deps {:git/url "https://github.com/clojure/tools.deps.git"
   ;                        :git/sha "459222ca6e4fce91cf5838435589a028cedbc784"}
   org.clojure/tools.namespace {:mvn/version "1.3.0"}

src/main/clojure/clojure/tools/build/api.clj

@@ -172,7 +172,7 @@
   Options:
     :java-cmd - Java command, default = $JAVA_CMD or 'java' on $PATH, or $JAVA_HOME/bin/java
     :cp - coll of string classpath entries, used first (if provided)
-    :basis - runtime basis used for classpath, used last (if provided)
+    :basis - runtime basis used for classpath and jvm opts from aliases, used last (if provided)
     :java-opts - coll of string jvm opts
     :main - required, main class symbol
     :main-args - coll of main class args

src/main/clojure/clojure/tools/build/tasks/process.clj

@@ -158,7 +158,8 @@
   [{:keys [java-cmd cp basis java-opts main main-args use-cp-file]
     :or {use-cp-file :auto} :as _params}]
   (let [cmd (or java-cmd (java-executable))
-        {:keys [classpath-roots]} basis
+        {:keys [classpath-roots argmap]} basis
         cp-entries (concat cp classpath-roots)
-        cp-str (deps/join-classpath cp-entries)]
-    {:command-args (make-java-args cmd java-opts cp-str main main-args use-cp-file)}))
+        cp-str (deps/join-classpath cp-entries)
+        combined-java-opts (concat java-opts (:jvm-opts argmap))]
+    {:command-args (make-java-args cmd combined-java-opts cp-str main main-args use-cp-file)}))

src/test/clojure/clojure/tools/build/tasks/test_process.clj

@@ -9,6 +9,8 @@
 (ns clojure.tools.build.tasks.test-process
   (:require
     [clojure.test :refer :all]
+    [clojure.set :as set]
+    [clojure.tools.build.api :as api]
     [clojure.tools.build.tasks.process :as process]))
 
 (deftest test-need-cp-file
@@ -18,4 +20,10 @@
       "Windows 10" "9.0.1" 10000 true
       "Windows 10" "9.0.1" 5000 false
       "Windows 10" "1.8.0_261" 10000 false
-      "Mac OS X" "17" 10000 false)))
+      "Mac OS X" "17" 10000 false)))
+
+(deftest test-java-process-uses-and-merges-basis-jvm-opts
+  (let [basis (api/create-basis {:extra {:aliases {:opts {:jvm-opts ["-Dhi=there"]}}}
+                                 :aliases [:opts]})
+        command (api/java-command {:basis basis, :main 'clojure.main, :java-opts ["-Dfoo=bar"]})]
+    (is (set/subset? #{"-Dhi=there" "-Dfoo=bar"} (set (:command-args command))))))