From ff948aaf39ff092b815251ed8b33ccb35836a7e1 Mon Sep 17 00:00:00 2001 From: bmatthews68 Date: Fri, 28 Nov 2025 21:47:57 +0300 Subject: [PATCH 1/3] Update _jibSkaffoldFilesV2 task to check the Gradle versions is not 9.0 or later before trying to access the settings file start parameter. --- .../google/cloud/tools/jib/gradle/skaffold/FilesTaskV2.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/skaffold/FilesTaskV2.java b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/skaffold/FilesTaskV2.java index fc15b021cf..4ea88ff2d9 100644 --- a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/skaffold/FilesTaskV2.java +++ b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/skaffold/FilesTaskV2.java @@ -41,6 +41,7 @@ import org.gradle.api.tasks.SourceSet; import org.gradle.api.tasks.SourceSetContainer; import org.gradle.api.tasks.TaskAction; +import org.gradle.util.GradleVersion; /** * Prints out changing source dependencies on a project. @@ -139,7 +140,7 @@ private void addGradleFiles(Project project) { skaffoldFilesOutput.addBuild(project.getBuildFile().toPath()); // Add settings.gradle - if (project.getGradle().getStartParameter().getSettingsFile() != null) { + if (GradleVersion.current().compareTo(GradleVersion.version("9.0")) < 0 && project.getGradle().getStartParameter().getSettingsFile() != null) { skaffoldFilesOutput.addBuild( project.getGradle().getStartParameter().getSettingsFile().toPath()); } else if (Files.exists(projectPath.resolve(Settings.DEFAULT_SETTINGS_FILE))) { From 4ffa4010c2d927a6da3430f3082d7df0e08c28b5 Mon Sep 17 00:00:00 2001 From: bmatthews68 Date: Fri, 28 Nov 2025 22:15:43 +0300 Subject: [PATCH 2/3] Use constant for Gradle version instead of using a magic literal string in conditional logic --- .../google/cloud/tools/jib/gradle/skaffold/FilesTaskV2.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/skaffold/FilesTaskV2.java b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/skaffold/FilesTaskV2.java index 4ea88ff2d9..45894cf61c 100644 --- a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/skaffold/FilesTaskV2.java +++ b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/skaffold/FilesTaskV2.java @@ -51,6 +51,8 @@ */ public class FilesTaskV2 extends DefaultTask { + private static final GradleVersion GRADLE_9 = GradleVersion.version("9.0"); + private final SkaffoldFilesOutput skaffoldFilesOutput = new SkaffoldFilesOutput(); @Nullable private JibExtension jibExtension; @@ -140,7 +142,7 @@ private void addGradleFiles(Project project) { skaffoldFilesOutput.addBuild(project.getBuildFile().toPath()); // Add settings.gradle - if (GradleVersion.current().compareTo(GradleVersion.version("9.0")) < 0 && project.getGradle().getStartParameter().getSettingsFile() != null) { + if (GradleVersion.current().compareTo(GRADLE_9) < 0 && project.getGradle().getStartParameter().getSettingsFile() != null) { skaffoldFilesOutput.addBuild( project.getGradle().getStartParameter().getSettingsFile().toPath()); } else if (Files.exists(projectPath.resolve(Settings.DEFAULT_SETTINGS_FILE))) { From 560b8c8e9dcb21c6500bf6b4d8828d12930a4db8 Mon Sep 17 00:00:00 2001 From: bmatthews68 Date: Wed, 3 Dec 2025 01:30:52 +0300 Subject: [PATCH 3/3] Formatted to adhere to the required guidelines --- .../google/cloud/tools/jib/gradle/skaffold/FilesTaskV2.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/skaffold/FilesTaskV2.java b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/skaffold/FilesTaskV2.java index 45894cf61c..e5e482d355 100644 --- a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/skaffold/FilesTaskV2.java +++ b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/skaffold/FilesTaskV2.java @@ -142,7 +142,8 @@ private void addGradleFiles(Project project) { skaffoldFilesOutput.addBuild(project.getBuildFile().toPath()); // Add settings.gradle - if (GradleVersion.current().compareTo(GRADLE_9) < 0 && project.getGradle().getStartParameter().getSettingsFile() != null) { + if (GradleVersion.current().compareTo(GRADLE_9) < 0 + && project.getGradle().getStartParameter().getSettingsFile() != null) { skaffoldFilesOutput.addBuild( project.getGradle().getStartParameter().getSettingsFile().toPath()); } else if (Files.exists(projectPath.resolve(Settings.DEFAULT_SETTINGS_FILE))) {