Merge pull request #48522 from Eng-Fouad/gradle-deprecated-3

Replace Gradle's deprecated buildIdentifier.getName() with newer API

Author: aloubyansky

devtools/gradle/gradle-model/src/main/java/io/quarkus/gradle/tooling/GradleApplicationModelBuilder.java

@@ -234,7 +234,7 @@ private static void addArtifactDependency(Project project, ApplicationModelBuild
         if (a.getId().getComponentIdentifier() instanceof ProjectComponentIdentifier) {
             ProjectComponentIdentifier projectComponentIdentifier = (ProjectComponentIdentifier) a.getId()
                     .getComponentIdentifier();
-            var includedBuild = ToolingUtils.includedBuild(project, projectComponentIdentifier.getBuild().getName());
+            var includedBuild = ToolingUtils.includedBuild(project, projectComponentIdentifier.getBuild().getBuildPath());
             final Project projectDep;
             if (includedBuild != null) {
                 projectDep = ToolingUtils.includedBuildProject((IncludedBuildInternal) includedBuild,
@@ -361,7 +361,7 @@ private void collectDependencies(org.gradle.api.artifacts.ResolvedDependency res
                 final String classifier = a.getClassifier();
                 if (classifier == null || classifier.isEmpty()) {
                     final IncludedBuild includedBuild = ToolingUtils.includedBuild(project.getRootProject(),
-                            compId.getBuild().getName());
+                            compId.getBuild().getBuildPath());
                     if (includedBuild != null) {
                         if (includedBuild instanceof IncludedBuildInternal ib) {
                             projectDep = ToolingUtils.includedBuildProject(ib, compId.getProjectPath());

devtools/gradle/gradle-model/src/main/java/io/quarkus/gradle/tooling/ToolingUtils.java

@@ -46,15 +46,15 @@ public static boolean isEnforcedPlatform(ModuleDependency module) {
                 || Category.REGULAR_PLATFORM.equals(category.getName()));
     }
 
-    public static IncludedBuild includedBuild(final Project project, final String buildName) {
+    public static IncludedBuild includedBuild(final Project project, final String buildPath) {
         Gradle currentGradle = project.getRootProject().getGradle();
         while (null != currentGradle) {
             for (IncludedBuild ib : currentGradle.getIncludedBuilds()) {
                 if (ib instanceof IncludedRootBuild) {
                     continue;
                 }
 
-                if (ib.getName().equals(buildName)) {
+                if (((IncludedBuildInternal) ib).getTarget().getBuildIdentifier().getBuildPath().equals(buildPath)) {
                     return ib;
                 }
             }

devtools/gradle/gradle-model/src/main/java/io/quarkus/gradle/tooling/dependency/DependencyUtils.java

@@ -96,7 +96,7 @@ public static ExtensionDependency<?> getExtensionInfoOrNull(Project project, Res
             projectDependency = getProjectExtensionDependencyOrNull(
                     project,
                     componentId.getProjectPath(),
-                    componentId.getBuild().getName());
+                    componentId.getBuild().getBuildPath());
 
             if (projectDependency != null)
                 return projectDependency;
@@ -198,10 +198,10 @@ private static Properties loadLocalExtensionDescriptor(Path descriptorPath) {
     public static ExtensionDependency<?> getProjectExtensionDependencyOrNull(
             Project project,
             String projectPath,
-            @Nullable String buildName) {
+            @Nullable String buildPath) {
         Project extensionProject = project.getRootProject().findProject(projectPath);
         if (extensionProject == null) {
-            IncludedBuild extProjIncludedBuild = ToolingUtils.includedBuild(project, buildName);
+            IncludedBuild extProjIncludedBuild = ToolingUtils.includedBuild(project, buildPath);
             if (extProjIncludedBuild instanceof IncludedBuildInternal) {
                 extensionProject = ToolingUtils
                         .includedBuildProject((IncludedBuildInternal) extProjIncludedBuild, projectPath);