diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt index fe75a143380..f850f07cd81 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt @@ -82,7 +82,6 @@ abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJpsTest() val jvmMetaBuildInfo = jvmBuildMetaInfoFile(target, dataManager) dumpCachesForTarget(p, paths, target, versions.normalVersion(target).formatVersionFile, - versions.experimentalVersion(target).formatVersionFile, jvmMetaBuildInfo, subdirectory = KOTLIN_CACHE_DIRECTORY_NAME) } diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt index 795ad568754..c9fc3f70338 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt @@ -23,8 +23,6 @@ import org.jetbrains.kotlin.jps.incremental.CacheVersionProvider abstract class AbstractExperimentalIncrementalJpsTest : AbstractIncrementalJpsTest() abstract class AbstractExperimentalIncrementalCacheVersionChangedTest : AbstractIncrementalCacheVersionChangedTest() { - override fun getVersions(cacheVersionProvider: CacheVersionProvider, targets: Iterable) = - targets.map { cacheVersionProvider.experimentalVersion(it) } } abstract class AbstractDataContainerVersionChangedTest : AbstractExperimentalIncrementalCacheVersionChangedTest() { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 1568b9ffe45..2ea6f1db364 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -370,13 +370,6 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { dataManager.getKotlinCache(target).clean() } } - CacheVersion.Action.CLEAN_EXPERIMENTAL_CACHES -> { - LOG.info("Clearing experimental caches for all targets") - - for (target in allTargets) { - dataManager.getKotlinCache(target).cleanExperimental() - } - } CacheVersion.Action.CLEAN_DATA_CONTAINER -> { LOG.info("Clearing lookup cache") dataManager.getStorage(KotlinDataContainerTarget, JpsLookupStorageProvider).clean() diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionProvider.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionProvider.kt index 31696d0f7f0..c99186a839f 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionProvider.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionProvider.kt @@ -21,7 +21,6 @@ import org.jetbrains.jps.builders.storage.BuildDataPaths import org.jetbrains.jps.incremental.ModuleBuildTarget import org.jetbrains.kotlin.incremental.CacheVersion import org.jetbrains.kotlin.incremental.dataContainerCacheVersion -import org.jetbrains.kotlin.incremental.experimentalCacheVersion import org.jetbrains.kotlin.incremental.normalCacheVersion import java.io.File @@ -32,8 +31,6 @@ class CacheVersionProvider(private val paths: BuildDataPaths) { fun normalVersion(target: ModuleBuildTarget): CacheVersion = normalCacheVersion(target.dataRoot) - fun experimentalVersion(target: ModuleBuildTarget): CacheVersion = experimentalCacheVersion(target.dataRoot) - fun dataContainerVersion(): CacheVersion = dataContainerCacheVersion(KotlinDataContainerTarget.dataRoot) fun allVersions(targets: Iterable): Iterable { @@ -42,7 +39,6 @@ class CacheVersionProvider(private val paths: BuildDataPaths) { for (dataRoot in targets.map { it.dataRoot }) { versions.add(normalCacheVersion(dataRoot)) - versions.add(experimentalCacheVersion(dataRoot)) } return versions diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log index f6e4ae9a7bb..141a6fc4b0e 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log @@ -1,7 +1,7 @@ ================ Step #1 ================= Building module1 -Actions after cache changed: [CLEAN_NORMAL_CACHES, CLEAN_EXPERIMENTAL_CACHES, CLEAN_DATA_CONTAINER] +Actions after cache changed: [CLEAN_NORMAL_CACHES, CLEAN_DATA_CONTAINER] Exit code: NOTHING_DONE ------------------------------------------ Building module2 diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log index 306a8e2c679..fb1064db698 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log @@ -1,7 +1,7 @@ ================ Step #1 ================= Building module1 -Actions after cache changed: [CLEAN_NORMAL_CACHES, CLEAN_EXPERIMENTAL_CACHES, CLEAN_DATA_CONTAINER] +Actions after cache changed: [CLEAN_NORMAL_CACHES, CLEAN_DATA_CONTAINER] Exit code: NOTHING_DONE ------------------------------------------ Building module2 diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt index 215d8ffbdbd..afaffa21b44 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt @@ -5,7 +5,6 @@ kotlin-data-container id-to-file.tab lookups.tab Module 'module1' production - experimental-format-version.txt format-version.txt jvm-build-meta-info.txt class-fq-name-to-source.tab @@ -14,7 +13,6 @@ Module 'module1' production source-to-classes.tab Module 'module1' tests Module 'module2' production - experimental-format-version.txt format-version.txt jvm-build-meta-info.txt inline-functions.tab @@ -24,7 +22,6 @@ Module 'module2' production source-to-classes.tab Module 'module2' tests Module 'module3' production - experimental-format-version.txt format-version.txt jvm-build-meta-info.txt class-fq-name-to-source.tab @@ -33,7 +30,6 @@ Module 'module3' production source-to-classes.tab Module 'module3' tests Module 'module4' production - experimental-format-version.txt format-version.txt jvm-build-meta-info.txt class-fq-name-to-source.tab diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt index a8e59355f1c..f49b588520e 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt @@ -5,7 +5,6 @@ kotlin-data-container id-to-file.tab lookups.tab Module 'module' production - experimental-format-version.txt format-version.txt jvm-build-meta-info.txt class-fq-name-to-source.tab diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/expected-kotlin-caches.txt index 15f2ab8c248..b4e54efb164 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/expected-kotlin-caches.txt @@ -5,7 +5,6 @@ kotlin-data-container id-to-file.tab lookups.tab Module 'module' production - experimental-format-version.txt format-version.txt jvm-build-meta-info.txt class-fq-name-to-source.tab diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt index 7011a7065d5..1232a083a32 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt @@ -5,7 +5,6 @@ kotlin-data-container id-to-file.tab lookups.tab Module 'module' production - experimental-format-version.txt format-version.txt jvm-build-meta-info.txt constants.tab diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt index d44fd6c4253..ac0c703af90 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt @@ -5,7 +5,6 @@ kotlin-data-container id-to-file.tab lookups.tab Module 'module' production - experimental-format-version.txt format-version.txt jvm-build-meta-info.txt internal-name-to-source.tab diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/expected-kotlin-caches.txt index cc6f16e3ad5..97b4eb9d00e 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/expected-kotlin-caches.txt @@ -5,7 +5,6 @@ kotlin-data-container id-to-file.tab lookups.tab Module 'module' production - experimental-format-version.txt format-version.txt jvm-build-meta-info.txt inline-functions.tab diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/expected-kotlin-caches.txt index cc6f16e3ad5..97b4eb9d00e 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/expected-kotlin-caches.txt @@ -5,7 +5,6 @@ kotlin-data-container id-to-file.tab lookups.tab Module 'module' production - experimental-format-version.txt format-version.txt jvm-build-meta-info.txt inline-functions.tab diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt index d44fd6c4253..ac0c703af90 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt @@ -5,7 +5,6 @@ kotlin-data-container id-to-file.tab lookups.tab Module 'module' production - experimental-format-version.txt format-version.txt jvm-build-meta-info.txt internal-name-to-source.tab