From 8ccd27f9bf1531240f7de1360944ca59b62f7b82 Mon Sep 17 00:00:00 2001 From: Semyon Levin Date: Fri, 18 Aug 2023 14:23:50 -0700 Subject: [PATCH] [release-later] Gradle 8.3 compatibility --- .../gradle_plugins/sonarlint/BaseSonarLintInternals.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/name/remal/gradle_plugins/sonarlint/BaseSonarLintInternals.java b/src/main/java/name/remal/gradle_plugins/sonarlint/BaseSonarLintInternals.java index fbf5f89..0298153 100644 --- a/src/main/java/name/remal/gradle_plugins/sonarlint/BaseSonarLintInternals.java +++ b/src/main/java/name/remal/gradle_plugins/sonarlint/BaseSonarLintInternals.java @@ -9,7 +9,9 @@ import javax.inject.Inject; import lombok.Getter; import lombok.val; +import name.remal.gradle_plugins.toolkit.FileUtils; import org.gradle.api.file.ConfigurableFileCollection; +import org.gradle.api.file.Directory; import org.gradle.api.file.DirectoryProperty; import org.gradle.api.provider.Property; import org.gradle.api.tasks.InputFiles; @@ -43,7 +45,11 @@ public BaseSonarLintInternals(BaseSonarLint task) { getWorkerExecutor().set(getService(project, WorkerExecutor.class)); getRootDir().set(getRootDirOf(project)); getProjectDir().set(normalizeFile(project.getProjectDir())); - getBuildDir().set(normalizeFile(project.getBuildDir())); + getBuildDir().fileProvider( + project.getLayout().getBuildDirectory() + .map(Directory::getAsFile) + .map(FileUtils::normalizeFile) + ); getCodeFormattingFiles().setFrom(getCodeFormattingPathsFor(project)); }