Gradle 8.8-rc-1

nebula-plugins · Apr 26, 2024 · b83f337 · b83f337
1 parent e553e6f
commit b83f337
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-rc-1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/...om/netflix/nebula/lint/rule/dependency/provider/ClasspathBasedRecommendationProvider.java b/...om/netflix/nebula/lint/rule/dependency/provider/ClasspathBasedRecommendationProvider.java
@@ -19,12 +19,14 @@
 package com.netflix.nebula.lint.rule.dependency.provider;
 
 import groovy.transform.CompileStatic;
+import org.gradle.api.Action;
 import org.gradle.api.Project;
-import org.gradle.api.artifacts.Configuration;
-import org.gradle.api.artifacts.ConfigurationContainer;
-import org.gradle.api.artifacts.Dependency;
-import org.gradle.api.artifacts.DependencySet;
+import org.gradle.api.artifacts.*;
+import org.gradle.api.artifacts.component.ComponentIdentifier;
+import org.gradle.api.specs.Spec;
 import org.gradle.api.specs.Specs;
+import org.gradle.internal.deprecation.DeprecationLogger;
+import org.gradle.util.GradleVersion;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -59,7 +61,12 @@ Set<File> getBomsOnConfiguration() {
                         project.getDependencies()
                                 .create(dep.getGroup() + ":" + dep.getName() + ":" + dep.getVersion() + "@pom"));
 
-                Set<File> files = bomConf.getResolvedConfiguration().getLenientConfiguration().getFiles(Specs.SATISFIES_ALL);
+                final Set<File> files = new LinkedHashSet<>();
+                // TODO: Replace this following  https://docs.gradle.org/8.8-rc-1/userguide/upgrading_version_8.html#deprecate_filtered_configuration_file_and_filecollection_methods
+                DeprecationLogger.whileDisabled(() -> {
+                    files.addAll(bomConf.getResolvedConfiguration().getLenientConfiguration().getFiles(Specs.SATISFIES_ALL));
+                });
+
                 for (File file : files) {
                     if (shouldAddToBoms(file)) {
                         boms.add(file);