Do not depend on fastutil in :serialization (#28982)

gradle · Apr 26, 2024 · 841190b · 841190b
2 parents 23f65e6 + b15541e
commit 841190b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/platforms/core-runtime/serialization/build.gradle.kts b/platforms/core-runtime/serialization/build.gradle.kts
@@ -27,7 +27,6 @@ dependencies {
     api(projects.hashing)
     api(projects.javaLanguageExtensions)
 
-    api(libs.fastutil)
     api(libs.guava)
     api(libs.jsr305)
 

diff --git a/...a/src/main/java/org/gradle/api/internal/tasks/compile/incremental/deps/ClassAnalysis.java b/...a/src/main/java/org/gradle/api/internal/tasks/compile/incremental/deps/ClassAnalysis.java
@@ -23,7 +23,6 @@
 import org.gradle.internal.serialize.AbstractSerializer;
 import org.gradle.internal.serialize.Decoder;
 import org.gradle.internal.serialize.Encoder;
-import org.gradle.internal.serialize.IntSetSerializer;
 import org.gradle.internal.serialize.InterningStringSerializer;
 import org.gradle.internal.serialize.SetSerializer;
 

diff --git a/...ain/java/org/gradle/api/internal/tasks/compile/incremental/deps/ClassSetAnalysisData.java b/...ain/java/org/gradle/api/internal/tasks/compile/incremental/deps/ClassSetAnalysisData.java
@@ -28,13 +28,12 @@
 import org.gradle.api.internal.tasks.compile.incremental.compilerapi.CompilerApiData;
 import org.gradle.api.internal.tasks.compile.incremental.compilerapi.deps.DependentSetSerializer;
 import org.gradle.api.internal.tasks.compile.incremental.compilerapi.deps.DependentsSet;
-import org.gradle.internal.serialize.HierarchicalNameSerializer;
 import org.gradle.internal.hash.HashCode;
 import org.gradle.internal.serialize.AbstractSerializer;
 import org.gradle.internal.serialize.Decoder;
 import org.gradle.internal.serialize.Encoder;
 import org.gradle.internal.serialize.HashCodeSerializer;
-import org.gradle.internal.serialize.IntSetSerializer;
+import org.gradle.internal.serialize.HierarchicalNameSerializer;
 
 import java.util.ArrayDeque;
 import java.util.Collection;

diff --git a/.../internal/serialize/IntSetSerializer.java → ...le/incremental/deps/IntSetSerializer.java b/.../internal/serialize/IntSetSerializer.java → ...le/incremental/deps/IntSetSerializer.java
@@ -14,12 +14,15 @@
  * limitations under the License.
  */
 
-package org.gradle.internal.serialize;
+package org.gradle.api.internal.tasks.compile.incremental.deps;
 
 import it.unimi.dsi.fastutil.ints.IntIterator;
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import it.unimi.dsi.fastutil.ints.IntSet;
 import it.unimi.dsi.fastutil.ints.IntSets;
+import org.gradle.internal.serialize.Decoder;
+import org.gradle.internal.serialize.Encoder;
+import org.gradle.internal.serialize.Serializer;
 
 import java.io.EOFException;
 

diff --git a/testing/architecture-test/src/changes/archunit_store/internal-api-nullability.txt b/testing/architecture-test/src/changes/archunit_store/internal-api-nullability.txt
@@ -611,6 +611,7 @@ Class <org.gradle.api.internal.tasks.compile.incremental.deps.ClassSetAnalysis$C
 Class <org.gradle.api.internal.tasks.compile.incremental.deps.ClassSetAnalysis> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (ClassSetAnalysis.java:0)
 Class <org.gradle.api.internal.tasks.compile.incremental.deps.ClassSetAnalysisData$Serializer> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (ClassSetAnalysisData.java:0)
 Class <org.gradle.api.internal.tasks.compile.incremental.deps.ClassSetAnalysisData> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (ClassSetAnalysisData.java:0)
+Class <org.gradle.api.internal.tasks.compile.incremental.deps.IntSetSerializer> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (IntSetSerializer.java:0)
 Class <org.gradle.api.internal.tasks.compile.incremental.processing.AnnotationProcessingData$Serializer> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (AnnotationProcessingData.java:0)
 Class <org.gradle.api.internal.tasks.compile.incremental.processing.AnnotationProcessingData> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (AnnotationProcessingData.java:0)
 Class <org.gradle.api.internal.tasks.compile.incremental.processing.AnnotationProcessingResult> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (AnnotationProcessingResult.java:0)
@@ -2732,7 +2733,6 @@ Class <org.gradle.internal.serialize.FlushableEncoder> is not annotated (directl
 Class <org.gradle.internal.serialize.HashCodeSerializer> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (HashCodeSerializer.java:0)
 Class <org.gradle.internal.serialize.HierarchicalNameSerializer> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (HierarchicalNameSerializer.java:0)
 Class <org.gradle.internal.serialize.InputStreamBackedDecoder> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (InputStreamBackedDecoder.java:0)
-Class <org.gradle.internal.serialize.IntSetSerializer> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (IntSetSerializer.java:0)
 Class <org.gradle.internal.serialize.InterningStringSerializer> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (InterningStringSerializer.java:0)
 Class <org.gradle.internal.serialize.JavaClassUtil> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (JavaClassUtil.java:0)
 Class <org.gradle.internal.serialize.ListSerializer> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (ListSerializer.java:0)