azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make IC classes public

Browse Source 
Fixing IC after moving it from Gradle to the compiler in commit f40a3eff20
This commit is contained in:
Alexey Tsvetkov
2016-11-25 15:57:10 +03:00
parent a569f7e75a
commit 8bd8f5eacf
5 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/ChangedFiles.kt
+1 -1
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.incremental
import java.io.File import java.io.File
internal sealed class ChangedFiles { sealed class ChangedFiles {
class Known(val modified: List<File>, val removed: List<File>) : ChangedFiles() class Known(val modified: List<File>, val removed: List<File>) : ChangedFiles()
class Unknown : ChangedFiles() class Unknown : ChangedFiles()
} }
compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/GradleIncrementalCacheImpl.kt
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.incremental.storage.StringCollectionExternalizer
import org.jetbrains.kotlin.modules.TargetId import org.jetbrains.kotlin.modules.TargetId
import java.io.File import java.io.File
internal class GradleIncrementalCacheImpl( class GradleIncrementalCacheImpl(
targetDataRoot: File, targetDataRoot: File,
targetOutputDir: File?, targetOutputDir: File?,
target: TargetId, target: TargetId,
compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalCachesManager.kt
+1 -1
View File
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.incremental
import org.jetbrains.kotlin.modules.TargetId import org.jetbrains.kotlin.modules.TargetId
import java.io.File import java.io.File
internal class IncrementalCachesManager ( class IncrementalCachesManager (
private val targetId: TargetId, private val targetId: TargetId,
private val cacheDirectory: File, private val cacheDirectory: File,
private val outputDir: File, private val outputDir: File,
compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt
+2 -3
View File
@@ -38,12 +38,11 @@ import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
import org.jetbrains.kotlin.modules.TargetId import org.jetbrains.kotlin.modules.TargetId
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.progress.CompilationCanceledStatus import org.jetbrains.kotlin.progress.CompilationCanceledStatus
import java.io.EOFException
import java.io.File import java.io.File
import java.io.IOException import java.io.IOException
import java.util.* import java.util.*
internal fun makeIncrementally( fun makeIncrementally(
cachesDir: File, cachesDir: File,
sourceRoots: Iterable<File>, sourceRoots: Iterable<File>,
args: K2JVMCompilerArguments, args: K2JVMCompilerArguments,
@@ -90,7 +89,7 @@ private inline fun enableIC(fn: ()->Unit) {
} }
} }
internal class IncrementalJvmCompilerRunner( class IncrementalJvmCompilerRunner(
workingDir: File, workingDir: File,
private val javaSourceRoots: Set<File>, private val javaSourceRoots: Set<File>,
private val cacheVersions: List<CacheVersion>, private val cacheVersions: List<CacheVersion>,
compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/multiproject/ArtifactDifferenceRegistry.kt
+3 -3
View File
@@ -20,16 +20,16 @@ import org.jetbrains.kotlin.incremental.DirtyData
import org.jetbrains.kotlin.incremental.ICReporter import org.jetbrains.kotlin.incremental.ICReporter
import java.io.File import java.io.File
internal interface ArtifactDifferenceRegistry { interface ArtifactDifferenceRegistry {
operator fun get(artifact: File): Iterable<ArtifactDifference>? operator fun get(artifact: File): Iterable<ArtifactDifference>?
fun add(artifact: File, difference: ArtifactDifference) fun add(artifact: File, difference: ArtifactDifference)
fun remove(artifact: File) fun remove(artifact: File)
fun flush(memoryCachesOnly: Boolean) 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 <T> withRegistry( fun <T> withRegistry(
report: (String) -> Unit, report: (String) -> Unit,
fn: (ArtifactDifferenceRegistry) -> T fn: (ArtifactDifferenceRegistry) -> T