Skip to content

Replace Gradle's deprecated configuration.getFiles() with newer API #48523

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
Jun 22, 2025
Merged

Replace Gradle's deprecated configuration.getFiles() with newer API #48523

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: 5 additions & 4 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 @@ -23,6 +23,7 @@
import org.gradle.api.Project;
import org.gradle.api.Task;
import org.gradle.api.artifacts.Configuration;
import org.gradle.api.artifacts.ResolvableDependencies;
import org.gradle.api.artifacts.ResolvedArtifact;
import org.gradle.api.artifacts.ResolvedConfiguration;
import org.gradle.api.artifacts.component.ProjectComponentIdentifier;
Expand Down Expand Up @@ -121,7 +122,7 @@ public Object buildAll(String modelName, ModelParameter parameter, Project proje
.addReloadableWorkspaceModule(appArtifact.getKey())
.setPlatformImports(platformImports);

collectDependencies(classpathConfig.getResolvedConfiguration(), workspaceDiscovery,
collectDependencies(classpathConfig.getResolvedConfiguration(), classpathConfig.getIncoming(), workspaceDiscovery,
project, modelBuilder, appArtifact.getWorkspaceModule().mutable());
collectExtensionDependencies(project, deploymentConfig, modelBuilder);
addCompileOnly(project, classpathBuilder, modelBuilder);
Expand Down Expand Up @@ -266,14 +267,14 @@ private static void addArtifactDependency(Project project, ApplicationModelBuild
}
}

private void collectDependencies(ResolvedConfiguration configuration,
private void collectDependencies(ResolvedConfiguration configuration, ResolvableDependencies dependencies,
boolean workspaceDiscovery, Project project, ApplicationModelBuilder modelBuilder,
WorkspaceModule.Mutable wsModule) {

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
final Set<File> artifactFiles = resolvedArtifacts.size() < configuration.getFiles().size()
final Set<File> artifactFiles = resolvedArtifacts.size() < dependencies.getFiles().getFiles().size()
? new HashSet<>(resolvedArtifacts.size())
: null;

Expand All @@ -287,7 +288,7 @@ private void collectDependencies(ResolvedConfiguration configuration,

if (artifactFiles != null) {
// detect FS paths that aren't provided by the resolved artifacts
for (File f : configuration.getFiles()) {
for (File f : dependencies.getFiles().getFiles()) {
if (artifactFiles.contains(f) || !f.exists()) {
continue;
}
Expand Down
Loading