Move CollectionUtils

dmvk · Apr 12, 2021 · 3c1c7f2 · 3c1c7f2
1 parent 29a32c8
commit 3c1c7f2
Show file tree

Hide file tree

Showing 158 changed files with 881 additions and 189 deletions.
diff --git a/...ects/base-services-groovy/src/main/java/org/gradle/api/InvalidActionClosureException.java b/...ects/base-services-groovy/src/main/java/org/gradle/api/InvalidActionClosureException.java
@@ -18,7 +18,7 @@
 
 import groovy.lang.Closure;
 import org.gradle.internal.Cast;
-import org.gradle.util.CollectionUtils;
+import org.gradle.util.internal.CollectionUtils;
 
 import java.util.List;
 

diff --git a/.../base-services-groovy/src/test/groovy/org/gradle/api/specs/AbstractCompositeSpecTest.java b/.../base-services-groovy/src/test/groovy/org/gradle/api/specs/AbstractCompositeSpecTest.java
@@ -15,7 +15,7 @@
  */
 package org.gradle.api.specs;
 
-import org.gradle.util.CollectionUtils;
+import org.gradle.util.internal.CollectionUtils;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/subprojects/base-services/src/main/java/org/gradle/internal/classpath/DefaultClassPath.java b/subprojects/base-services/src/main/java/org/gradle/internal/classpath/DefaultClassPath.java
@@ -20,7 +20,7 @@
 import org.gradle.api.specs.Spec;
 import org.gradle.internal.Cast;
 import org.gradle.internal.UncheckedException;
-import org.gradle.util.CollectionUtils;
+import org.gradle.util.internal.CollectionUtils;
 
 import java.io.File;
 import java.io.Serializable;

diff --git a/...jects/base-services/src/main/java/org/gradle/internal/work/DefaultWorkerLeaseService.java b/...jects/base-services/src/main/java/org/gradle/internal/work/DefaultWorkerLeaseService.java
@@ -38,7 +38,7 @@
 import org.gradle.internal.resources.ResourceLockState;
 import org.gradle.internal.time.Time;
 import org.gradle.internal.time.Timer;
-import org.gradle.util.CollectionUtils;
+import org.gradle.util.internal.CollectionUtils;
 import org.gradle.util.Path;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/subprojects/base-services/src/main/java/org/gradle/util/CollectionUtils.java b/subprojects/base-services/src/main/java/org/gradle/util/CollectionUtils.java
@@ -52,6 +52,15 @@
 import static org.gradle.internal.Cast.castNullable;
 import static org.gradle.internal.Cast.uncheckedNonnullCast;
 
+/**
+ * This class is only here to maintain binary compatibility with existing plugins.
+ * <p>
+ * Plugins should prefer external collection frameworks over this class.
+ * Internally, all code should use {@link org.gradle.util.internal.CollectionUtils}.
+ *
+ * @deprecated Will be removed in Gradle 8.0.
+ */
+@Deprecated
 public abstract class CollectionUtils {
 
     /**

diff --git a/subprojects/base-services/src/main/java/org/gradle/util/GFileUtils.java b/subprojects/base-services/src/main/java/org/gradle/util/GFileUtils.java
@@ -20,6 +20,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.gradle.api.UncheckedIOException;
 import org.gradle.internal.IoActions;
+import org.gradle.util.internal.CollectionUtils;
 import org.gradle.util.internal.LimitedDescription;
 
 import javax.annotation.Nullable;

diff --git a/subprojects/base-services/src/main/java/org/gradle/util/GUtil.java b/subprojects/base-services/src/main/java/org/gradle/util/GUtil.java
@@ -25,6 +25,7 @@
 import org.gradle.internal.IoActions;
 import org.gradle.internal.UncheckedException;
 import org.gradle.internal.io.StreamByteBuffer;
+import org.gradle.util.internal.CollectionUtils;
 
 import javax.annotation.Nullable;
 import java.io.File;