Move packages

GradleUp · Dec 3, 2024 · d05cb23 · d05cb23
1 parent 92ce4b7
commit d05cb23
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 11 deletions.
diff --git a/.../github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformerSpec.groovy b/.../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/...uncTest/groovy/com/github/jengelman/gradle/plugins/shadow/util/repo/AbstractModule.groovy b/...uncTest/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/...ithub/jengelman/gradle/plugins/shadow/transformers/ApacheNoticeResourceTransformerTest.kt b/...ithub/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/...otlin/com/github/jengelman/gradle/plugins/shadow/transformers/AppendingTransformerTest.kt b/...otlin/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/...om/github/jengelman/gradle/plugins/shadow/transformers/ManifestAppenderTransformerTest.kt b/...om/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/.../com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformerTest.kt b/.../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/...in/com/github/jengelman/gradle/plugins/shadow/transformers/XmlAppendingTransformerTest.kt b/...in/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/...e/plugins/shadow/testkit/util/HashUtil.kt → ...gradle/plugins/shadow/testkit/HashUtil.kt b/...e/plugins/shadow/testkit/util/HashUtil.kt → ...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/.../plugins/shadow/testkit/util/HashValue.kt → ...radle/plugins/shadow/testkit/HashValue.kt b/.../plugins/shadow/testkit/util/HashValue.kt → ...radle/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/...adle/plugins/shadow/testkit/util/Utils.kt → ...an/gradle/plugins/shadow/testkit/Utils.kt b/...adle/plugins/shadow/testkit/util/Utils.kt → ...an/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