Skip to content

Move unused classes from org.gradle.util to org.gradle.util.internal package #16727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Apr 9, 2021
Merged

Move unused classes from org.gradle.util to org.gradle.util.internal package #16727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
af48416
Move Resources
donat Apr 7, 2021
54fb659
Move RedirectStdOutAndErr
donat Apr 7, 2021
ceccfdf
Move Swapper and StdInSwapper
donat Apr 7, 2021
d537b3b
Remove unused class DiffUtil
donat Apr 7, 2021
99d709a
Move ToBeImplemented
donat Apr 7, 2021
d70f06d
Move IncubationLogger
donat Apr 7, 2021
d496f3d
Remove unused NoopChangeListener
donat Apr 7, 2021
b771f41
Move RedirectStdIn
donat Apr 7, 2021
0d8a3b4
Move MultithreadedTestRule
donat Apr 7, 2021
42e97dd
Move DisconnectableInputStream and BulkReadInputStream
donat Apr 7, 2021
a0dd4d7
Move MockExecutor
donat Apr 7, 2021
9677742
Remove unused EnumWithClassBody
donat Apr 7, 2021
94ebe9e
Remove AlwaysTrue
donat Apr 7, 2021
fd20540
Move FailsWithMessage and FailsWithMessageExtension
donat Apr 7, 2021
4c13095
Remove unused ReflectionEqualsMatcher
donat Apr 7, 2021
6a7bf52
Remove unused DynamicDelegate
donat Apr 7, 2021
c9215b2
Mention moved and deleted classes in upgrade guide
donat Apr 7, 2021
a7ea0c8
Adjust upgrade guide text
donat Apr 7, 2021
527dad6
Merge branch 'master' into donat/deprecated/unused-util
donat Apr 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion subprojects/base-services/src/test/groovy/org/gradle/internal/id/LongIdGeneratorTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import org.junit.Test
import static org.hamcrest.CoreMatchers.*
import static org.junit.Assert.*

import org.gradle.util.MultithreadedTestRule
import org.gradle.util.internal.MultithreadedTestRule

class LongIdGeneratorTest {
private final LongIdGenerator generator = new LongIdGenerator()
Expand Down
2 changes: 1 addition & 1 deletion ...t/src/main/java/org/gradle/buildinit/plugins/internal/maven/PomProjectInitDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import org.gradle.buildinit.plugins.internal.modifiers.ComponentType;
import org.gradle.buildinit.plugins.internal.modifiers.Language;
import org.gradle.buildinit.plugins.internal.modifiers.ModularizationOption;
import org.gradle.util.IncubationLogger;
import org.gradle.util.internal.IncubationLogger;
import org.gradle.workers.WorkerExecutor;
import org.gradleinternal.buildinit.plugins.internal.maven.Maven2GradleWorkAction;
import org.gradleinternal.buildinit.plugins.internal.maven.MavenConversionException;
Expand Down
4 changes: 2 additions & 2 deletions ...y/org/gradle/api/plugins/quality/checkstyle/CheckstylePluginVersionIntegrationTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import org.gradle.internal.reflect.validation.ValidationMessageChecker
import org.gradle.internal.reflect.validation.ValidationTestFor
import org.gradle.quality.integtest.fixtures.CheckstyleCoverage
import org.gradle.util.Matchers
import org.gradle.util.Resources
import org.gradle.util.ToBeImplemented
import org.gradle.util.internal.Resources
import org.gradle.util.internal.ToBeImplemented
import org.hamcrest.Matcher
import org.junit.Rule
import spock.lang.IgnoreIf
Expand Down
2 changes: 1 addition & 1 deletion ...roovy/org/gradle/api/plugins/quality/codenarc/CodeNarcPluginVersionIntegrationTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import org.gradle.integtests.fixtures.TargetCoverage
import org.gradle.integtests.fixtures.executer.GradleContextualExecuter
import org.gradle.quality.integtest.fixtures.CodeNarcCoverage
import org.gradle.test.fixtures.file.TestFile
import org.gradle.util.ToBeImplemented
import org.gradle.util.internal.ToBeImplemented
import spock.lang.IgnoreIf
import spock.lang.Issue

Expand Down
2 changes: 1 addition & 1 deletion ...guration-cache/src/main/kotlin/org/gradle/configurationcache/DefaultConfigurationCache.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import org.gradle.internal.Factory
import org.gradle.internal.classpath.Instrumented
import org.gradle.internal.operations.BuildOperationExecutor
import org.gradle.internal.watch.vfs.BuildLifecycleAwareVirtualFileSystem
import org.gradle.util.IncubationLogger
import org.gradle.util.internal.IncubationLogger
import java.io.File
import java.io.FileInputStream
import java.io.OutputStream
Expand Down
2 changes: 1 addition & 1 deletion subprojects/core/src/integTest/groovy/org/gradle/api/FinalizerTaskIntegrationTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package org.gradle.api

import org.gradle.integtests.fixtures.AbstractIntegrationSpec
import org.gradle.util.ToBeImplemented
import org.gradle.util.internal.ToBeImplemented
import spock.lang.Ignore
import spock.lang.Issue
import spock.lang.Unroll
Expand Down
2 changes: 1 addition & 1 deletion ...vy/org/gradle/api/internal/changedetection/rules/OverlappingOutputsIntegrationTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package org.gradle.api.internal.changedetection.rules
import org.gradle.integtests.fixtures.AbstractIntegrationSpec
import org.gradle.integtests.fixtures.DirectoryBuildCacheFixture
import org.gradle.test.fixtures.file.TestFile
import org.gradle.util.ToBeImplemented
import org.gradle.util.internal.ToBeImplemented
import spock.lang.Unroll

class OverlappingOutputsIntegrationTest extends AbstractIntegrationSpec implements DirectoryBuildCacheFixture {
Expand Down
2 changes: 1 addition & 1 deletion subprojects/core/src/integTest/groovy/org/gradle/api/tasks/CopyTaskIntegrationSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import org.gradle.integtests.fixtures.AbstractIntegrationSpec
import org.gradle.integtests.fixtures.TestResources
import org.gradle.integtests.fixtures.ToBeFixedForConfigurationCache
import org.gradle.util.Matchers
import org.gradle.util.ToBeImplemented
import org.gradle.util.internal.ToBeImplemented
import org.junit.Rule
import spock.lang.Issue
import spock.lang.Unroll
Expand Down
2 changes: 1 addition & 1 deletion ...cts/core/src/integTest/groovy/org/gradle/api/tasks/IncrementalBuildIntegrationTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import org.gradle.internal.reflect.problems.ValidationProblemId
import org.gradle.internal.reflect.validation.ValidationMessageChecker
import org.gradle.internal.reflect.validation.ValidationTestFor
import org.gradle.test.fixtures.file.TestFile
import org.gradle.util.ToBeImplemented
import org.gradle.util.internal.ToBeImplemented
import spock.lang.Issue

class IncrementalBuildIntegrationTest extends AbstractIntegrationSpec implements ValidationMessageChecker {
Expand Down
2 changes: 1 addition & 1 deletion subprojects/core/src/integTest/groovy/org/gradle/api/tasks/NestedInputIntegrationTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import org.gradle.internal.reflect.problems.ValidationProblemId
import org.gradle.internal.reflect.validation.ValidationMessageChecker
import org.gradle.internal.reflect.validation.ValidationTestFor
import org.gradle.test.fixtures.file.TestFile
import org.gradle.util.ToBeImplemented
import org.gradle.util.internal.ToBeImplemented
import spock.lang.Issue
import spock.lang.Unroll

Expand Down
2 changes: 1 addition & 1 deletion ...est/groovy/org/gradle/cache/internal/DefaultGeneratedGradleJarCacheIntegrationTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import org.gradle.test.fixtures.ConcurrentTestUtil
import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
import org.gradle.testfixtures.internal.NativeServicesTestFixture
import org.gradle.util.GradleVersion
import org.gradle.util.RedirectStdOutAndErr
import org.gradle.util.internal.RedirectStdOutAndErr
import org.junit.Rule
import spock.lang.Specification

Expand Down
2 changes: 1 addition & 1 deletion .../integTest/groovy/org/gradle/process/internal/AbstractWorkerProcessIntegrationSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ import org.gradle.process.internal.worker.child.WorkerProcessClassPathProvider
import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
import org.gradle.testfixtures.internal.NativeServicesTestFixture
import org.gradle.util.GradleVersion
import org.gradle.util.RedirectStdOutAndErr
import org.gradle.util.internal.RedirectStdOutAndErr
import org.junit.Rule
import spock.lang.Shared
import spock.lang.Specification
Expand Down
2 changes: 1 addition & 1 deletion subprojects/core/src/main/java/org/gradle/configuration/DefaultProjectsPreparer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import org.gradle.initialization.ModelConfigurationListener;
import org.gradle.initialization.ProjectsEvaluatedNotifier;
import org.gradle.internal.operations.BuildOperationExecutor;
import org.gradle.util.IncubationLogger;
import org.gradle.util.internal.IncubationLogger;

public class DefaultProjectsPreparer implements ProjectsPreparer {
private final BuildOperationExecutor buildOperationExecutor;
Expand Down
2 changes: 1 addition & 1 deletion subprojects/core/src/main/java/org/gradle/execution/DefaultCancellableOperationManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import org.gradle.api.Action;
import org.gradle.initialization.BuildCancellationToken;
import org.gradle.internal.UncheckedException;
import org.gradle.util.DisconnectableInputStream;
import org.gradle.util.internal.DisconnectableInputStream;

import java.io.IOException;
import java.util.concurrent.ExecutorService;
Expand Down
2 changes: 1 addition & 1 deletion ...ts/core/src/main/java/org/gradle/process/internal/streams/ForwardStdinStreamsHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import org.gradle.api.UncheckedIOException;
import org.gradle.internal.UncheckedException;
import org.gradle.process.internal.StreamsHandler;
import org.gradle.util.DisconnectableInputStream;
import org.gradle.util.internal.DisconnectableInputStream;

import java.io.IOException;
import java.io.InputStream;
Expand Down
84 changes: 0 additions & 84 deletions subprojects/core/src/main/java/org/gradle/util/DiffUtil.java
View file
Open in desktop

This file was deleted.

31 changes: 0 additions & 31 deletions subprojects/core/src/main/java/org/gradle/util/NoOpChangeListener.java
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions .../org/gradle/util/BulkReadInputStream.java → ...le/util/internal/BulkReadInputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010 the original author or authors.
* Copyright 2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.gradle.util;
package org.gradle.util.internal;

import java.io.IOException;
import java.io.InputStream;
Expand Down
4 changes: 2 additions & 2 deletions ...radle/util/DisconnectableInputStream.java → ...l/internal/DisconnectableInputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010 the original author or authors.
* Copyright 2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.gradle.util;
package org.gradle.util.internal;

import org.gradle.api.Action;
import org.gradle.internal.UncheckedException;
Expand Down
4 changes: 2 additions & 2 deletions ...in/java/org/gradle/util/StdinSwapper.java → ...rg/gradle/util/internal/StdinSwapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2011 the original author or authors.
* Copyright 2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.gradle.util;
package org.gradle.util.internal;

import org.gradle.api.Action;
import org.gradle.internal.Factory;
Expand Down
4 changes: 2 additions & 2 deletions ...rc/main/java/org/gradle/util/Swapper.java → ...ava/org/gradle/util/internal/Swapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2011 the original author or authors.
* Copyright 2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.gradle.util;
package org.gradle.util.internal;

import org.gradle.api.Action;
import org.gradle.internal.Factory;
Expand Down
2 changes: 1 addition & 1 deletion subprojects/core/src/test/groovy/org/gradle/api/internal/file/archive/TarFileTreeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import org.gradle.api.resources.internal.LocalResourceAdapter;
import org.gradle.test.fixtures.file.TestFile;
import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider;
import org.gradle.util.Resources;
import org.gradle.util.internal.Resources;
import org.junit.Rule;
import org.junit.Test;

Expand Down
2 changes: 1 addition & 1 deletion subprojects/core/src/test/groovy/org/gradle/api/internal/file/archive/ZipFileTreeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import org.gradle.api.InvalidUserDataException;
import org.gradle.test.fixtures.file.TestFile;
import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider;
import org.gradle.util.Resources;
import org.gradle.util.internal.Resources;
import org.junit.Rule;
import org.junit.Test;

Expand Down
2 changes: 1 addition & 1 deletion subprojects/core/src/test/groovy/org/gradle/configuration/DefaultImportsReaderTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package org.gradle.configuration

import org.gradle.util.Resources
import org.gradle.util.internal.Resources
import org.junit.Rule
import spock.lang.Specification

Expand Down
2 changes: 1 addition & 1 deletion ...s/core/src/test/groovy/org/gradle/execution/DefaultCancellableOperationManagerTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package org.gradle.execution

import org.gradle.initialization.DefaultBuildCancellationToken
import org.gradle.test.fixtures.concurrent.ConcurrentSpec
import org.gradle.util.DisconnectableInputStream
import org.gradle.util.internal.DisconnectableInputStream
import spock.lang.AutoCleanup

import java.util.concurrent.Executors
Expand Down
2 changes: 1 addition & 1 deletion ...ts/core/src/test/groovy/org/gradle/execution/plan/DefaultExecutionPlanParallelTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import org.gradle.testfixtures.internal.NativeServicesTestFixture
import org.gradle.util.Path
import org.gradle.util.Requires
import org.gradle.util.TestPrecondition
import org.gradle.util.ToBeImplemented
import org.gradle.util.internal.ToBeImplemented
import spock.lang.Issue
import spock.lang.Unroll

Expand Down
2 changes: 1 addition & 1 deletion ...s/core/src/test/groovy/org/gradle/process/internal/worker/DefaultWorkerProcessSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import org.gradle.process.internal.ExecHandleListener
import org.gradle.process.internal.ExecHandleState
import org.gradle.process.internal.health.memory.JvmMemoryStatus
import org.gradle.test.fixtures.ConcurrentTestUtil
import org.gradle.util.MultithreadedTestRule
import org.gradle.util.internal.MultithreadedTestRule
import org.junit.Rule
import spock.lang.Specification

Expand Down
4 changes: 2 additions & 2 deletions subprojects/core/src/test/groovy/org/gradle/testfixtures/ProjectBuilderTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import org.gradle.internal.featurelifecycle.UsageLocationReporter
import org.gradle.internal.operations.BuildOperationProgressEventEmitter
import org.gradle.test.fixtures.file.LeaksFileHandles
import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
import org.gradle.util.IncubationLogger
import org.gradle.util.Resources
import org.gradle.util.internal.IncubationLogger
import org.gradle.util.internal.Resources
import org.junit.Rule
import spock.lang.Ignore
import spock.lang.Issue
Expand Down
2 changes: 2 additions & 0 deletions subprojects/core/src/test/groovy/org/gradle/util/ConcurrentSpecificationTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
*/
package org.gradle.util

import org.gradle.util.internal.FailsWithMessage

import java.util.concurrent.CountDownLatch
import java.util.concurrent.TimeUnit
import org.spockframework.mock.TooManyInvocationsError
Expand Down
Loading