Skip to content

Commit a8be591

Browse files
adammurdochadammurdoch
committed
Moved progress logging and styled text logging interfaces to live in their own packages.
1 parent 2e88b12 commit a8be591

152 files changed

Lines changed: 230 additions & 220 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎subprojects/build-comparison/src/main/groovy/org/gradle/api/plugins/buildcomparison/gradle/CompareGradleBuilds.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
import org.gradle.internal.resource.local.FileStore;
4040
import org.gradle.internal.resource.local.PathNormalisingKeyFileStore;
4141
import org.gradle.internal.logging.ConsoleRenderer;
42-
import org.gradle.internal.logging.ProgressLogger;
43-
import org.gradle.internal.logging.ProgressLoggerFactory;
42+
import org.gradle.internal.logging.progress.ProgressLogger;
43+
import org.gradle.internal.logging.progress.ProgressLoggerFactory;
4444
import org.gradle.util.GradleVersion;
4545

4646
import javax.inject.Inject;

‎subprojects/build-comparison/src/main/groovy/org/gradle/api/plugins/buildcomparison/gradle/internal/GradleBuildComparison.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.gradle.api.plugins.buildcomparison.render.internal.*;
3232
import org.gradle.api.plugins.buildcomparison.render.internal.html.GradleBuildComparisonResultHtmlRenderer;
3333
import org.gradle.api.plugins.buildcomparison.render.internal.html.HtmlRenderContext;
34-
import org.gradle.internal.logging.ProgressLogger;
34+
import org.gradle.internal.logging.progress.ProgressLogger;
3535
import org.gradle.tooling.GradleConnector;
3636
import org.gradle.tooling.ProjectConnection;
3737
import org.gradle.tooling.model.internal.outcomes.ProjectOutcomes;

‎subprojects/core/src/main/groovy/org/gradle/BuildExceptionReporter.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import org.gradle.internal.exceptions.LocationAwareException;
2424
import org.gradle.api.logging.configuration.LoggingConfiguration;
2525
import org.gradle.api.logging.configuration.ShowStacktrace;
26-
import org.gradle.internal.logging.StyledTextOutput;
27-
import org.gradle.internal.logging.StyledTextOutputFactory;
26+
import org.gradle.internal.logging.text.StyledTextOutput;
27+
import org.gradle.internal.logging.text.StyledTextOutputFactory;
2828
import org.gradle.internal.logging.internal.BufferingStyledTextOutput;
2929
import org.gradle.internal.logging.internal.LinePrefixingStyledTextOutput;
3030
import org.gradle.internal.logging.internal.LoggingCommandLineConverter;
@@ -33,7 +33,7 @@
3333

3434
import java.util.List;
3535

36-
import static org.gradle.internal.logging.StyledTextOutput.Style.*;
36+
import static org.gradle.internal.logging.text.StyledTextOutput.Style.*;
3737

3838
/**
3939
* A {@link BuildListener} which reports the build exception, if any.

‎subprojects/core/src/main/groovy/org/gradle/BuildLogger.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.gradle.api.invocation.Gradle;
2424
import org.gradle.api.logging.Logger;
2525
import org.gradle.initialization.BuildRequestMetaData;
26-
import org.gradle.internal.logging.StyledTextOutputFactory;
26+
import org.gradle.internal.logging.text.StyledTextOutputFactory;
2727

2828
import java.util.ArrayList;
2929
import java.util.List;

‎subprojects/core/src/main/groovy/org/gradle/BuildResultLogger.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
package org.gradle;
1717

1818
import org.gradle.api.logging.LogLevel;
19-
import org.gradle.internal.logging.StyledTextOutput;
20-
import org.gradle.internal.logging.StyledTextOutputFactory;
19+
import org.gradle.internal.logging.text.StyledTextOutput;
20+
import org.gradle.internal.logging.text.StyledTextOutputFactory;
2121
import org.gradle.util.Clock;
2222

23-
import static org.gradle.internal.logging.StyledTextOutput.Style.Failure;
24-
import static org.gradle.internal.logging.StyledTextOutput.Style.Success;
23+
import static org.gradle.internal.logging.text.StyledTextOutput.Style.Failure;
24+
import static org.gradle.internal.logging.text.StyledTextOutput.Style.Success;
2525

2626
/**
2727
* A {@link BuildListener} which logs the final result of the build.

‎subprojects/core/src/main/groovy/org/gradle/TaskExecutionLogger.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import org.gradle.api.invocation.Gradle;
2323
import org.gradle.api.tasks.TaskState;
2424
import org.gradle.internal.progress.LoggerProvider;
25-
import org.gradle.internal.logging.ProgressLogger;
26-
import org.gradle.internal.logging.ProgressLoggerFactory;
25+
import org.gradle.internal.logging.progress.ProgressLogger;
26+
import org.gradle.internal.logging.progress.ProgressLoggerFactory;
2727

2828
import java.util.HashMap;
2929
import java.util.Map;

‎subprojects/core/src/main/groovy/org/gradle/execution/TaskSelectionException.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import org.gradle.internal.exceptions.FailureResolutionAware;
2020
import org.gradle.api.InvalidUserDataException;
2121
import org.gradle.initialization.BuildClientMetaData;
22-
import org.gradle.internal.logging.StyledTextOutput;
22+
import org.gradle.internal.logging.text.StyledTextOutput;
2323

24-
import static org.gradle.internal.logging.StyledTextOutput.Style.UserInput;
24+
import static org.gradle.internal.logging.text.StyledTextOutput.Style.UserInput;
2525

2626
/**
2727
* A {@code TaskSelectionException} is thrown when the tasks to execute cannot be selected due to some user input problem.

‎subprojects/core/src/main/groovy/org/gradle/execution/commandline/TaskConfigurationException.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
import org.gradle.initialization.BuildClientMetaData;
2222
import org.gradle.internal.exceptions.Contextual;
2323
import org.gradle.internal.exceptions.FailureResolutionAware;
24-
import org.gradle.internal.logging.StyledTextOutput;
24+
import org.gradle.internal.logging.text.StyledTextOutput;
2525

26-
import static org.gradle.internal.logging.StyledTextOutput.Style.UserInput;
26+
import static org.gradle.internal.logging.text.StyledTextOutput.Style.UserInput;
2727

2828
@Contextual
2929
public class TaskConfigurationException extends GradleException implements FailureResolutionAware {

‎subprojects/core/src/main/groovy/org/gradle/execution/taskgraph/DefaultTaskExecutionPlan.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import org.gradle.internal.graph.DirectedGraph;
3939
import org.gradle.internal.graph.DirectedGraphRenderer;
4040
import org.gradle.internal.graph.GraphNodeRenderer;
41-
import org.gradle.internal.logging.StyledTextOutput;
41+
import org.gradle.internal.logging.text.StyledTextOutput;
4242
import org.gradle.util.CollectionUtils;
4343
import org.gradle.util.TextUtil;
4444

‎subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/FileCacheBackedScriptClassCompiler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
import org.gradle.initialization.ClassLoaderRegistry;
3131
import org.gradle.internal.UncheckedException;
3232
import org.gradle.internal.classloader.ClassLoaderVisitor;
33-
import org.gradle.internal.logging.ProgressLogger;
34-
import org.gradle.internal.logging.ProgressLoggerFactory;
33+
import org.gradle.internal.logging.progress.ProgressLogger;
34+
import org.gradle.internal.logging.progress.ProgressLoggerFactory;
3535
import org.gradle.model.dsl.internal.transform.RuleVisitor;
3636
import org.objectweb.asm.*;
3737

0 commit comments

Comments
 (0)