From 368e48780e379e307c3b3d21a59ba3c7ef07349d Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 5 Oct 2016 17:32:13 +0300 Subject: [PATCH] Refactoring: move IC classes into separate package --- .../plugin/KotlinGradleBuildServices.kt | 4 +-- .../kotlin/gradle/plugin/KotlinPlugin.kt | 2 +- .../jetbrains/kotlin/gradle/tasks/Tasks.kt | 1 + .../incremental/BuildCacheStorage.kt | 23 ++++++++++++++--- .../tasks => incremental}/BuildInfo.kt | 2 +- .../tasks => incremental}/ChangedFiles.kt | 2 +- .../ChangedJavaFilesProcessor.kt | 4 ++- .../tasks => incremental}/ChangesEither.kt | 2 +- .../GradleIncReporter.kt | 4 +-- .../GradleIncrementalCacheImpl.kt | 25 ++++++++++--------- .../IncrementalCachesManager.kt | 2 +- .../IncrementalJvmCompilerRunner.kt | 6 +++-- .../tasks => incremental}/fileUtils.kt | 2 +- .../gradleCacheVersion.kt | 2 +- .../multiProjectIncrementalCompilationUtil.kt | 22 +++++++++++++--- .../ArtifactDifferenceRegistry.kt | 2 +- ...rtifactDifferenceRegistryAndroidWrapper.kt | 8 +++--- .../ArtifactDifferenceRegistryImpl.kt | 6 ++--- 18 files changed, 79 insertions(+), 40 deletions(-) rename libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/{gradle/tasks => }/incremental/BuildCacheStorage.kt (77%) rename libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/{gradle/tasks => incremental}/BuildInfo.kt (93%) rename libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/{gradle/tasks => incremental}/ChangedFiles.kt (93%) rename libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/{gradle/tasks => incremental}/ChangedJavaFilesProcessor.kt (95%) rename libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/{gradle/tasks => incremental}/ChangesEither.kt (89%) rename libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/{gradle/tasks => incremental}/GradleIncReporter.kt (82%) rename libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/{gradle/tasks => incremental}/GradleIncrementalCacheImpl.kt (59%) rename libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/{gradle/tasks => incremental}/IncrementalCachesManager.kt (97%) rename libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/{gradle/tasks => incremental}/IncrementalJvmCompilerRunner.kt (98%) rename libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/{gradle/tasks => incremental}/fileUtils.kt (94%) rename libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/{gradle/tasks => incremental}/gradleCacheVersion.kt (94%) rename libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/{gradle/tasks => }/incremental/multiProjectIncrementalCompilationUtil.kt (73%) rename libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/{gradle/tasks => incremental/multiproject}/ArtifactDifferenceRegistry.kt (93%) rename libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/{gradle/tasks/incremental/android => incremental/multiproject}/ArtifactDifferenceRegistryAndroidWrapper.kt (85%) rename libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/{gradle/tasks/incremental => incremental/multiproject}/ArtifactDifferenceRegistryImpl.kt (94%) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleBuildServices.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleBuildServices.kt index 42d71ca5b0e..985919347a9 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleBuildServices.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleBuildServices.kt @@ -26,8 +26,8 @@ import org.jetbrains.kotlin.com.intellij.openapi.util.io.ZipFileCache import org.jetbrains.kotlin.com.intellij.openapi.vfs.impl.ZipHandler import org.jetbrains.kotlin.com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile -import org.jetbrains.kotlin.gradle.tasks.ArtifactDifferenceRegistry -import org.jetbrains.kotlin.gradle.tasks.ArtifactDifferenceRegistryProvider +import org.jetbrains.kotlin.incremental.multiproject.ArtifactDifferenceRegistry +import org.jetbrains.kotlin.incremental.multiproject.ArtifactDifferenceRegistryProvider import org.jetbrains.kotlin.gradle.tasks.incremental.BuildCacheStorage import java.io.File diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt index 2d43e5db4fe..a9c5c44bf02 100755 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.gradle.internal.Kapt2KotlinGradleSubplugin import org.jetbrains.kotlin.gradle.internal.initKapt import org.jetbrains.kotlin.gradle.plugin.android.AndroidGradleWrapper import org.jetbrains.kotlin.gradle.tasks.* -import org.jetbrains.kotlin.gradle.tasks.incremental.android.ArtifactDifferenceRegistryProviderAndroidWrapper +import org.jetbrains.kotlin.incremental.multiproject.ArtifactDifferenceRegistryProviderAndroidWrapper import org.jetbrains.kotlin.gradle.tasks.incremental.configureMultiProjectIncrementalCompilation import java.io.File import java.net.URL 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 220ccaa6ec8..b40b73643e5 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 @@ -32,6 +32,7 @@ import org.jetbrains.kotlin.gradle.dsl.* import org.jetbrains.kotlin.incremental.* import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.incremental.components.SourceRetentionAnnotationHandler +import org.jetbrains.kotlin.incremental.multiproject.ArtifactDifferenceRegistryProvider import org.jetbrains.kotlin.modules.TargetId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.progress.CompilationCanceledStatus diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/incremental/BuildCacheStorage.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/BuildCacheStorage.kt similarity index 77% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/incremental/BuildCacheStorage.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/BuildCacheStorage.kt index 4a6d6806e1e..b941dbf0af1 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/incremental/BuildCacheStorage.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/BuildCacheStorage.kt @@ -1,9 +1,26 @@ -package org.jetbrains.kotlin.gradle.tasks.incremental +/* + * Copyright 2010-2016 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.kotlin.incremental import org.gradle.api.logging.Logging import org.jetbrains.kotlin.gradle.plugin.kotlinDebug -import org.jetbrains.kotlin.gradle.tasks.ArtifactDifferenceRegistry -import org.jetbrains.kotlin.gradle.tasks.ArtifactDifferenceRegistryProvider +import org.jetbrains.kotlin.incremental.multiproject.ArtifactDifferenceRegistry +import org.jetbrains.kotlin.incremental.multiproject.ArtifactDifferenceRegistryProvider +import org.jetbrains.kotlin.incremental.multiproject.ArtifactDifferenceRegistryImpl import org.jetbrains.kotlin.incremental.CacheVersion import org.jetbrains.kotlin.incremental.stackTraceStr import org.jetbrains.kotlin.incremental.storage.BasicMapsOwner diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/BuildInfo.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/BuildInfo.kt similarity index 93% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/BuildInfo.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/BuildInfo.kt index 9f6b26512fd..068e430f94b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/BuildInfo.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/BuildInfo.kt @@ -1,4 +1,4 @@ -package org.jetbrains.kotlin.gradle.tasks +package org.jetbrains.kotlin.incremental import java.io.* diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/ChangedFiles.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/ChangedFiles.kt similarity index 93% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/ChangedFiles.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/ChangedFiles.kt index 87086b708b1..13fb57738bc 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/ChangedFiles.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/ChangedFiles.kt @@ -1,4 +1,4 @@ -package org.jetbrains.kotlin.gradle.tasks +package org.jetbrains.kotlin.incremental import org.gradle.api.tasks.incremental.IncrementalTaskInputs import java.io.File diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/ChangedJavaFilesProcessor.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/ChangedJavaFilesProcessor.kt similarity index 95% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/ChangedJavaFilesProcessor.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/ChangedJavaFilesProcessor.kt index 22b502ef050..36b4c45be12 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/ChangedJavaFilesProcessor.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/ChangedJavaFilesProcessor.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.gradle.tasks +package org.jetbrains.kotlin.incremental import org.gradle.api.logging.Logging import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles @@ -26,6 +26,8 @@ import org.jetbrains.kotlin.com.intellij.psi.PsiFile import org.jetbrains.kotlin.com.intellij.psi.PsiFileFactory import org.jetbrains.kotlin.com.intellij.psi.PsiJavaFile import org.jetbrains.kotlin.config.CompilerConfiguration +import org.jetbrains.kotlin.gradle.tasks.kotlinDebug +import org.jetbrains.kotlin.incremental.ChangesEither import org.jetbrains.kotlin.incremental.LookupSymbol import org.jetbrains.kotlin.incremental.snapshots.FileCollectionDiff import java.io.File diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/ChangesEither.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/ChangesEither.kt similarity index 89% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/ChangesEither.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/ChangesEither.kt index b291f3ce58e..fed47e5da0d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/ChangesEither.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/ChangesEither.kt @@ -1,4 +1,4 @@ -package org.jetbrains.kotlin.gradle.tasks +package org.jetbrains.kotlin.incremental import org.jetbrains.kotlin.incremental.LookupSymbol import org.jetbrains.kotlin.name.FqName diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/GradleIncReporter.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/GradleIncReporter.kt similarity index 82% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/GradleIncReporter.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/GradleIncReporter.kt index e15692221fd..03713496c37 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/GradleIncReporter.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/GradleIncReporter.kt @@ -1,7 +1,7 @@ -package org.jetbrains.kotlin.gradle.tasks +package org.jetbrains.kotlin.incremental import org.gradle.api.logging.Logging -import org.jetbrains.kotlin.incremental.IncReporter +import org.jetbrains.kotlin.gradle.tasks.kotlinDebug import java.io.File internal class GradleIncReporter(private val projectRootFile: File) : IncReporter() { diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/GradleIncrementalCacheImpl.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/GradleIncrementalCacheImpl.kt similarity index 59% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/GradleIncrementalCacheImpl.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/GradleIncrementalCacheImpl.kt index 6effd8e2b55..c775cd5648d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/GradleIncrementalCacheImpl.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/GradleIncrementalCacheImpl.kt @@ -14,10 +14,11 @@ * limitations under the License. */ -package org.jetbrains.kotlin.gradle.tasks +package org.jetbrains.kotlin.incremental import org.gradle.api.logging.Logging import org.jetbrains.kotlin.build.GeneratedJvmClass +import org.jetbrains.kotlin.gradle.plugin.kotlinDebug import org.jetbrains.kotlin.incremental.CompilationResult import org.jetbrains.kotlin.incremental.IncrementalCacheImpl import org.jetbrains.kotlin.incremental.dumpCollection @@ -30,34 +31,34 @@ import org.jetbrains.kotlin.incremental.storage.StringCollectionExternalizer import org.jetbrains.kotlin.modules.TargetId import java.io.File -internal class GradleIncrementalCacheImpl(targetDataRoot: File, targetOutputDir: File?, target: TargetId) : IncrementalCacheImpl(targetDataRoot, targetOutputDir, target) { +internal class GradleIncrementalCacheImpl(targetDataRoot: java.io.File, targetOutputDir: java.io.File?, target: org.jetbrains.kotlin.modules.TargetId) : org.jetbrains.kotlin.incremental.IncrementalCacheImpl(targetDataRoot, targetOutputDir, target) { companion object { private val SOURCES_TO_CLASSFILES = "sources-to-classfiles" private val FILE_SNAPSHOT = "file-snapshot" } - private val log = Logging.getLogger(this.javaClass) + private val log = org.gradle.api.logging.Logging.getLogger(this.javaClass) - private val sourceToClassfilesMap = registerMap(SourceToClassfilesMap(SOURCES_TO_CLASSFILES.storageFile)) - private val fileSnapshotMap = registerMap(FileSnapshotMap(FILE_SNAPSHOT.storageFile)) + private val sourceToClassfilesMap = registerMap(SourceToClassfilesMap(org.jetbrains.kotlin.incremental.GradleIncrementalCacheImpl.Companion.SOURCES_TO_CLASSFILES.storageFile)) + private val fileSnapshotMap = registerMap(org.jetbrains.kotlin.incremental.snapshots.FileSnapshotMap(FILE_SNAPSHOT.storageFile)) - fun compareAndUpdateFileSnapshots(files: Iterable): FileCollectionDiff = - fileSnapshotMap.compareAndUpdate(files, SimpleFileSnapshotProviderImpl()) + fun compareAndUpdateFileSnapshots(files: Iterable): org.jetbrains.kotlin.incremental.snapshots.FileCollectionDiff = + fileSnapshotMap.compareAndUpdate(files, org.jetbrains.kotlin.incremental.snapshots.SimpleFileSnapshotProviderImpl()) - fun removeClassfilesBySources(sources: Iterable): Unit = + fun removeClassfilesBySources(sources: Iterable): Unit = sources.forEach { sourceToClassfilesMap.remove(it) } - override fun saveFileToCache(generatedClass: GeneratedJvmClass): CompilationResult { + override fun saveFileToCache(generatedClass: org.jetbrains.kotlin.build.GeneratedJvmClass): org.jetbrains.kotlin.incremental.CompilationResult { generatedClass.sourceFiles.forEach { sourceToClassfilesMap.add(it, generatedClass.outputFile) } return super.saveFileToCache(generatedClass) } - inner class SourceToClassfilesMap(storageFile: File) : BasicStringMap>(storageFile, PathStringDescriptor, StringCollectionExternalizer) { - fun add(sourceFile: File, classFile: File) { + inner class SourceToClassfilesMap(storageFile: java.io.File) : org.jetbrains.kotlin.incremental.storage.BasicStringMap>(storageFile, org.jetbrains.kotlin.incremental.storage.PathStringDescriptor, org.jetbrains.kotlin.incremental.storage.StringCollectionExternalizer) { + fun add(sourceFile: java.io.File, classFile: java.io.File) { storage.append(sourceFile.absolutePath, classFile.absolutePath) } - operator fun get(sourceFile: File): Collection = + operator fun get(sourceFile: java.io.File): Collection = storage[sourceFile.absolutePath].orEmpty().map(::File) override fun dumpValue(value: Collection) = value.dumpCollection() diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/IncrementalCachesManager.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/IncrementalCachesManager.kt similarity index 97% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/IncrementalCachesManager.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/IncrementalCachesManager.kt index 72acb9c0618..e8b310613e5 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/IncrementalCachesManager.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/IncrementalCachesManager.kt @@ -1,4 +1,4 @@ -package org.jetbrains.kotlin.gradle.tasks +package org.jetbrains.kotlin.incremental import org.jetbrains.kotlin.incremental.LookupStorage import org.jetbrains.kotlin.modules.TargetId diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/IncrementalJvmCompilerRunner.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/IncrementalJvmCompilerRunner.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt index 847c1859a64..195d7e17712 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/IncrementalJvmCompilerRunner.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt @@ -1,4 +1,4 @@ -package org.jetbrains.kotlin.gradle.tasks +package org.jetbrains.kotlin.incremental import org.jetbrains.kotlin.annotation.AnnotationFileUpdater import org.jetbrains.kotlin.annotation.SourceAnnotationsRegistry @@ -14,8 +14,10 @@ import org.jetbrains.kotlin.com.intellij.util.io.PersistentEnumeratorBase import org.jetbrains.kotlin.compilerRunner.ArgumentUtils import org.jetbrains.kotlin.compilerRunner.OutputItemsCollector import org.jetbrains.kotlin.compilerRunner.OutputItemsCollectorImpl -import org.jetbrains.kotlin.incremental.* +import org.jetbrains.kotlin.incremental.ChangedFiles import org.jetbrains.kotlin.incremental.components.LookupTracker +import org.jetbrains.kotlin.incremental.multiproject.ArtifactDifference +import org.jetbrains.kotlin.incremental.multiproject.ArtifactDifferenceRegistryProvider import org.jetbrains.kotlin.incremental.snapshots.FileCollectionDiff import org.jetbrains.kotlin.modules.TargetId import org.jetbrains.kotlin.name.FqName diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/fileUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/fileUtils.kt similarity index 94% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/fileUtils.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/fileUtils.kt index 9d786884c17..50268d100ca 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/fileUtils.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/fileUtils.kt @@ -1,4 +1,4 @@ -package org.jetbrains.kotlin.gradle.tasks +package org.jetbrains.kotlin.incremental import java.io.File diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/gradleCacheVersion.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/gradleCacheVersion.kt similarity index 94% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/gradleCacheVersion.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/gradleCacheVersion.kt index 91a6c831e4c..e47ca55dc03 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/gradleCacheVersion.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/gradleCacheVersion.kt @@ -1,4 +1,4 @@ -package org.jetbrains.kotlin.gradle.tasks +package org.jetbrains.kotlin.incremental import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.incremental.CacheVersion diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/incremental/multiProjectIncrementalCompilationUtil.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/multiProjectIncrementalCompilationUtil.kt similarity index 73% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/incremental/multiProjectIncrementalCompilationUtil.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/multiProjectIncrementalCompilationUtil.kt index b97a15d99f9..8b1aad4af45 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/incremental/multiProjectIncrementalCompilationUtil.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/multiProjectIncrementalCompilationUtil.kt @@ -1,4 +1,20 @@ -package org.jetbrains.kotlin.gradle.tasks.incremental +/* + * Copyright 2010-2016 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.kotlin.incremental import org.gradle.api.Project import org.gradle.api.Task @@ -7,8 +23,8 @@ import org.gradle.api.tasks.compile.AbstractCompile import org.gradle.api.tasks.compile.JavaCompile import org.jetbrains.kotlin.com.intellij.openapi.util.io.FileUtil import org.jetbrains.kotlin.gradle.plugin.kotlinDebug -import org.jetbrains.kotlin.gradle.tasks.ArtifactDifferenceRegistry -import org.jetbrains.kotlin.gradle.tasks.ArtifactDifferenceRegistryProvider +import org.jetbrains.kotlin.incremental.multiproject.ArtifactDifferenceRegistry +import org.jetbrains.kotlin.incremental.multiproject.ArtifactDifferenceRegistryProvider import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import java.io.File diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/ArtifactDifferenceRegistry.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/multiproject/ArtifactDifferenceRegistry.kt similarity index 93% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/ArtifactDifferenceRegistry.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/multiproject/ArtifactDifferenceRegistry.kt index 19c1faf4939..202afa5a768 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/ArtifactDifferenceRegistry.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/multiproject/ArtifactDifferenceRegistry.kt @@ -1,4 +1,4 @@ -package org.jetbrains.kotlin.gradle.tasks +package org.jetbrains.kotlin.incremental.multiproject import org.jetbrains.kotlin.incremental.DirtyData import org.jetbrains.kotlin.incremental.IncReporter diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/incremental/android/ArtifactDifferenceRegistryAndroidWrapper.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/multiproject/ArtifactDifferenceRegistryAndroidWrapper.kt similarity index 85% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/incremental/android/ArtifactDifferenceRegistryAndroidWrapper.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/multiproject/ArtifactDifferenceRegistryAndroidWrapper.kt index cead9aac001..ff36f7fb84a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/incremental/android/ArtifactDifferenceRegistryAndroidWrapper.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/multiproject/ArtifactDifferenceRegistryAndroidWrapper.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.kotlin.gradle.tasks.incremental.android +package org.jetbrains.kotlin.incremental.multiproject -import org.jetbrains.kotlin.gradle.tasks.ArtifactDifference -import org.jetbrains.kotlin.gradle.tasks.ArtifactDifferenceRegistry -import org.jetbrains.kotlin.gradle.tasks.ArtifactDifferenceRegistryProvider +import org.jetbrains.kotlin.incremental.multiproject.ArtifactDifference +import org.jetbrains.kotlin.incremental.multiproject.ArtifactDifferenceRegistry +import org.jetbrains.kotlin.incremental.multiproject.ArtifactDifferenceRegistryProvider import java.io.File internal class ArtifactDifferenceRegistryProviderAndroidWrapper( diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/incremental/ArtifactDifferenceRegistryImpl.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/multiproject/ArtifactDifferenceRegistryImpl.kt similarity index 94% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/incremental/ArtifactDifferenceRegistryImpl.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/multiproject/ArtifactDifferenceRegistryImpl.kt index 2f40ccd189c..4e8213b62cf 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/incremental/ArtifactDifferenceRegistryImpl.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/multiproject/ArtifactDifferenceRegistryImpl.kt @@ -1,8 +1,8 @@ -package org.jetbrains.kotlin.gradle.tasks.incremental +package org.jetbrains.kotlin.incremental.multiproject import org.jetbrains.kotlin.com.intellij.util.io.DataExternalizer -import org.jetbrains.kotlin.gradle.tasks.ArtifactDifference -import org.jetbrains.kotlin.gradle.tasks.ArtifactDifferenceRegistry +import org.jetbrains.kotlin.incremental.multiproject.ArtifactDifference +import org.jetbrains.kotlin.incremental.multiproject.ArtifactDifferenceRegistry import org.jetbrains.kotlin.incremental.DirtyData import org.jetbrains.kotlin.incremental.LookupSymbol import org.jetbrains.kotlin.incremental.storage.BasicStringMap