From fdd3bc31f13e3f249e903b9dca4356dce4a7fd91 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 24 Nov 2016 15:48:42 +0300 Subject: [PATCH] Rename: IncReporter->ICReporter --- .../kotlin/incremental/{IncReporter.kt => ICReporter.kt} | 2 +- .../src/org/jetbrains/kotlin/incremental/buildUtil.kt | 6 +++--- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 4 ++-- .../main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt | 2 +- .../{GradleIncReporter.kt => GradleICReporter.kt} | 4 ++-- .../kotlin/incremental/IncrementalJvmCompilerRunner.kt | 6 +++--- .../incremental/multiproject/ArtifactDifferenceRegistry.kt | 4 ++-- .../KotlinStandaloneIncrementalCompilationTest.kt | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) rename build-common/src/org/jetbrains/kotlin/incremental/{IncReporter.kt => ICReporter.kt} (97%) rename libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/{GradleIncReporter.kt => GradleICReporter.kt} (86%) diff --git a/build-common/src/org/jetbrains/kotlin/incremental/IncReporter.kt b/build-common/src/org/jetbrains/kotlin/incremental/ICReporter.kt similarity index 97% rename from build-common/src/org/jetbrains/kotlin/incremental/IncReporter.kt rename to build-common/src/org/jetbrains/kotlin/incremental/ICReporter.kt index b6d1dc42cdb..a96a53603e3 100644 --- a/build-common/src/org/jetbrains/kotlin/incremental/IncReporter.kt +++ b/build-common/src/org/jetbrains/kotlin/incremental/ICReporter.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.incremental import org.jetbrains.kotlin.cli.common.ExitCode import java.io.File -abstract class IncReporter { +abstract class ICReporter { abstract fun report(message: ()->String) // used in Gradle plugin diff --git a/build-common/src/org/jetbrains/kotlin/incremental/buildUtil.kt b/build-common/src/org/jetbrains/kotlin/incremental/buildUtil.kt index 679b4a5ba5c..c000fef56e0 100644 --- a/build-common/src/org/jetbrains/kotlin/incremental/buildUtil.kt +++ b/build-common/src/org/jetbrains/kotlin/incremental/buildUtil.kt @@ -182,7 +182,7 @@ data class DirtyData( fun CompilationResult.getDirtyData( caches: Iterable>, - reporter: IncReporter + reporter: ICReporter ): DirtyData { val dirtyLookupSymbols = HashSet() val dirtyClassesFqNames = HashSet() @@ -220,7 +220,7 @@ fun CompilationResult.getDirtyData( fun mapLookupSymbolsToFiles( lookupStorage: LookupStorage, lookupSymbols: Iterable, - reporter: IncReporter, + reporter: ICReporter, excludes: Set = emptySet() ): Set { val dirtyFiles = HashSet() @@ -237,7 +237,7 @@ fun mapLookupSymbolsToFiles( fun mapClassesFqNamesToFiles( caches: Iterable>, classesFqNames: Iterable, - reporter: IncReporter, + reporter: ICReporter, excludes: Set = emptySet() ): Set { val dirtyFiles = HashSet() diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index e1e672c9def..1b7a2106aac 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -784,7 +784,7 @@ private fun CompilationResult.doProcessChanges( } } -private class JpsIncReporter : IncReporter() { +private class JpsICReporter : ICReporter() { override fun report(message: ()->String) { if (KotlinBuilder.LOG.isDebugEnabled) { KotlinBuilder.LOG.debug(message()) @@ -800,7 +800,7 @@ private fun CompilationResult.doProcessChangesUsingLookups( ) { val lookupStorage = dataManager.getStorage(KotlinDataContainerTarget, JpsLookupStorageProvider) val allCaches = caches.flatMap { it.thisWithDependentCaches } - val reporter = JpsIncReporter() + val reporter = JpsICReporter() reporter.report { "Start processing changes" } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt index 46b57a9f0d1..c52f6211825 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt @@ -217,7 +217,7 @@ open class KotlinCompile : AbstractKotlinCompile(), Kotl } logger.warn(USING_EXPERIMENTAL_INCREMENTAL_MESSAGE) - val reporter = GradleIncReporter(project.rootProject.projectDir) + val reporter = GradleICReporter(project.rootProject.projectDir) val compiler = IncrementalJvmCompilerRunner( taskBuildDirectory, sourceRoots.javaSourceRoots, diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/GradleIncReporter.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/GradleICReporter.kt similarity index 86% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/GradleIncReporter.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/GradleICReporter.kt index 40e703b4b51..41202f3e87d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/GradleIncReporter.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/GradleICReporter.kt @@ -20,8 +20,8 @@ import org.gradle.api.logging.Logging import org.jetbrains.kotlin.gradle.plugin.kotlinDebug import java.io.File -internal class GradleIncReporter(private val projectRootFile: File) : IncReporter() { - private val log = Logging.getLogger(GradleIncReporter::class.java) +internal class GradleICReporter(private val projectRootFile: File) : ICReporter() { + private val log = Logging.getLogger(GradleICReporter::class.java) override fun report(message: ()->String) { log.kotlinDebug(message) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt index b190aaef305..fc7424ba8ef 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt @@ -48,7 +48,7 @@ internal fun makeIncrementally( sourceRoots: Iterable, args: K2JVMCompilerArguments, messageCollector: MessageCollector = MessageCollector.NONE, - reporter: IncReporter = EmptyIncReporter + reporter: ICReporter = EmptyICReporter ) { val versions = listOf(normalCacheVersion(cachesDir), experimentalCacheVersion(cachesDir), @@ -70,7 +70,7 @@ internal fun makeIncrementally( } } -private object EmptyIncReporter : IncReporter() { +private object EmptyICReporter : ICReporter() { override fun report(message: ()->String) { } } @@ -94,7 +94,7 @@ internal class IncrementalJvmCompilerRunner( workingDir: File, private val javaSourceRoots: Set, private val cacheVersions: List, - private val reporter: IncReporter, + private val reporter: ICReporter, private var kaptAnnotationsFileUpdater: AnnotationFileUpdater? = null, private val artifactDifferenceRegistryProvider: ArtifactDifferenceRegistryProvider? = null, private val artifactFile: File? = null diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/multiproject/ArtifactDifferenceRegistry.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/multiproject/ArtifactDifferenceRegistry.kt index 74c41d92e41..623d0128236 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/multiproject/ArtifactDifferenceRegistry.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/multiproject/ArtifactDifferenceRegistry.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.incremental.multiproject import org.jetbrains.kotlin.incremental.DirtyData -import org.jetbrains.kotlin.incremental.IncReporter +import org.jetbrains.kotlin.incremental.ICReporter import java.io.File internal interface ArtifactDifferenceRegistry { @@ -36,7 +36,7 @@ internal interface ArtifactDifferenceRegistryProvider { ): T? fun withRegistry( - reporter: IncReporter, + reporter: ICReporter, fn: (ArtifactDifferenceRegistry) -> T ): T? { return withRegistry({reporter.report {it}}, fn) diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/incremental/KotlinStandaloneIncrementalCompilationTest.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/incremental/KotlinStandaloneIncrementalCompilationTest.kt index f1803407edb..cdb16a1d42f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/incremental/KotlinStandaloneIncrementalCompilationTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/incremental/KotlinStandaloneIncrementalCompilationTest.kt @@ -125,7 +125,7 @@ class KotlinStandaloneIncrementalCompilationTest : TestWithWorkingDir() { val compiledSources = arrayListOf() var resultExitCode = ExitCode.OK - val reporter = object : IncReporter() { + val reporter = object : ICReporter() { override fun report(message: ()->String) { }