sbl/gradle2nix
1
0
Fork 0
mirror of https://github.com/tadfisher/gradle2nix.git synced 2026-01-11 23:40:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add --gradle-jdk argument

Browse Source
This commit is contained in:
Tad Fisher
2023-10-10 10:52:04 -07:00
parent f618923fd0
commit ba088f5bc6
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/kotlin/org/nixos/gradle2nix/GradleRunner.kt
View File

@@ -23,6 +23,9 @@ fun ProjectConnection.build(
} else { } else {
forTasks(RESOLVE_ALL_TASK) forTasks(RESOLVE_ALL_TASK)
} }
if (config.gradleJdk != null) {
setJavaHome(config.gradleJdk)
}
addArguments(config.gradleArgs) addArguments(config.gradleArgs)
addArguments( addArguments(
"--init-script=${config.appHome}/init.gradle", "--init-script=${config.appHome}/init.gradle",

8
app/src/main/kotlin/org/nixos/gradle2nix/Main.kt
View File

@@ -20,6 +20,7 @@ data class Config(
val appHome: File, val appHome: File,
val gradleHome: File, val gradleHome: File,
val gradleVersion: String?, val gradleVersion: String?,
val gradleJdk: File?,
val gradleArgs: List<String>, val gradleArgs: List<String>,
val projectFilter: String?, val projectFilter: String?,
val configurationFilter: String?, val configurationFilter: String?,
@@ -43,6 +44,12 @@ class Gradle2Nix : CliktCommand(
help = "Use a specific Gradle version" 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( private val projectFilter: String? by option(
"--projects", "-p", "--projects", "-p",
metavar = "REGEX", metavar = "REGEX",
@@ -115,6 +122,7 @@ class Gradle2Nix : CliktCommand(
File(appHome), File(appHome),
gradleHome, gradleHome,
gradleVersion, gradleVersion,
gradleJdk,
gradleArgs, gradleArgs,
projectFilter, projectFilter,
configurationFilter, configurationFilter,