Rename: IncReporter->ICReporter
This commit is contained in:
+1
-1
@@ -217,7 +217,7 @@ open class KotlinCompile : AbstractKotlinCompile<K2JVMCompilerArguments>(), 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,
|
||||
|
||||
+2
-2
@@ -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)
|
||||
+3
-3
@@ -48,7 +48,7 @@ internal fun makeIncrementally(
|
||||
sourceRoots: Iterable<File>,
|
||||
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<File>,
|
||||
private val cacheVersions: List<CacheVersion>,
|
||||
private val reporter: IncReporter,
|
||||
private val reporter: ICReporter,
|
||||
private var kaptAnnotationsFileUpdater: AnnotationFileUpdater? = null,
|
||||
private val artifactDifferenceRegistryProvider: ArtifactDifferenceRegistryProvider? = null,
|
||||
private val artifactFile: File? = null
|
||||
|
||||
+2
-2
@@ -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 <T> withRegistry(
|
||||
reporter: IncReporter,
|
||||
reporter: ICReporter,
|
||||
fn: (ArtifactDifferenceRegistry) -> T
|
||||
): T? {
|
||||
return withRegistry({reporter.report {it}}, fn)
|
||||
|
||||
+1
-1
@@ -125,7 +125,7 @@ class KotlinStandaloneIncrementalCompilationTest : TestWithWorkingDir() {
|
||||
val compiledSources = arrayListOf<File>()
|
||||
var resultExitCode = ExitCode.OK
|
||||
|
||||
val reporter = object : IncReporter() {
|
||||
val reporter = object : ICReporter() {
|
||||
override fun report(message: ()->String) {
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user