Skip to content

Commit 9000916

Browse files
committed
Replace Gradle's deprecated buildIdentifier.getName() with newer API
1 parent a2e30b6 commit 9000916

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ private static void addArtifactDependency(Project project, ApplicationModelBuild
233233
if (a.getId().getComponentIdentifier() instanceof ProjectComponentIdentifier) {
234234
ProjectComponentIdentifier projectComponentIdentifier = (ProjectComponentIdentifier) a.getId()
235235
.getComponentIdentifier();
236-
var includedBuild = ToolingUtils.includedBuild(project, projectComponentIdentifier.getBuild().getName());
236+
var includedBuild = ToolingUtils.includedBuild(project, projectComponentIdentifier.getBuild().getBuildPath());
237237
final Project projectDep;
238238
if (includedBuild != null) {
239239
projectDep = ToolingUtils.includedBuildProject((IncludedBuildInternal) includedBuild,
@@ -360,7 +360,7 @@ private void collectDependencies(org.gradle.api.artifacts.ResolvedDependency res
360360
final String classifier = a.getClassifier();
361361
if (classifier == null || classifier.isEmpty()) {
362362
final IncludedBuild includedBuild = ToolingUtils.includedBuild(project.getRootProject(),
363-
compId.getBuild().getName());
363+
compId.getBuild().getBuildPath());
364364
if (includedBuild != null) {
365365
if (includedBuild instanceof IncludedBuildInternal ib) {
366366
projectDep = ToolingUtils.includedBuildProject(ib, compId.getProjectPath());

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ public static boolean isEnforcedPlatform(ModuleDependency module) {
4646
|| Category.REGULAR_PLATFORM.equals(category.getName()));
4747
}
4848

49-
public static IncludedBuild includedBuild(final Project project, final String buildName) {
49+
public static IncludedBuild includedBuild(final Project project, final String buildPath) {
5050
Gradle currentGradle = project.getRootProject().getGradle();
5151
while (null != currentGradle) {
5252
for (IncludedBuild ib : currentGradle.getIncludedBuilds()) {
5353
if (ib instanceof IncludedRootBuild) {
5454
continue;
5555
}
5656

57-
if (ib.getName().equals(buildName)) {
57+
if (((IncludedBuildInternal) ib).getTarget().getBuildIdentifier().getBuildPath().equals(buildPath)) {
5858
return ib;
5959
}
6060
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public static ExtensionDependency<?> getExtensionInfoOrNull(Project project, Res
9696
projectDependency = getProjectExtensionDependencyOrNull(
9797
project,
9898
componentId.getProjectPath(),
99-
componentId.getBuild().getName());
99+
componentId.getBuild().getBuildPath());
100100

101101
if (projectDependency != null)
102102
return projectDependency;
@@ -198,10 +198,10 @@ private static Properties loadLocalExtensionDescriptor(Path descriptorPath) {
198198
public static ExtensionDependency<?> getProjectExtensionDependencyOrNull(
199199
Project project,
200200
String projectPath,
201-
@Nullable String buildName) {
201+
@Nullable String buildPath) {
202202
Project extensionProject = project.getRootProject().findProject(projectPath);
203203
if (extensionProject == null) {
204-
IncludedBuild extProjIncludedBuild = ToolingUtils.includedBuild(project, buildName);
204+
IncludedBuild extProjIncludedBuild = ToolingUtils.includedBuild(project, buildPath);
205205
if (extProjIncludedBuild instanceof IncludedBuildInternal) {
206206
extensionProject = ToolingUtils
207207
.includedBuildProject((IncludedBuildInternal) extProjIncludedBuild, projectPath);

0 commit comments

Comments
 (0)