From 8bd8f5eacf8309ef657f1fc3c0b1f308c31a1aaf Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 25 Nov 2016 15:57:10 +0300 Subject: [PATCH] Make IC classes public Fixing IC after moving it from Gradle to the compiler in commit f40a3eff20f463659be66041d78d255a80d12322 --- .../src/org/jetbrains/kotlin/incremental/ChangedFiles.kt | 2 +- .../kotlin/incremental/GradleIncrementalCacheImpl.kt | 2 +- .../kotlin/incremental/IncrementalCachesManager.kt | 2 +- .../kotlin/incremental/IncrementalJvmCompilerRunner.kt | 5 ++--- .../incremental/multiproject/ArtifactDifferenceRegistry.kt | 6 +++--- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/ChangedFiles.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/ChangedFiles.kt index b4182726b92..284304a273d 100644 --- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/ChangedFiles.kt +++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/ChangedFiles.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.incremental import java.io.File -internal sealed class ChangedFiles { +sealed class ChangedFiles { class Known(val modified: List, val removed: List) : ChangedFiles() class Unknown : ChangedFiles() } diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/GradleIncrementalCacheImpl.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/GradleIncrementalCacheImpl.kt index 7a2bd399906..cb457d8ab4f 100644 --- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/GradleIncrementalCacheImpl.kt +++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/GradleIncrementalCacheImpl.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.incremental.storage.StringCollectionExternalizer import org.jetbrains.kotlin.modules.TargetId import java.io.File -internal class GradleIncrementalCacheImpl( +class GradleIncrementalCacheImpl( targetDataRoot: File, targetOutputDir: File?, target: TargetId, diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalCachesManager.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalCachesManager.kt index fe8227155a7..17697047d1b 100644 --- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalCachesManager.kt +++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalCachesManager.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.incremental import org.jetbrains.kotlin.modules.TargetId import java.io.File -internal class IncrementalCachesManager ( +class IncrementalCachesManager ( private val targetId: TargetId, private val cacheDirectory: File, private val outputDir: File, diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt index 439b4568e9c..9a909cfd029 100644 --- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt +++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt @@ -38,12 +38,11 @@ import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader import org.jetbrains.kotlin.modules.TargetId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.progress.CompilationCanceledStatus -import java.io.EOFException import java.io.File import java.io.IOException import java.util.* -internal fun makeIncrementally( +fun makeIncrementally( cachesDir: File, sourceRoots: Iterable, args: K2JVMCompilerArguments, @@ -90,7 +89,7 @@ private inline fun enableIC(fn: ()->Unit) { } } -internal class IncrementalJvmCompilerRunner( +class IncrementalJvmCompilerRunner( workingDir: File, private val javaSourceRoots: Set, private val cacheVersions: List, diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/multiproject/ArtifactDifferenceRegistry.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/multiproject/ArtifactDifferenceRegistry.kt index 623d0128236..2da2ea52c28 100644 --- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/multiproject/ArtifactDifferenceRegistry.kt +++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/multiproject/ArtifactDifferenceRegistry.kt @@ -20,16 +20,16 @@ import org.jetbrains.kotlin.incremental.DirtyData import org.jetbrains.kotlin.incremental.ICReporter import java.io.File -internal interface ArtifactDifferenceRegistry { +interface ArtifactDifferenceRegistry { operator fun get(artifact: File): Iterable? fun add(artifact: File, difference: ArtifactDifference) fun remove(artifact: File) fun flush(memoryCachesOnly: Boolean) } -internal class ArtifactDifference(val buildTS: Long, val dirtyData: DirtyData) +class ArtifactDifference(val buildTS: Long, val dirtyData: DirtyData) -internal interface ArtifactDifferenceRegistryProvider { +interface ArtifactDifferenceRegistryProvider { fun withRegistry( report: (String) -> Unit, fn: (ArtifactDifferenceRegistry) -> T