Merge pull request #182 from Sineaggi/create-internal-collection-utils

gradle · Mar 30, 2023 · 2fff17d · 2fff17d
2 parents bd3c33b + 0b07bb1
commit 2fff17d
Show file tree

Hide file tree

Showing 24 changed files with 493 additions and 28 deletions.
diff --git a/src/integTest/groovy/org/gradle/playframework/PlayMultiVersionIntegrationTest.groovy b/src/integTest/groovy/org/gradle/playframework/PlayMultiVersionIntegrationTest.groovy
@@ -3,7 +3,7 @@ package org.gradle.playframework
 import org.gradle.playframework.fixtures.multiversion.PlayCoverage
 import org.gradle.playframework.fixtures.multiversion.PlayMultiVersionRunner
 import org.gradle.playframework.fixtures.multiversion.TargetCoverage
-import org.gradle.util.VersionNumber
+import org.gradle.playframework.util.VersionNumber
 import org.junit.runner.RunWith
 
 @RunWith(PlayMultiVersionRunner)

diff --git a/...vy/org/gradle/playframework/application/PlayDistributionApplicationIntegrationTest.groovy b/...vy/org/gradle/playframework/application/PlayDistributionApplicationIntegrationTest.groovy
@@ -2,12 +2,9 @@ package org.gradle.playframework.application
 
 import org.gradle.playframework.PlayMultiVersionApplicationIntegrationTest
 import org.gradle.playframework.fixtures.archive.ArchiveTestFixture
-import org.gradle.playframework.fixtures.archive.JarTestFixture
+import org.gradle.playframework.util.VersionNumber
 import org.gradle.testkit.runner.BuildResult
 import org.gradle.testkit.runner.TaskOutcome
-import org.gradle.util.VersionNumber
-
-import java.util.jar.Attributes
 
 import static org.gradle.playframework.plugins.PlayApplicationPlugin.ASSETS_JAR_TASK_NAME
 import static org.gradle.playframework.plugins.PlayRoutesPlugin.ROUTES_COMPILE_TASK_NAME

diff --git a/...tegTest/groovy/org/gradle/playframework/tasks/AbstractRoutesCompileIntegrationTest.groovy b/...tegTest/groovy/org/gradle/playframework/tasks/AbstractRoutesCompileIntegrationTest.groovy
@@ -1,9 +1,9 @@
 package org.gradle.playframework.tasks
 
 import org.gradle.playframework.PlayMultiVersionIntegrationTest
+import org.gradle.playframework.util.VersionNumber
 import org.gradle.testkit.runner.BuildResult
 import org.gradle.testkit.runner.TaskOutcome
-import org.gradle.util.VersionNumber
 import org.junit.Assume
 
 import static org.gradle.playframework.fixtures.Repositories.playRepositories

diff --git a/...integTest/groovy/org/gradle/playframework/tasks/Play24RoutesCompileIntegrationTest.groovy b/...integTest/groovy/org/gradle/playframework/tasks/Play24RoutesCompileIntegrationTest.groovy
@@ -1,8 +1,8 @@
 package org.gradle.playframework.tasks
 
+import org.gradle.playframework.util.VersionNumber
 import org.gradle.testkit.runner.BuildResult
 import org.gradle.testkit.runner.TaskOutcome
-import org.gradle.util.VersionNumber
 import org.junit.Assume
 
 class Play24RoutesCompileIntegrationTest extends AbstractRoutesCompileIntegrationTest {

diff --git a/src/integTest/groovy/org/gradle/playframework/tasks/TwirlCompileIntegrationTest.groovy b/src/integTest/groovy/org/gradle/playframework/tasks/TwirlCompileIntegrationTest.groovy
@@ -1,9 +1,9 @@
 package org.gradle.playframework.tasks
 
 import org.gradle.playframework.PlayMultiVersionIntegrationTest
+import org.gradle.playframework.util.VersionNumber
 import org.gradle.testkit.runner.BuildResult
 import org.gradle.testkit.runner.TaskOutcome
-import org.gradle.util.VersionNumber
 import org.junit.Assume
 import spock.lang.Unroll
 

diff --git a/src/integTestFixtures/groovy/org/gradle/playframework/fixtures/app/AdvancedPlayApp.groovy b/src/integTestFixtures/groovy/org/gradle/playframework/fixtures/app/AdvancedPlayApp.groovy
@@ -1,6 +1,6 @@
 package org.gradle.playframework.fixtures.app
 
-import org.gradle.util.VersionNumber
+import org.gradle.playframework.util.VersionNumber
 
 class AdvancedPlayApp extends PlayApp {
     AdvancedPlayApp(VersionNumber version) {

diff --git a/src/integTestFixtures/groovy/org/gradle/playframework/fixtures/app/BasicPlayApp.groovy b/src/integTestFixtures/groovy/org/gradle/playframework/fixtures/app/BasicPlayApp.groovy
@@ -1,6 +1,6 @@
 package org.gradle.playframework.fixtures.app
 
-import org.gradle.util.VersionNumber
+import org.gradle.playframework.util.VersionNumber
 
 class BasicPlayApp extends PlayApp {
     BasicPlayApp() {

diff --git a/src/integTestFixtures/groovy/org/gradle/playframework/fixtures/app/PlayApp.groovy b/src/integTestFixtures/groovy/org/gradle/playframework/fixtures/app/PlayApp.groovy
@@ -21,8 +21,8 @@ import freemarker.template.Configuration
 import freemarker.template.Template
 import freemarker.template.TemplateExceptionHandler
 import org.gradle.playframework.extensions.PlayPlatform
+import org.gradle.playframework.util.VersionNumber
 import org.gradle.util.RelativePathUtil
-import org.gradle.util.VersionNumber
 
 import static org.gradle.playframework.fixtures.Repositories.playRepositories
 

diff --git a/...gTestFixtures/groovy/org/gradle/playframework/fixtures/app/PlayAppWithDependencies.groovy b/...gTestFixtures/groovy/org/gradle/playframework/fixtures/app/PlayAppWithDependencies.groovy
@@ -1,6 +1,6 @@
 package org.gradle.playframework.fixtures.app
 
-import org.gradle.util.VersionNumber
+import org.gradle.playframework.util.VersionNumber
 
 class PlayAppWithDependencies extends PlayApp {
     PlayAppWithDependencies(VersionNumber version) {

diff --git a/src/integTestFixtures/groovy/org/gradle/playframework/fixtures/app/PlayCompositeBuild.groovy b/src/integTestFixtures/groovy/org/gradle/playframework/fixtures/app/PlayCompositeBuild.groovy
@@ -1,6 +1,6 @@
 package org.gradle.playframework.fixtures.app
 
-import org.gradle.util.VersionNumber
+import org.gradle.playframework.util.VersionNumber
 
 class PlayCompositeBuild extends PlayApp {
     PlayCompositeBuild(VersionNumber version) {

diff --git a/src/integTestFixtures/groovy/org/gradle/playframework/fixtures/app/PlayMultiProject.groovy b/src/integTestFixtures/groovy/org/gradle/playframework/fixtures/app/PlayMultiProject.groovy
@@ -1,6 +1,6 @@
 package org.gradle.playframework.fixtures.app
 
-import org.gradle.util.VersionNumber
+import org.gradle.playframework.util.VersionNumber
 
 class PlayMultiProject extends PlayApp {
 

diff --git a/...integTestFixtures/groovy/org/gradle/playframework/fixtures/app/WithFailingTestsApp.groovy b/...integTestFixtures/groovy/org/gradle/playframework/fixtures/app/WithFailingTestsApp.groovy
@@ -1,6 +1,6 @@
 package org.gradle.playframework.fixtures.app
 
-import org.gradle.util.VersionNumber
+import org.gradle.playframework.util.VersionNumber
 
 import static org.gradle.playframework.fixtures.Repositories.playRepositories
 

diff --git a/src/integTestFixtures/groovy/org/gradle/playframework/fixtures/ide/IdeaModuleFixture.groovy b/src/integTestFixtures/groovy/org/gradle/playframework/fixtures/ide/IdeaModuleFixture.groovy
@@ -3,7 +3,7 @@ package org.gradle.playframework.fixtures.ide
 import groovy.transform.ToString
 import groovy.util.slurpersupport.GPathResult
 import org.gradle.internal.Transformers
-import org.gradle.util.CollectionUtils
+import org.gradle.playframework.util.CollectionUtils
 
 class IdeaModuleFixture extends IdeProjectFixture {
     private final GPathResult iml

diff --git a/...tegTestFixtures/groovy/org/gradle/playframework/fixtures/multiversion/PlayCoverage.groovy b/...tegTestFixtures/groovy/org/gradle/playframework/fixtures/multiversion/PlayCoverage.groovy
@@ -1,6 +1,6 @@
 package org.gradle.playframework.fixtures.multiversion
 
-import org.gradle.util.VersionNumber
+import org.gradle.playframework.util.VersionNumber
 
 import static org.gradle.playframework.extensions.PlayPlatform.DEFAULT_PLAY_VERSION
 

diff --git a/...tures/groovy/org/gradle/playframework/fixtures/multiversion/PlayMultiVersionRunner.groovy b/...tures/groovy/org/gradle/playframework/fixtures/multiversion/PlayMultiVersionRunner.groovy
@@ -1,7 +1,6 @@
 package org.gradle.playframework.fixtures.multiversion
 
-import org.gradle.playframework.extensions.internal.PlayMajorVersion
-import org.gradle.util.VersionNumber
+import org.gradle.playframework.util.VersionNumber
 
 import java.lang.annotation.Annotation
 

diff --git a/src/main/java/org/gradle/playframework/extensions/PlayPlatform.java b/src/main/java/org/gradle/playframework/extensions/PlayPlatform.java
@@ -6,7 +6,7 @@
 import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.Internal;
-import org.gradle.util.VersionNumber;
+import org.gradle.playframework.util.VersionNumber;
 
 import javax.inject.Inject;
 

diff --git a/src/main/java/org/gradle/playframework/extensions/internal/PlayMajorVersion.java b/src/main/java/org/gradle/playframework/extensions/internal/PlayMajorVersion.java
@@ -2,7 +2,7 @@
 
 import org.gradle.playframework.extensions.PlayPlatform;
 import org.gradle.api.InvalidUserDataException;
-import org.gradle.util.VersionNumber;
+import org.gradle.playframework.util.VersionNumber;
 
 import java.util.Arrays;
 import java.util.List;

diff --git a/src/main/java/org/gradle/playframework/plugins/PlayApplicationPlugin.java b/src/main/java/org/gradle/playframework/plugins/PlayApplicationPlugin.java
@@ -23,7 +23,7 @@
 import org.gradle.playframework.tasks.PlayRun;
 import org.gradle.playframework.tasks.RoutesCompile;
 import org.gradle.playframework.tasks.TwirlCompile;
-import org.gradle.util.VersionNumber;
+import org.gradle.playframework.util.VersionNumber;
 
 import java.util.Arrays;
 

diff --git a/src/main/java/org/gradle/playframework/tools/internal/routes/RoutesCompilerFactory.java b/src/main/java/org/gradle/playframework/tools/internal/routes/RoutesCompilerFactory.java
@@ -2,7 +2,7 @@
 
 import org.gradle.playframework.extensions.PlayPlatform;
 import org.gradle.playframework.extensions.internal.PlayMajorVersion;
-import org.gradle.util.VersionNumber;
+import org.gradle.playframework.util.VersionNumber;
 
 public class RoutesCompilerFactory {
     public static RoutesCompiler create(PlayPlatform playPlatform) {

diff --git a/src/main/java/org/gradle/playframework/tools/internal/run/PlayRunAdapterV23X.java b/src/main/java/org/gradle/playframework/tools/internal/run/PlayRunAdapterV23X.java
@@ -1,6 +1,6 @@
 package org.gradle.playframework.tools.internal.run;
 
-import org.gradle.util.CollectionUtils;
+import org.gradle.playframework.util.CollectionUtils;
 
 import java.io.File;
 import java.util.List;

diff --git a/src/main/java/org/gradle/playframework/tools/internal/twirl/TwirlCompiler.java b/src/main/java/org/gradle/playframework/tools/internal/twirl/TwirlCompiler.java
@@ -9,7 +9,7 @@
 import org.gradle.internal.FileUtils;
 import org.gradle.playframework.tools.internal.scala.ScalaMethod;
 import org.gradle.playframework.tools.internal.scala.ScalaOptionInvocationWrapper;
-import org.gradle.util.CollectionUtils;
+import org.gradle.playframework.util.CollectionUtils;
 
 import java.io.File;
 import java.io.Serializable;

diff --git a/src/main/java/org/gradle/playframework/tools/internal/twirl/TwirlCompilerAdapterV13X.java b/src/main/java/org/gradle/playframework/tools/internal/twirl/TwirlCompilerAdapterV13X.java
@@ -3,12 +3,11 @@
 import org.gradle.playframework.sourcesets.TwirlImports;
 import org.gradle.playframework.sourcesets.TwirlTemplateFormat;
 import org.gradle.playframework.tools.internal.scala.ScalaCodecMapper;
-import org.gradle.playframework.tools.internal.scala.ScalaListBuffer;
 import org.gradle.playframework.tools.internal.scala.ScalaMethod;
 import org.gradle.playframework.tools.internal.scala.ScalaReflectionUtil;
 import org.gradle.playframework.tools.internal.scala.ScalaSeq;
-import org.gradle.util.CollectionUtils;
-import org.gradle.util.VersionNumber;
+import org.gradle.playframework.util.CollectionUtils;
+import org.gradle.playframework.util.VersionNumber;
 
 import java.io.File;
 import java.util.ArrayList;