Skip to content

Remove deprecated APIs that are removed from Gradle 9 #49305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 4, 2025
Merged

Remove deprecated APIs that are removed from Gradle 9 #49305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions ...dle-model/src/main/java/io/quarkus/gradle/dependency/DeploymentConfigurationResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,18 +150,13 @@ private Collection<Dependency> collectDirectDeploymentDeps(Map<ArtifactKey, Proc
!allRuntimeDeps.containsKey(
ArtifactKey.of(processedDep.ext.getDeploymentGroup(), processedDep.ext.getDeploymentName(),
ArtifactCoords.DEFAULT_CLASSIFIER, ArtifactCoords.TYPE_JAR))) {
directDeploymentDeps.add(getDeploymentDependency(processedDep.ext));
directDeploymentDeps
.add(DependencyUtils.createDeploymentDependency(project.getDependencies(), processedDep.ext));
}
}
return directDeploymentDeps;
}

private Dependency getDeploymentDependency(ExtensionDependency<?> ext) {
return ext.isProjectDependency()
? DependencyUtils.createDeploymentProjectDependency((Project) ext.getDeploymentModule(), taskDependencyFactory)
: DependencyUtils.createDeploymentDependency(project.getDependencies(), ext);
}

private boolean isWalkingFlagsOn(byte flags) {
return (walkingFlags & flags) == flags;
}
Expand Down
6 changes: 3 additions & 3 deletions ...e/gradle-model/src/main/java/io/quarkus/gradle/tooling/GradleApplicationModelBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ private void collectDependencies(ResolvedConfiguration configuration, Resolvable
boolean workspaceDiscovery, Project project, ApplicationModelBuilder modelBuilder,
WorkspaceModule.Mutable wsModule) {

final Set<File> artifactFiles = getArtifactFilesOrNull(configuration);
final Set<File> artifactFiles = getArtifactFilesOrNull(configuration, dependencies);
for (ResolvedDependency d : configuration.getFirstLevelModuleDependencies()) {
collectDependencies(d, workspaceDiscovery, project, artifactFiles, new HashSet<>(),
modelBuilder,
Expand Down Expand Up @@ -393,11 +393,11 @@ private void collectDependencies(ResolvedConfiguration configuration, Resolvable
}
}

private static Set<File> getArtifactFilesOrNull(ResolvedConfiguration configuration) {
private static Set<File> getArtifactFilesOrNull(ResolvedConfiguration configuration, ResolvableDependencies dependencies) {
final Set<ResolvedArtifact> resolvedArtifacts = configuration.getResolvedArtifacts();
// if the number of artifacts is less than the number of files then probably
// the project includes direct file dependencies
return resolvedArtifacts.size() < configuration.getFiles().size()
return resolvedArtifacts.size() < dependencies.getFiles().getFiles().size()
? new HashSet<>(resolvedArtifacts.size())
: null;
}
Expand Down
8 changes: 0 additions & 8 deletions ...adle/gradle-model/src/main/java/io/quarkus/gradle/tooling/dependency/DependencyUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@
import org.gradle.api.initialization.IncludedBuild;
import org.gradle.api.internal.artifacts.DefaultModuleVersionIdentifier;
import org.gradle.api.internal.artifacts.dependencies.DefaultExternalModuleDependency;
import org.gradle.api.internal.artifacts.dependencies.DefaultProjectDependency;
import org.gradle.api.internal.project.ProjectInternal;
import org.gradle.api.internal.tasks.TaskDependencyFactory;
import org.gradle.api.provider.ListProperty;
import org.gradle.api.tasks.SourceSet;
import org.gradle.api.tasks.SourceSetContainer;
Expand Down Expand Up @@ -377,11 +374,6 @@ private static Dependency createDeploymentProjectDependency(DependencyHandler ha
}
}

public static Dependency createDeploymentProjectDependency(Project project, TaskDependencyFactory taskDependencyFactory) {
return project.getDependencies().create(
new DefaultProjectDependency((ProjectInternal) project, true, taskDependencyFactory));
}

private static Dependency createArtifactDeploymentDependency(DependencyHandler handler,
ArtifactExtensionDependency dependency) {
return handler.create(dependency.getDeploymentModule().getGroupId() + ":"
Expand Down
Loading