Skip to content

Avoid use of StartParameter.getSettingsFile() in _jibSkaffoldFilesV2 when Gradle version is 9 or higher #4462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mpeddada1 merged 3 commits into from
Dec 3, 2025
+5 −1
Merged

Avoid use of StartParameter.getSettingsFile() in _jibSkaffoldFilesV2 when Gradle version is 9 or higher #4462

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff948aa
Update _jibSkaffoldFilesV2 task to check the Gradle versions is not 9…
bmatthews68 Nov 28, 2025
4ffa401
Use constant for Gradle version instead of using a magic literal stri…
bmatthews68 Nov 28, 2025
560b8c8
Formatted to adhere to the required guidelines
bmatthews68 Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/skaffold/FilesTaskV2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -50,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;
Expand Down Expand Up @@ -139,7 +142,8 @@ private void addGradleFiles(Project project) {
skaffoldFilesOutput.addBuild(project.getBuildFile().toPath());

// Add settings.gradle
if (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))) {
Expand Down
Loading