Skip to content

Remove deprecated getFiles() instead of getResolvedArtifacts() #43191

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

Closed
wants to merge 3 commits into from
Closed

Remove deprecated getFiles() instead of getResolvedArtifacts() #43191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ae940c
<add>: add flag to `compileJava` task for deprecated warnings.
wickdynex Nov 14, 2024
a7aff6b
<refactor>: use `getResolvedArtifacts()` instead of `getFiles()`.
wickdynex Nov 15, 2024
553f7f2
<adjust>: remove test code and adjust code format.
wickdynex Nov 15, 2024
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
1 change: 0 additions & 1 deletion buildSrc/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,4 +127,3 @@ eclipse.classpath.file.whenMerged {
jreEntry.entryAttributes['module'] = 'true'
jreEntry.entryAttributes['limit-modules'] = 'java.base'
}

19 changes: 12 additions & 7 deletions buildSrc/src/main/java/org/springframework/boot/build/bom/CheckBom.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import org.gradle.api.DefaultTask;
import org.gradle.api.GradleException;
import org.gradle.api.artifacts.ConfigurationContainer;
import org.gradle.api.artifacts.ResolvedArtifact;
import org.gradle.api.artifacts.dsl.DependencyHandler;
import org.gradle.api.tasks.TaskAction;

Expand All @@ -46,6 +47,7 @@
* Checks the validity of a bom.
*
* @author Andy Wilkinson
* @author Wick Dynex
*/
public abstract class CheckBom extends DefaultTask {

Expand Down Expand Up @@ -209,14 +211,17 @@ private void checkDependencyManagementAlignment(Library library, List<String> er

private File resolveBom(Library library, String alignsWithBom) {
String coordinates = alignsWithBom + ":" + library.getVersion().getVersion() + "@pom";
Set<File> files = this.configurations.detachedConfiguration(this.dependencies.create(coordinates))
.getResolvedConfiguration()
.getFiles();
if (files.size() != 1) {

Set<ResolvedArtifact> artifacts = this.configurations
.detachedConfiguration(this.dependencies.create(coordinates))
.getResolvedConfiguration()
.getResolvedArtifacts();

if (artifacts.size() != 1) {
throw new IllegalStateException(
"Expected a single file but '" + coordinates + "' resolved to " + files.size());
"Expected a single file but '" + coordinates + "' resolved to " + artifacts.size());
}
return files.iterator().next();
}

return artifacts.iterator().next().getFile();
}
}