From ba088f5bc60ab23762859e379cfea5d797d95dea Mon Sep 17 00:00:00 2001
From: Tad Fisher <tadfisher@gmail.com>
Date: Tue, 10 Oct 2023 10:52:04 -0700
Subject: [PATCH] Add --gradle-jdk argument

---
 app/src/main/kotlin/org/nixos/gradle2nix/GradleRunner.kt | 3 +++
 app/src/main/kotlin/org/nixos/gradle2nix/Main.kt         | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/app/src/main/kotlin/org/nixos/gradle2nix/GradleRunner.kt b/app/src/main/kotlin/org/nixos/gradle2nix/GradleRunner.kt
index a0368e8..d1fd211 100644
--- a/app/src/main/kotlin/org/nixos/gradle2nix/GradleRunner.kt
+++ b/app/src/main/kotlin/org/nixos/gradle2nix/GradleRunner.kt
@@ -23,6 +23,9 @@ fun ProjectConnection.build(
             } else {
                 forTasks(RESOLVE_ALL_TASK)
             }
+            if (config.gradleJdk != null) {
+                setJavaHome(config.gradleJdk)
+            }
             addArguments(config.gradleArgs)
             addArguments(
                 "--init-script=${config.appHome}/init.gradle",
diff --git a/app/src/main/kotlin/org/nixos/gradle2nix/Main.kt b/app/src/main/kotlin/org/nixos/gradle2nix/Main.kt
index 488f48f..9580351 100644
--- a/app/src/main/kotlin/org/nixos/gradle2nix/Main.kt
+++ b/app/src/main/kotlin/org/nixos/gradle2nix/Main.kt
@@ -20,6 +20,7 @@ data class Config(
     val appHome: File,
     val gradleHome: File,
     val gradleVersion: String?,
+    val gradleJdk: File?,
     val gradleArgs: List<String>,
     val projectFilter: String?,
     val configurationFilter: String?,
@@ -43,6 +44,12 @@ class Gradle2Nix : CliktCommand(
         help = "Use a specific Gradle version"
     )
 
+    private val gradleJdk: File? by option(
+        "--gradle-jdk", "-j",
+        metavar = "DIR",
+        help = "JDK home directory to use for launching Gradle (default: ${System.getProperty("java.home")})"
+    ).file(canBeFile = false, canBeDir = true)
+
     private val projectFilter: String? by option(
         "--projects", "-p",
         metavar = "REGEX",
@@ -115,6 +122,7 @@ class Gradle2Nix : CliktCommand(
             File(appHome),
             gradleHome,
             gradleVersion,
+            gradleJdk,
             gradleArgs,
             projectFilter,
             configurationFilter,