From 5b3eaeea73f3ee0a900f76e28854c6b7ff72d077 Mon Sep 17 00:00:00 2001 From: Claudia Rogoz Date: Tue, 7 Jan 2025 11:29:55 +0100 Subject: [PATCH 1/3] default includeAllJdks --- .../palantir/gradle/jdks/GradleJdksConfigs.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/GradleJdksConfigs.java b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/GradleJdksConfigs.java index e2f2808d..85bab42d 100644 --- a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/GradleJdksConfigs.java +++ b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/GradleJdksConfigs.java @@ -30,6 +30,7 @@ import org.gradle.api.tasks.Input; import org.gradle.api.tasks.Nested; import org.gradle.api.tasks.TaskAction; +import org.gradle.api.tasks.options.Option; import org.gradle.jvm.toolchain.JavaLanguageVersion; /** @@ -52,6 +53,15 @@ public abstract class GradleJdksConfigs extends DefaultTask { @Input public abstract MapProperty getCaCerts(); + /** + * Option to include a specific java major version when generating/checking the gradle jdk configuration files. + */ + @Input + @Option( + option = "includeAllJdks", + description = "Generates the configuration directories for all configured Java major versions.") + public abstract Property getIncludeAllJdks(); + abstract Directory gradleDirectory(); protected abstract void applyGradleJdkFileAction( @@ -65,6 +75,11 @@ protected abstract void applyGradleJdkFileAction( protected abstract void maybePrepareForAction(List targetPaths); + public GradleJdksConfigs() { + // TODO(crogoz): change to false, once we switch to using jdksExtension's jdkMajorVersionsToUse + getIncludeAllJdks().convention(true); + } + @TaskAction public final void action() { Path gradleJdksDir = gradleDirectory().dir("jdks").getAsFile().toPath(); From c1891e1930748cadcfa904dd6b069295e8a8006d Mon Sep 17 00:00:00 2001 From: svc-changelog Date: Tue, 7 Jan 2025 10:33:09 +0000 Subject: [PATCH 2/3] Add generated changelog entries --- changelog/@unreleased/pr-493.v2.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelog/@unreleased/pr-493.v2.yml diff --git a/changelog/@unreleased/pr-493.v2.yml b/changelog/@unreleased/pr-493.v2.yml new file mode 100644 index 00000000..aa90fd96 --- /dev/null +++ b/changelog/@unreleased/pr-493.v2.yml @@ -0,0 +1,5 @@ +type: fix +fix: + description: Add default includeAllJdks option to generateGradleJdkConfigs + links: + - https://github.com/palantir/gradle-jdks/pull/493 From 813d420849f3124550769492da2f233b3af3eb3b Mon Sep 17 00:00:00 2001 From: Claudia Rogoz Date: Thu, 9 Jan 2025 15:19:34 +0100 Subject: [PATCH 3/3] . --- .../main/java/com/palantir/gradle/jdks/GradleJdksConfigs.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/GradleJdksConfigs.java b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/GradleJdksConfigs.java index 85bab42d..0c124889 100644 --- a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/GradleJdksConfigs.java +++ b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/GradleJdksConfigs.java @@ -53,9 +53,6 @@ public abstract class GradleJdksConfigs extends DefaultTask { @Input public abstract MapProperty getCaCerts(); - /** - * Option to include a specific java major version when generating/checking the gradle jdk configuration files. - */ @Input @Option( option = "includeAllJdks",