From d05cb2396682dfb4ba01d68f88bf5c5eb123ace9 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 3 Dec 2024 10:38:37 +0800
Subject: [PATCH] Move packages

---
 .../shadow/transformers/PropertiesFileTransformerSpec.groovy   | 2 +-
 .../gradle/plugins/shadow/util/repo/AbstractModule.groovy      | 2 +-
 .../shadow/transformers/ApacheNoticeResourceTransformerTest.kt | 2 +-
 .../plugins/shadow/transformers/AppendingTransformerTest.kt    | 2 +-
 .../shadow/transformers/ManifestAppenderTransformerTest.kt     | 2 +-
 .../shadow/transformers/PropertiesFileTransformerTest.kt       | 2 +-
 .../plugins/shadow/transformers/XmlAppendingTransformerTest.kt | 2 +-
 .../gradle/plugins/shadow/testkit/{util => }/HashUtil.kt       | 2 +-
 .../gradle/plugins/shadow/testkit/{util => }/HashValue.kt      | 3 +--
 .../gradle/plugins/shadow/testkit/{util => }/Utils.kt          | 2 +-
 10 files changed, 10 insertions(+), 11 deletions(-)
 rename src/testKit/kotlin/com/github/jengelman/gradle/plugins/shadow/testkit/{util => }/HashUtil.kt (96%)
 rename src/testKit/kotlin/com/github/jengelman/gradle/plugins/shadow/testkit/{util => }/HashValue.kt (83%)
 rename src/testKit/kotlin/com/github/jengelman/gradle/plugins/shadow/testkit/{util => }/Utils.kt (75%)

diff --git a/src/funcTest/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformerSpec.groovy b/src/funcTest/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformerSpec.groovy
index 6fc067a6b..a193fa3fe 100644
--- a/src/funcTest/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformerSpec.groovy
+++ b/src/funcTest/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformerSpec.groovy
@@ -22,7 +22,7 @@ package com.github.jengelman.gradle.plugins.shadow.transformers
 import com.github.jengelman.gradle.plugins.shadow.transformers.PropertiesFileTransformer.MergeStrategy
 import spock.lang.Unroll
 
-import static com.github.jengelman.gradle.plugins.shadow.testkit.util.Utils.testObjectFactory
+import static com.github.jengelman.gradle.plugins.shadow.testkit.Utils.getTestObjectFactory
 import static groovy.lang.Closure.IDENTITY
 
 @Unroll
diff --git a/src/funcTest/groovy/com/github/jengelman/gradle/plugins/shadow/util/repo/AbstractModule.groovy b/src/funcTest/groovy/com/github/jengelman/gradle/plugins/shadow/util/repo/AbstractModule.groovy
index 6ffc0dd05..607bebb72 100644
--- a/src/funcTest/groovy/com/github/jengelman/gradle/plugins/shadow/util/repo/AbstractModule.groovy
+++ b/src/funcTest/groovy/com/github/jengelman/gradle/plugins/shadow/util/repo/AbstractModule.groovy
@@ -1,6 +1,6 @@
 package com.github.jengelman.gradle.plugins.shadow.util.repo
 
-import com.github.jengelman.gradle.plugins.shadow.testkit.util.HashUtil
+import com.github.jengelman.gradle.plugins.shadow.testkit.HashUtil
 import com.github.jengelman.gradle.plugins.shadow.util.file.TestFile
 
 abstract class AbstractModule {
diff --git a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ApacheNoticeResourceTransformerTest.kt b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ApacheNoticeResourceTransformerTest.kt
index f8cf651ff..014da0387 100644
--- a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ApacheNoticeResourceTransformerTest.kt
+++ b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ApacheNoticeResourceTransformerTest.kt
@@ -4,7 +4,7 @@ import assertk.assertThat
 import assertk.assertions.isFalse
 import assertk.assertions.isTrue
 import assertk.fail
-import com.github.jengelman.gradle.plugins.shadow.testkit.util.testObjectFactory
+import com.github.jengelman.gradle.plugins.shadow.testkit.testObjectFactory
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 
diff --git a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/AppendingTransformerTest.kt b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/AppendingTransformerTest.kt
index 681000705..3edfc2743 100644
--- a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/AppendingTransformerTest.kt
+++ b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/AppendingTransformerTest.kt
@@ -3,7 +3,7 @@ package com.github.jengelman.gradle.plugins.shadow.transformers
 import assertk.assertThat
 import assertk.assertions.isFalse
 import assertk.assertions.isTrue
-import com.github.jengelman.gradle.plugins.shadow.testkit.util.testObjectFactory
+import com.github.jengelman.gradle.plugins.shadow.testkit.testObjectFactory
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 
diff --git a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ManifestAppenderTransformerTest.kt b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ManifestAppenderTransformerTest.kt
index 935c98da6..ab575c063 100644
--- a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ManifestAppenderTransformerTest.kt
+++ b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ManifestAppenderTransformerTest.kt
@@ -6,7 +6,7 @@ import assertk.assertions.isFalse
 import assertk.assertions.isGreaterThan
 import assertk.assertions.isNotEmpty
 import assertk.assertions.isTrue
-import com.github.jengelman.gradle.plugins.shadow.testkit.util.testObjectFactory
+import com.github.jengelman.gradle.plugins.shadow.testkit.testObjectFactory
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 
diff --git a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformerTest.kt b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformerTest.kt
index 81e084d43..78100bb5a 100644
--- a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformerTest.kt
+++ b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformerTest.kt
@@ -6,7 +6,7 @@ import assertk.assertions.isEqualTo
 import assertk.assertions.isFalse
 import assertk.assertions.isNotEmpty
 import assertk.assertions.isTrue
-import com.github.jengelman.gradle.plugins.shadow.testkit.util.testObjectFactory
+import com.github.jengelman.gradle.plugins.shadow.testkit.testObjectFactory
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 
diff --git a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/XmlAppendingTransformerTest.kt b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/XmlAppendingTransformerTest.kt
index 32895d9fc..22cd28e74 100644
--- a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/XmlAppendingTransformerTest.kt
+++ b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/XmlAppendingTransformerTest.kt
@@ -3,7 +3,7 @@ package com.github.jengelman.gradle.plugins.shadow.transformers
 import assertk.assertThat
 import assertk.assertions.isFalse
 import assertk.assertions.isTrue
-import com.github.jengelman.gradle.plugins.shadow.testkit.util.testObjectFactory
+import com.github.jengelman.gradle.plugins.shadow.testkit.testObjectFactory
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 
diff --git a/src/testKit/kotlin/com/github/jengelman/gradle/plugins/shadow/testkit/util/HashUtil.kt b/src/testKit/kotlin/com/github/jengelman/gradle/plugins/shadow/testkit/HashUtil.kt
similarity index 96%
rename from src/testKit/kotlin/com/github/jengelman/gradle/plugins/shadow/testkit/util/HashUtil.kt
rename to src/testKit/kotlin/com/github/jengelman/gradle/plugins/shadow/testkit/HashUtil.kt
index 85f361058..2476bc086 100644
--- a/src/testKit/kotlin/com/github/jengelman/gradle/plugins/shadow/testkit/util/HashUtil.kt
+++ b/src/testKit/kotlin/com/github/jengelman/gradle/plugins/shadow/testkit/HashUtil.kt
@@ -1,4 +1,4 @@
-package com.github.jengelman.gradle.plugins.shadow.testkit.util
+package com.github.jengelman.gradle.plugins.shadow.testkit
 
 import java.io.File
 import java.io.FileInputStream
diff --git a/src/testKit/kotlin/com/github/jengelman/gradle/plugins/shadow/testkit/util/HashValue.kt b/src/testKit/kotlin/com/github/jengelman/gradle/plugins/shadow/testkit/HashValue.kt
similarity index 83%
rename from src/testKit/kotlin/com/github/jengelman/gradle/plugins/shadow/testkit/util/HashValue.kt
rename to src/testKit/kotlin/com/github/jengelman/gradle/plugins/shadow/testkit/HashValue.kt
index 1b95eef62..38b3620b4 100644
--- a/src/testKit/kotlin/com/github/jengelman/gradle/plugins/shadow/testkit/util/HashValue.kt
+++ b/src/testKit/kotlin/com/github/jengelman/gradle/plugins/shadow/testkit/HashValue.kt
@@ -1,7 +1,6 @@
-package com.github.jengelman.gradle.plugins.shadow.testkit.util
+package com.github.jengelman.gradle.plugins.shadow.testkit
 
 import java.math.BigInteger
-import java.util.*
 
 class HashValue(digest: ByteArray) {
   private val digest = BigInteger(1, digest)
diff --git a/src/testKit/kotlin/com/github/jengelman/gradle/plugins/shadow/testkit/util/Utils.kt b/src/testKit/kotlin/com/github/jengelman/gradle/plugins/shadow/testkit/Utils.kt
similarity index 75%
rename from src/testKit/kotlin/com/github/jengelman/gradle/plugins/shadow/testkit/util/Utils.kt
rename to src/testKit/kotlin/com/github/jengelman/gradle/plugins/shadow/testkit/Utils.kt
index 0785681b0..8fbd60b9d 100644
--- a/src/testKit/kotlin/com/github/jengelman/gradle/plugins/shadow/testkit/util/Utils.kt
+++ b/src/testKit/kotlin/com/github/jengelman/gradle/plugins/shadow/testkit/Utils.kt
@@ -1,6 +1,6 @@
 @file:JvmName("Utils")
 
-package com.github.jengelman.gradle.plugins.shadow.testkit.util
+package com.github.jengelman.gradle.plugins.shadow.testkit
 
 import org.gradle.api.model.ObjectFactory
 import org.gradle.testfixtures.ProjectBuilder