diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c30b486a89..744c64d127 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/GradleProjectProperties.java b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/GradleProjectProperties.java index 2ef4091c5b..446bfb8ccb 100644 --- a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/GradleProjectProperties.java +++ b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/GradleProjectProperties.java @@ -220,7 +220,14 @@ private static boolean isProgressFooterEnabled(Project project) { this.tempDirectoryProvider = tempDirectoryProvider; this.extensionLoader = extensionLoader; this.warProject = project.getPlugins().hasPlugin(WarPlugin.class); - this.defaultCacheDirectory = project.getLayout().getBuildDirectory().getAsFile().get().toPath().resolve(CACHE_DIRECTORY_NAME); + this.defaultCacheDirectory = + project + .getLayout() + .getBuildDirectory() + .getAsFile() + .get() + .toPath() + .resolve(CACHE_DIRECTORY_NAME); this.offline = project.getGradle().getStartParameter().isOffline(); this.version = project.getVersion() != null ? project.getVersion().toString() : ""; this.objectFactory = project.getObjects(); diff --git a/jib-gradle-plugin/src/test/java/com/google/cloud/tools/jib/gradle/skaffold/FilesTaskV2Test.java b/jib-gradle-plugin/src/test/java/com/google/cloud/tools/jib/gradle/skaffold/FilesTaskV2Test.java index 65e4872c15..00ebf3a4e1 100644 --- a/jib-gradle-plugin/src/test/java/com/google/cloud/tools/jib/gradle/skaffold/FilesTaskV2Test.java +++ b/jib-gradle-plugin/src/test/java/com/google/cloud/tools/jib/gradle/skaffold/FilesTaskV2Test.java @@ -65,7 +65,7 @@ class FilesTaskV2Test { @RegisterExtension public TestProject platformProject = - new TestProject("platform", tempDirPlatform).withGradleVersion("8.3"); + new TestProject("platform", tempDirPlatform).withGradleVersion("8.4"); /** * Verifies that the files task succeeded and returns the list of paths it prints out.