From 35103b0cd1a431684b1247dc6e964cf8aa6586c1 Mon Sep 17 00:00:00 2001 From: Victor Georgescu Date: Wed, 11 Oct 2023 23:58:32 +0300 Subject: [PATCH] Replace deprecated method getBuildDir() See gh-31416 --- .../main/java/org/springframework/build/api/ApiDiffPlugin.java | 3 ++- settings.gradle | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/java/org/springframework/build/api/ApiDiffPlugin.java b/buildSrc/src/main/java/org/springframework/build/api/ApiDiffPlugin.java index eee01370494..010cb3823fb 100644 --- a/buildSrc/src/main/java/org/springframework/build/api/ApiDiffPlugin.java +++ b/buildSrc/src/main/java/org/springframework/build/api/ApiDiffPlugin.java @@ -131,7 +131,8 @@ public class ApiDiffPlugin implements Plugin { } private File getOutputFile(String baseLineVersion, Project project) { - Path outDir = Paths.get(project.getRootProject().getBuildDir().getAbsolutePath(), + Path outDir = Paths.get(project.getRootProject() + .getLayout().getBuildDirectory().getAsFile().get().getAbsolutePath(), "reports", "api-diff", baseLineVersion + "_to_" + project.getRootProject().getVersion()); return project.file(outDir.resolve(project.getName() + ".html").toString()); diff --git a/settings.gradle b/settings.gradle index db9424fc990..764fc441d9d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -47,7 +47,7 @@ rootProject.children.each {project -> settings.gradle.projectsLoaded { gradleEnterprise { buildScan { - File buildDir = settings.gradle.rootProject.getBuildDir() + File buildDir = settings.gradle.rootProject.getLayout().getBuildDirectory().getAsFile().get() buildDir.mkdirs() new File(buildDir, "build-scan-uri.txt").text = "(build scan not generated)" buildScanPublished { scan ->