File tree 14 files changed +28
-28
lines changed
modulecheck-api/src/testFixtures/kotlin/modulecheck/api/test
gradle/src/main/kotlin/modulecheck/parsing/gradle
groovy-antlr/src/main/kotlin/modulecheck/parsing/groovy/antlr
psi/src/main/kotlin/modulecheck/parsing/psi
modulecheck-plugin/src/main/kotlin/modulecheck/gradle
api/src/main/kotlin/modulecheck/project
impl/src/main/kotlin/modulecheck/project/impl
modulecheck-reporting/logging/src/main/kotlin/modulecheck/reporting/logging
main/kotlin/modulecheck/runtime
testFixtures/kotlin/modulecheck/runtime/test
14 files changed +28
-28
lines changed Original file line number Diff line number Diff line change 15
15
16
16
package modulecheck.api.test
17
17
18
- import modulecheck.reporting.logging.Logger
18
+ import modulecheck.reporting.logging.McLogger
19
19
import modulecheck.reporting.logging.Report
20
20
import modulecheck.reporting.logging.Report.ReportEntry
21
21
import modulecheck.reporting.logging.Report.ReportEntry.AppendNewLine
@@ -32,7 +32,7 @@ import modulecheck.reporting.logging.Report.ReportEntry.WarningLine
32
32
33
33
class ReportingLogger (
34
34
private val mirrorToStandardOut : Boolean = true
35
- ) : Logger {
35
+ ) : McLogger {
36
36
37
37
private val entries = mutableListOf<ReportEntry >()
38
38
Original file line number Diff line number Diff line change @@ -17,11 +17,11 @@ package modulecheck.parsing.gradle
17
17
18
18
import modulecheck.parsing.gradle.DependencyDeclaration.ConfigurationNameTransform
19
19
import modulecheck.parsing.gradle.ProjectPath.StringProjectPath
20
- import modulecheck.reporting.logging.Logger
20
+ import modulecheck.reporting.logging.McLogger
21
21
import modulecheck.utils.remove
22
22
23
23
abstract class DependenciesBlock (
24
- private val logger : Logger ,
24
+ private val logger : McLogger ,
25
25
suppressAll : List <String >,
26
26
private val configurationNameTransform : ConfigurationNameTransform
27
27
) : Block<DependencyDeclaration> {
@@ -239,7 +239,7 @@ abstract class DependenciesBlock(
239
239
val testFixturesRegex = " testFixtures\\ ([\\ s\\ S]*\\ )" .toRegex()
240
240
241
241
@Deprecated(" This will be removed soon." )
242
- private fun migrateLegacyIdOrNull (legacyID : String , logger : Logger ): String? {
242
+ private fun migrateLegacyIdOrNull (legacyID : String , logger : McLogger ): String? {
243
243
244
244
val migrated = when (legacyID) {
245
245
" useAnvilFactories" -> " use-anvil-factory-generation"
Original file line number Diff line number Diff line change 16
16
package modulecheck.parsing.groovy.antlr
17
17
18
18
import modulecheck.parsing.gradle.DependenciesBlock
19
- import modulecheck.reporting.logging.Logger
19
+ import modulecheck.reporting.logging.McLogger
20
20
21
21
class GroovyDependenciesBlock (
22
- logger : Logger ,
22
+ logger : McLogger ,
23
23
override val fullText : String ,
24
24
override val lambdaContent : String ,
25
25
suppressAll : List <String >
Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ import modulecheck.parsing.gradle.MavenCoordinates
22
22
import modulecheck.parsing.gradle.ProjectAccessor
23
23
import modulecheck.parsing.gradle.ProjectPath
24
24
import modulecheck.parsing.gradle.asConfigurationName
25
- import modulecheck.reporting.logging.Logger
25
+ import modulecheck.reporting.logging.McLogger
26
26
import org.apache.groovy.parser.antlr4.GroovyParser.BlockStatementContext
27
27
import org.apache.groovy.parser.antlr4.GroovyParser.ClosureContext
28
28
import org.apache.groovy.parser.antlr4.GroovyParser.ExpressionListElementContext
@@ -35,7 +35,7 @@ import java.io.File
35
35
import javax.inject.Inject
36
36
37
37
class GroovyDependencyBlockParser @Inject constructor(
38
- private val logger : Logger
38
+ private val logger : McLogger
39
39
) {
40
40
41
41
fun parse (file : File ): List <GroovyDependenciesBlock > = parse(file) {
Original file line number Diff line number Diff line change @@ -17,10 +17,10 @@ package modulecheck.parsing.psi
17
17
18
18
import modulecheck.parsing.gradle.DependenciesBlock
19
19
import modulecheck.parsing.gradle.DependencyDeclaration.ConfigurationNameTransform
20
- import modulecheck.reporting.logging.Logger
20
+ import modulecheck.reporting.logging.McLogger
21
21
22
22
class KotlinDependenciesBlock (
23
- logger : Logger ,
23
+ logger : McLogger ,
24
24
override val fullText : String ,
25
25
override val lambdaContent : String ,
26
26
suppressAll : List <String >,
Original file line number Diff line number Diff line change @@ -24,7 +24,7 @@ import modulecheck.parsing.gradle.buildFileInvocationText
24
24
import modulecheck.parsing.psi.internal.asKtFile
25
25
import modulecheck.parsing.psi.internal.getChildrenOfTypeRecursive
26
26
import modulecheck.parsing.psi.internal.nameSafe
27
- import modulecheck.reporting.logging.Logger
27
+ import modulecheck.reporting.logging.McLogger
28
28
import org.jetbrains.kotlin.com.intellij.psi.PsiWhiteSpace
29
29
import org.jetbrains.kotlin.psi.KtAnnotatedExpression
30
30
import org.jetbrains.kotlin.psi.KtBlockExpression
@@ -38,7 +38,7 @@ import org.jetbrains.kotlin.psi.psiUtil.getChildOfType
38
38
import javax.inject.Inject
39
39
40
40
class KotlinDependencyBlockParser @Inject constructor(
41
- private val logger : Logger
41
+ private val logger : McLogger
42
42
) {
43
43
44
44
@Suppress(" ReturnCount" )
Original file line number Diff line number Diff line change @@ -23,7 +23,7 @@ import dagger.assisted.AssistedFactory
23
23
import dagger.assisted.AssistedInject
24
24
import modulecheck.config.ModuleCheckSettings
25
25
import modulecheck.core.rule.KAPT_PLUGIN_ID
26
- import modulecheck.gradle.task.GradleLogger
26
+ import modulecheck.gradle.task.GradleMcLogger
27
27
import modulecheck.parsing.gradle.BuildFileParser
28
28
import modulecheck.parsing.gradle.ProjectPath.StringProjectPath
29
29
import modulecheck.parsing.gradle.asConfigurationName
@@ -50,7 +50,7 @@ class GradleProjectProvider @AssistedInject constructor(
50
50
private val rootGradleProject : GradleProject ,
51
51
private val settings : ModuleCheckSettings ,
52
52
override val projectCache : ProjectCache ,
53
- private val gradleLogger : GradleLogger ,
53
+ private val gradleLogger : GradleMcLogger ,
54
54
private val buildFileParserFactory : BuildFileParser .Factory ,
55
55
private val jvmFileProviderFactory : RealJvmFileProvider .Factory ,
56
56
private val androidPlatformPluginFactory : AndroidPlatformPluginFactory ,
Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ package modulecheck.gradle.task
18
18
import com.squareup.anvil.annotations.ContributesBinding
19
19
import modulecheck.dagger.AppScope
20
20
import modulecheck.gradle.GradleProject
21
- import modulecheck.reporting.logging.Logger
21
+ import modulecheck.reporting.logging.McLogger
22
22
import modulecheck.reporting.logging.Report
23
23
import modulecheck.reporting.logging.Report.ReportEntry.Failure
24
24
import modulecheck.reporting.logging.Report.ReportEntry.FailureHeader
@@ -36,9 +36,9 @@ import org.gradle.internal.logging.text.StyledTextOutputFactory
36
36
import javax.inject.Inject
37
37
38
38
@ContributesBinding(AppScope ::class )
39
- class GradleLogger @Inject constructor(
39
+ class GradleMcLogger @Inject constructor(
40
40
project : GradleProject
41
- ) : Logger {
41
+ ) : McLogger {
42
42
43
43
private val output: StyledTextOutput = project
44
44
.serviceOf<StyledTextOutputFactory >()
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ import modulecheck.parsing.gradle.SourceSets
27
27
import modulecheck.parsing.gradle.isAndroid
28
28
import modulecheck.parsing.source.AnvilGradlePlugin
29
29
import modulecheck.parsing.source.JavaVersion
30
- import modulecheck.reporting.logging.Logger
30
+ import modulecheck.reporting.logging.McLogger
31
31
import org.jetbrains.kotlin.name.FqName
32
32
import java.io.File
33
33
@@ -59,7 +59,7 @@ interface McProject :
59
59
override val hasAnvil: Boolean
60
60
get() = anvilGradlePlugin != null
61
61
62
- val logger: Logger
62
+ val logger: McLogger
63
63
val jvmFileProviderFactory: JvmFileProvider .Factory
64
64
65
65
val javaSourceVersion: JavaVersion
Original file line number Diff line number Diff line change @@ -29,7 +29,7 @@ import modulecheck.project.McProject
29
29
import modulecheck.project.ProjectCache
30
30
import modulecheck.project.ProjectContext
31
31
import modulecheck.project.ProjectDependencies
32
- import modulecheck.reporting.logging.Logger
32
+ import modulecheck.reporting.logging.McLogger
33
33
import org.jetbrains.kotlin.name.FqName
34
34
import java.io.File
35
35
@@ -42,7 +42,7 @@ class RealMcProject(
42
42
override val hasTestFixturesPlugin : Boolean ,
43
43
override val projectCache : ProjectCache ,
44
44
override val anvilGradlePlugin : AnvilGradlePlugin ? ,
45
- override val logger : Logger ,
45
+ override val logger : McLogger ,
46
46
override val jvmFileProviderFactory : JvmFileProvider .Factory ,
47
47
override val javaSourceVersion : JavaVersion ,
48
48
projectDependencies : Lazy <ProjectDependencies >,
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ import modulecheck.reporting.logging.Report.ReportEntry.SuccessLine
27
27
import modulecheck.reporting.logging.Report.ReportEntry.Warning
28
28
import modulecheck.reporting.logging.Report.ReportEntry.WarningLine
29
29
30
- interface Logger {
30
+ interface McLogger {
31
31
32
32
fun printReport (report : Report )
33
33
Original file line number Diff line number Diff line change 15
15
16
16
package modulecheck.reporting.logging
17
17
18
- class PrintLogger : Logger {
18
+ class PrintLogger : McLogger {
19
19
override fun printReport (report : Report ) {
20
20
println (report.joinToString())
21
21
}
Original file line number Diff line number Diff line change @@ -34,7 +34,7 @@ import modulecheck.reporting.console.DepthLogFactory
34
34
import modulecheck.reporting.console.DepthReportFactory
35
35
import modulecheck.reporting.console.ReportFactory
36
36
import modulecheck.reporting.graphviz.GraphvizFileWriter
37
- import modulecheck.reporting.logging.Logger
37
+ import modulecheck.reporting.logging.McLogger
38
38
import modulecheck.reporting.sarif.SarifReportFactory
39
39
import modulecheck.rule.FindingFactory
40
40
import modulecheck.utils.createSafely
@@ -54,7 +54,7 @@ import kotlin.system.measureTimeMillis
54
54
data class ModuleCheckRunner @AssistedInject constructor(
55
55
val settings : ModuleCheckSettings ,
56
56
val findingFactory : FindingFactory <out Finding >,
57
- val logger : Logger ,
57
+ val logger : McLogger ,
58
58
val findingResultFactory : FindingResultFactory ,
59
59
val reportFactory : ReportFactory ,
60
60
val checkstyleReporter : CheckstyleReporter ,
Original file line number Diff line number Diff line change @@ -32,7 +32,7 @@ import modulecheck.reporting.checkstyle.CheckstyleReporter
32
32
import modulecheck.reporting.console.ReportFactory
33
33
import modulecheck.reporting.graphviz.GraphvizFactory
34
34
import modulecheck.reporting.graphviz.GraphvizFileWriter
35
- import modulecheck.reporting.logging.Logger
35
+ import modulecheck.reporting.logging.McLogger
36
36
import modulecheck.reporting.sarif.SarifReportFactory
37
37
import modulecheck.rule.FindingFactory
38
38
import modulecheck.rule.RuleFactory
@@ -58,7 +58,7 @@ abstract class RunnerTest : ProjectTest() {
58
58
strictResolution : Boolean = false,
59
59
findingFactory : FindingFactory <out Finding > = this.findingFactory,
60
60
settings : ModuleCheckSettings = this.settings,
61
- logger : Logger = this.logger,
61
+ logger : McLogger = this.logger,
62
62
projectProvider : ProjectProvider = this.projectProvider,
63
63
findingResultFactory : FindingResultFactory = RealFindingResultFactory (),
64
64
reportFactory : ReportFactory = ReportFactory (),
You can’t perform that action at this time.
0 commit comments