Skip to content

Commit aa0c6fa

Browse files
RBusarowkodiakhq[bot]
authored andcommitted
rename modulecheck.reporting.logging.Logger to McLogger
This just distinguishes it from the other 50 "Logger" interfaces in a Gradle plugin's classpath, which makes IDE auto-import happy.
1 parent d1ec057 commit aa0c6fa

File tree

14 files changed

+28
-28
lines changed

14 files changed

+28
-28
lines changed

modulecheck-api/src/testFixtures/kotlin/modulecheck/api/test/ReportingLogger.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
package modulecheck.api.test
1717

18-
import modulecheck.reporting.logging.Logger
18+
import modulecheck.reporting.logging.McLogger
1919
import modulecheck.reporting.logging.Report
2020
import modulecheck.reporting.logging.Report.ReportEntry
2121
import modulecheck.reporting.logging.Report.ReportEntry.AppendNewLine
@@ -32,7 +32,7 @@ import modulecheck.reporting.logging.Report.ReportEntry.WarningLine
3232

3333
class ReportingLogger(
3434
private val mirrorToStandardOut: Boolean = true
35-
) : Logger {
35+
) : McLogger {
3636

3737
private val entries = mutableListOf<ReportEntry>()
3838

modulecheck-parsing/gradle/src/main/kotlin/modulecheck/parsing/gradle/DependenciesBlock.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ package modulecheck.parsing.gradle
1717

1818
import modulecheck.parsing.gradle.DependencyDeclaration.ConfigurationNameTransform
1919
import modulecheck.parsing.gradle.ProjectPath.StringProjectPath
20-
import modulecheck.reporting.logging.Logger
20+
import modulecheck.reporting.logging.McLogger
2121
import modulecheck.utils.remove
2222

2323
abstract class DependenciesBlock(
24-
private val logger: Logger,
24+
private val logger: McLogger,
2525
suppressAll: List<String>,
2626
private val configurationNameTransform: ConfigurationNameTransform
2727
) : Block<DependencyDeclaration> {
@@ -239,7 +239,7 @@ abstract class DependenciesBlock(
239239
val testFixturesRegex = "testFixtures\\([\\s\\S]*\\)".toRegex()
240240

241241
@Deprecated("This will be removed soon.")
242-
private fun migrateLegacyIdOrNull(legacyID: String, logger: Logger): String? {
242+
private fun migrateLegacyIdOrNull(legacyID: String, logger: McLogger): String? {
243243

244244
val migrated = when (legacyID) {
245245
"useAnvilFactories" -> "use-anvil-factory-generation"

modulecheck-parsing/groovy-antlr/src/main/kotlin/modulecheck/parsing/groovy/antlr/GroovyDependenciesBlock.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
package modulecheck.parsing.groovy.antlr
1717

1818
import modulecheck.parsing.gradle.DependenciesBlock
19-
import modulecheck.reporting.logging.Logger
19+
import modulecheck.reporting.logging.McLogger
2020

2121
class GroovyDependenciesBlock(
22-
logger: Logger,
22+
logger: McLogger,
2323
override val fullText: String,
2424
override val lambdaContent: String,
2525
suppressAll: List<String>

modulecheck-parsing/groovy-antlr/src/main/kotlin/modulecheck/parsing/groovy/antlr/GroovyDependencyBlockParser.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import modulecheck.parsing.gradle.MavenCoordinates
2222
import modulecheck.parsing.gradle.ProjectAccessor
2323
import modulecheck.parsing.gradle.ProjectPath
2424
import modulecheck.parsing.gradle.asConfigurationName
25-
import modulecheck.reporting.logging.Logger
25+
import modulecheck.reporting.logging.McLogger
2626
import org.apache.groovy.parser.antlr4.GroovyParser.BlockStatementContext
2727
import org.apache.groovy.parser.antlr4.GroovyParser.ClosureContext
2828
import org.apache.groovy.parser.antlr4.GroovyParser.ExpressionListElementContext
@@ -35,7 +35,7 @@ import java.io.File
3535
import javax.inject.Inject
3636

3737
class GroovyDependencyBlockParser @Inject constructor(
38-
private val logger: Logger
38+
private val logger: McLogger
3939
) {
4040

4141
fun parse(file: File): List<GroovyDependenciesBlock> = parse(file) {

modulecheck-parsing/psi/src/main/kotlin/modulecheck/parsing/psi/KotlinDependenciesBlock.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ package modulecheck.parsing.psi
1717

1818
import modulecheck.parsing.gradle.DependenciesBlock
1919
import modulecheck.parsing.gradle.DependencyDeclaration.ConfigurationNameTransform
20-
import modulecheck.reporting.logging.Logger
20+
import modulecheck.reporting.logging.McLogger
2121

2222
class KotlinDependenciesBlock(
23-
logger: Logger,
23+
logger: McLogger,
2424
override val fullText: String,
2525
override val lambdaContent: String,
2626
suppressAll: List<String>,

modulecheck-parsing/psi/src/main/kotlin/modulecheck/parsing/psi/KotlinDependencyBlockParser.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import modulecheck.parsing.gradle.buildFileInvocationText
2424
import modulecheck.parsing.psi.internal.asKtFile
2525
import modulecheck.parsing.psi.internal.getChildrenOfTypeRecursive
2626
import modulecheck.parsing.psi.internal.nameSafe
27-
import modulecheck.reporting.logging.Logger
27+
import modulecheck.reporting.logging.McLogger
2828
import org.jetbrains.kotlin.com.intellij.psi.PsiWhiteSpace
2929
import org.jetbrains.kotlin.psi.KtAnnotatedExpression
3030
import org.jetbrains.kotlin.psi.KtBlockExpression
@@ -38,7 +38,7 @@ import org.jetbrains.kotlin.psi.psiUtil.getChildOfType
3838
import javax.inject.Inject
3939

4040
class KotlinDependencyBlockParser @Inject constructor(
41-
private val logger: Logger
41+
private val logger: McLogger
4242
) {
4343

4444
@Suppress("ReturnCount")

modulecheck-plugin/src/main/kotlin/modulecheck/gradle/GradleProjectProvider.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import dagger.assisted.AssistedFactory
2323
import dagger.assisted.AssistedInject
2424
import modulecheck.config.ModuleCheckSettings
2525
import modulecheck.core.rule.KAPT_PLUGIN_ID
26-
import modulecheck.gradle.task.GradleLogger
26+
import modulecheck.gradle.task.GradleMcLogger
2727
import modulecheck.parsing.gradle.BuildFileParser
2828
import modulecheck.parsing.gradle.ProjectPath.StringProjectPath
2929
import modulecheck.parsing.gradle.asConfigurationName
@@ -50,7 +50,7 @@ class GradleProjectProvider @AssistedInject constructor(
5050
private val rootGradleProject: GradleProject,
5151
private val settings: ModuleCheckSettings,
5252
override val projectCache: ProjectCache,
53-
private val gradleLogger: GradleLogger,
53+
private val gradleLogger: GradleMcLogger,
5454
private val buildFileParserFactory: BuildFileParser.Factory,
5555
private val jvmFileProviderFactory: RealJvmFileProvider.Factory,
5656
private val androidPlatformPluginFactory: AndroidPlatformPluginFactory,

modulecheck-plugin/src/main/kotlin/modulecheck/gradle/task/GradleLogger.kt renamed to modulecheck-plugin/src/main/kotlin/modulecheck/gradle/task/GradleMcLogger.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package modulecheck.gradle.task
1818
import com.squareup.anvil.annotations.ContributesBinding
1919
import modulecheck.dagger.AppScope
2020
import modulecheck.gradle.GradleProject
21-
import modulecheck.reporting.logging.Logger
21+
import modulecheck.reporting.logging.McLogger
2222
import modulecheck.reporting.logging.Report
2323
import modulecheck.reporting.logging.Report.ReportEntry.Failure
2424
import modulecheck.reporting.logging.Report.ReportEntry.FailureHeader
@@ -36,9 +36,9 @@ import org.gradle.internal.logging.text.StyledTextOutputFactory
3636
import javax.inject.Inject
3737

3838
@ContributesBinding(AppScope::class)
39-
class GradleLogger @Inject constructor(
39+
class GradleMcLogger @Inject constructor(
4040
project: GradleProject
41-
) : Logger {
41+
) : McLogger {
4242

4343
private val output: StyledTextOutput = project
4444
.serviceOf<StyledTextOutputFactory>()

modulecheck-project/api/src/main/kotlin/modulecheck/project/McProject.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import modulecheck.parsing.gradle.SourceSets
2727
import modulecheck.parsing.gradle.isAndroid
2828
import modulecheck.parsing.source.AnvilGradlePlugin
2929
import modulecheck.parsing.source.JavaVersion
30-
import modulecheck.reporting.logging.Logger
30+
import modulecheck.reporting.logging.McLogger
3131
import org.jetbrains.kotlin.name.FqName
3232
import java.io.File
3333

@@ -59,7 +59,7 @@ interface McProject :
5959
override val hasAnvil: Boolean
6060
get() = anvilGradlePlugin != null
6161

62-
val logger: Logger
62+
val logger: McLogger
6363
val jvmFileProviderFactory: JvmFileProvider.Factory
6464

6565
val javaSourceVersion: JavaVersion

modulecheck-project/impl/src/main/kotlin/modulecheck/project/impl/RealMcProject.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import modulecheck.project.McProject
2929
import modulecheck.project.ProjectCache
3030
import modulecheck.project.ProjectContext
3131
import modulecheck.project.ProjectDependencies
32-
import modulecheck.reporting.logging.Logger
32+
import modulecheck.reporting.logging.McLogger
3333
import org.jetbrains.kotlin.name.FqName
3434
import java.io.File
3535

@@ -42,7 +42,7 @@ class RealMcProject(
4242
override val hasTestFixturesPlugin: Boolean,
4343
override val projectCache: ProjectCache,
4444
override val anvilGradlePlugin: AnvilGradlePlugin?,
45-
override val logger: Logger,
45+
override val logger: McLogger,
4646
override val jvmFileProviderFactory: JvmFileProvider.Factory,
4747
override val javaSourceVersion: JavaVersion,
4848
projectDependencies: Lazy<ProjectDependencies>,

modulecheck-reporting/logging/src/main/kotlin/modulecheck/reporting/logging/Logger.kt renamed to modulecheck-reporting/logging/src/main/kotlin/modulecheck/reporting/logging/McLogger.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import modulecheck.reporting.logging.Report.ReportEntry.SuccessLine
2727
import modulecheck.reporting.logging.Report.ReportEntry.Warning
2828
import modulecheck.reporting.logging.Report.ReportEntry.WarningLine
2929

30-
interface Logger {
30+
interface McLogger {
3131

3232
fun printReport(report: Report)
3333

modulecheck-reporting/logging/src/main/kotlin/modulecheck/reporting/logging/PrintLogger.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
package modulecheck.reporting.logging
1717

18-
class PrintLogger : Logger {
18+
class PrintLogger : McLogger {
1919
override fun printReport(report: Report) {
2020
println(report.joinToString())
2121
}

modulecheck-runtime/src/main/kotlin/modulecheck/runtime/ModuleCheckRunner.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import modulecheck.reporting.console.DepthLogFactory
3434
import modulecheck.reporting.console.DepthReportFactory
3535
import modulecheck.reporting.console.ReportFactory
3636
import modulecheck.reporting.graphviz.GraphvizFileWriter
37-
import modulecheck.reporting.logging.Logger
37+
import modulecheck.reporting.logging.McLogger
3838
import modulecheck.reporting.sarif.SarifReportFactory
3939
import modulecheck.rule.FindingFactory
4040
import modulecheck.utils.createSafely
@@ -54,7 +54,7 @@ import kotlin.system.measureTimeMillis
5454
data class ModuleCheckRunner @AssistedInject constructor(
5555
val settings: ModuleCheckSettings,
5656
val findingFactory: FindingFactory<out Finding>,
57-
val logger: Logger,
57+
val logger: McLogger,
5858
val findingResultFactory: FindingResultFactory,
5959
val reportFactory: ReportFactory,
6060
val checkstyleReporter: CheckstyleReporter,

modulecheck-runtime/src/testFixtures/kotlin/modulecheck/runtime/test/RunnerTest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import modulecheck.reporting.checkstyle.CheckstyleReporter
3232
import modulecheck.reporting.console.ReportFactory
3333
import modulecheck.reporting.graphviz.GraphvizFactory
3434
import modulecheck.reporting.graphviz.GraphvizFileWriter
35-
import modulecheck.reporting.logging.Logger
35+
import modulecheck.reporting.logging.McLogger
3636
import modulecheck.reporting.sarif.SarifReportFactory
3737
import modulecheck.rule.FindingFactory
3838
import modulecheck.rule.RuleFactory
@@ -58,7 +58,7 @@ abstract class RunnerTest : ProjectTest() {
5858
strictResolution: Boolean = false,
5959
findingFactory: FindingFactory<out Finding> = this.findingFactory,
6060
settings: ModuleCheckSettings = this.settings,
61-
logger: Logger = this.logger,
61+
logger: McLogger = this.logger,
6262
projectProvider: ProjectProvider = this.projectProvider,
6363
findingResultFactory: FindingResultFactory = RealFindingResultFactory(),
6464
reportFactory: ReportFactory = ReportFactory(),

0 commit comments

Comments
 (0)