From 5af9d29cbea6768798454f606317ada90e62ec2a Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 3 May 2017 13:58:40 +0300 Subject: [PATCH] Remove old IC: remove experimental-ic-build.log This commit moves each experimental-ic-build.log into a corresponding build.log file. --- .../testingUtils/BuildLogFinder.kt | 3 - ...linStandaloneIncrementalCompilationTest.kt | 2 +- .../jps/build/AbstractIncrementalJpsTest.kt | 2 +- ...experimentalIncrementalCompilationTests.kt | 2 +- .../lazyKotlinCaches/constant/build.log | 4 ++ .../constant/experimental-ic-build.log | 24 ------- .../circularDependencyClasses/build.log | 2 + .../experimental-ic-build.log | 23 ------- .../build.log | 10 --- .../experimental-ic-build.log | 12 ---- .../build.log | 15 ---- .../experimental-ic-build.log | 14 ---- .../multiModule/classAdded/build.log | 18 +++-- .../classAdded/experimental-ic-build.log | 63 ----------------- .../multiModule/classRemoved/build.log | 33 +++++---- .../classRemoved/experimental-ic-build.log | 68 ------------------- .../constantValueChanged/build.log | 11 ++- .../experimental-ic-build.log | 32 --------- .../copyFileToAnotherModule/build.log | 17 +++-- .../experimental-ic-build.log | 40 ----------- .../defaultParameterAdded/build.log | 6 +- .../experimental-ic-build.log | 25 ------- .../build.log | 6 +- .../experimental-ic-build.log | 26 ------- .../defaultParameterRemoved/build.log | 6 +- .../experimental-ic-build.log | 25 ------- .../build.log | 6 +- .../experimental-ic-build.log | 26 ------- .../moveFileToAnotherModule/build.log | 26 ++----- .../experimental-ic-build.log | 34 ---------- .../multiModule/simpleDependency/build.log | 6 +- .../experimental-ic-build.log | 27 -------- .../build.log | 6 +- .../experimental-ic-build.log | 39 ----------- .../transitiveDependency/build.log | 6 +- .../experimental-ic-build.log | 30 -------- .../multiModule/twoDependants/build.log | 7 +- .../twoDependants/experimental-ic-build.log | 38 ----------- .../build.log | 6 +- .../experimental-ic-build.log | 22 ------ .../incremental/pureKotlin/addClass/build.log | 5 +- .../addClass/experimental-ic-build.log | 21 ------ .../addFileWithFunctionOverload/build.log | 5 +- .../experimental-ic-build.log | 21 ------ .../pureKotlin/addMemberTypeAlias/build.log | 4 +- .../experimental-ic-build.log | 22 ------ .../pureKotlin/addTopLevelTypeAlias/build.log | 4 +- .../experimental-ic-build.log | 23 ------- .../pureKotlin/allConstants/build.log | 5 ++ .../allConstants/experimental-ic-build.log | 36 ---------- .../build.log | 13 ++++ ...nt-check-caches-in-non-experimental-ic.txt | 0 .../experimental-ic-build.log | 33 --------- .../classObjectConstantChanged/build.log | 5 ++ .../experimental-ic-build.log | 24 ------- .../pureKotlin/classRecreated/build.log | 18 ----- .../classRecreated/experimental-ic-build.log | 17 ----- .../classSignatureChanged/build.log | 2 + .../experimental-ic-build.log | 21 ------ .../build.log | 9 --- .../experimental-ic-build.log | 24 ------- .../build.log | 9 --- .../experimental-ic-build.log | 24 ------- .../build.log | 6 +- .../experimental-ic-build.log | 33 --------- .../build.log | 10 ++- .../experimental-ic-build.log | 27 -------- .../build.log | 14 ++-- .../experimental-ic-build.log | 46 ------------- .../pureKotlin/defaultValueAdded/build.log | 5 +- .../experimental-ic-build.log | 25 ------- .../defaultValueInConstructorAdded/build.log | 11 ++- .../experimental-ic-build.log | 32 --------- .../build.log | 14 ++-- .../experimental-ic-build.log | 48 ------------- .../pureKotlin/defaultValueRemoved1/build.log | 6 +- .../experimental-ic-build.log | 40 ----------- .../pureKotlin/defaultValueRemoved2/build.log | 7 +- .../experimental-ic-build.log | 45 ------------ .../fileWithConstantRemoved/build.log | 2 + .../experimental-ic-build.log | 24 ------- .../fileWithInlineFunctionRemoved/build.log | 2 + .../experimental-ic-build.log | 23 ------- .../filesExchangePackages/build.log | 9 --- .../experimental-ic-build.log | 13 ---- .../pureKotlin/functionBecameInline/build.log | 2 + .../experimental-ic-build.log | 21 ------ .../inlinePrivateFunctionAdded/build.log | 11 +-- .../experimental-ic-build.log | 11 --- .../pureKotlin/internalClassChanged/build.log | 8 --- .../experimental-ic-build.log | 10 --- .../internalMemberInClassChanged/build.log | 8 --- .../experimental-ic-build.log | 10 --- .../pureKotlin/moveClass/build.log | 11 +-- .../moveClass/experimental-ic-build.log | 20 ------ .../moveFileWithChangingPackage/build.log | 11 --- .../experimental-ic-build.log | 18 ----- .../build.log | 2 + .../experimental-ic-build.log | 26 ------- .../multifileClassFileAdded/build.log | 10 --- .../experimental-ic-build.log | 7 -- .../build.log | 2 +- .../experimental-ic-build.log | 22 ------ .../build.log | 10 --- .../experimental-ic-build.log | 20 ------ .../multifileClassRemoved/build.log | 9 --- .../experimental-ic-build.log | 14 ---- .../multiplePackagesModified/build.log | 11 --- .../experimental-ic-build.log | 11 --- .../objectConstantChanged/build.log | 6 +- .../experimental-ic-build.log | 22 ------ .../packageConstantChanged/build.log | 5 ++ .../experimental-ic-build.log | 24 ------- .../pureKotlin/packageFileAdded/build.log | 9 --- .../experimental-ic-build.log | 7 -- .../packageFileChangedPackage/build.log | 9 --- .../experimental-ic-build.log | 11 --- .../build.log | 9 --- .../experimental-ic-build.log | 22 ------ .../pureKotlin/packageFileRemoved/build.log | 11 --- .../experimental-ic-build.log | 22 ------ .../build.log | 8 --- .../experimental-ic-build.log | 14 ---- .../packageRecreatedAfterRenaming/build.log | 9 --- .../experimental-ic-build.log | 19 ------ .../pureKotlin/packageRemoved/build.log | 9 --- .../packageRemoved/experimental-ic-build.log | 13 ---- .../publicPropertyWithPrivateSetter/build.log | 9 --- .../experimental-ic-build.log | 11 --- .../build.log | 10 --- .../experimental-ic-build.log | 11 --- .../removeAndRestoreCompanion/build.log | 9 +-- .../experimental-ic-build.log | 45 ------------ .../build.log | 10 ++- .../experimental-ic-build.log | 57 ---------------- .../pureKotlin/removeClass/build.log | 4 +- .../removeClass/experimental-ic-build.log | 25 ------- .../removeClassInDefaultPackage/build.log | 4 +- .../experimental-ic-build.log | 25 ------- .../removeFileWithFunctionOverload/build.log | 4 +- .../experimental-ic-build.log | 25 ------- .../removeMemberTypeAlias/build.log | 4 +- .../experimental-ic-build.log | 22 ------ .../removeTopLevelTypeAlias/build.log | 4 +- .../experimental-ic-build.log | 23 ------- .../pureKotlin/renameClass/build.log | 6 +- .../renameClass/experimental-ic-build.log | 27 -------- .../renameFileWithFunctionOverload/build.log | 8 +-- .../experimental-ic-build.log | 26 ------- .../pureKotlin/returnTypeChanged/build.log | 2 + .../experimental-ic-build.log | 22 ------ .../topLevelFunctionWithJvmName/build.log | 2 + .../experimental-ic-build.log | 22 ------ .../topLevelPropertyWithJvmName/build.log | 2 + .../experimental-ic-build.log | 22 ------ .../traitClassObjectConstantChanged/build.log | 7 +- .../experimental-ic-build.log | 24 ------- .../pureKotlin/valAddCustomAccessor/build.log | 2 + .../experimental-ic-build.log | 23 ------- .../javaToKotlin/experimental-ic-build.log | 19 ------ .../javaToKotlinAndRemove/build.log | 18 ----- .../experimental-ic-build.log | 20 ------ .../kotlinToJava/experimental-ic-build.log | 28 -------- .../build.log | 12 +--- .../experimental-ic-build.log | 39 ----------- .../build.log | 12 +--- .../experimental-ic-build.log | 38 ----------- .../addOptionalParameter/build.log | 9 +-- .../experimental-ic-build.log | 19 ------ .../constantChanged/build.log | 9 ++- .../constantChanged/experimental-ic-build.log | 24 ------- .../jvmFieldChanged/build.log | 9 ++- .../jvmFieldChanged/experimental-ic-build.log | 24 ------- .../build.log | 9 --- .../experimental-ic-build.log | 11 --- .../packageFileAdded/build.log | 11 +-- .../experimental-ic-build.log | 13 ---- .../KotlinGradlePluginJpsParametrizedIT.kt | 2 +- 178 files changed, 259 insertions(+), 2633 deletions(-) delete mode 100644 jps-plugin/testData/incremental/lazyKotlinCaches/constant/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/multiModule/classAdded/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/multiModule/classRemoved/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/multiModule/constantValueChanged/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/multiModule/defaultParameterAdded/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/multiModule/simpleDependency/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/multiModule/transitiveDependency/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/addClass/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/allConstants/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/dont-check-caches-in-non-experimental-ic.txt delete mode 100644 jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/classRecreated/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/functionBecameInline/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/internalClassChanged/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/moveClass/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/packageFileAdded/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/packageRemoved/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/removeClass/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/renameClass/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/experimental-ic-build.log delete mode 100644 jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/experimental-ic-build.log diff --git a/build-common/test/org/jetbrains/kotlin/incremental/testingUtils/BuildLogFinder.kt b/build-common/test/org/jetbrains/kotlin/incremental/testingUtils/BuildLogFinder.kt index 502a496756b..b8ae57d2b9c 100644 --- a/build-common/test/org/jetbrains/kotlin/incremental/testingUtils/BuildLogFinder.kt +++ b/build-common/test/org/jetbrains/kotlin/incremental/testingUtils/BuildLogFinder.kt @@ -19,14 +19,12 @@ package org.jetbrains.kotlin.incremental.testingUtils import java.io.File class BuildLogFinder( - private val isExperimentalEnabled: Boolean = false, private val isDataContainerBuildLogEnabled: Boolean = false, private val isGradleEnabled: Boolean = false ) { companion object { private const val GRADLE_LOG = "gradle-build.log" private const val DATA_CONTAINER_LOG = "data-container-version-build.log" - private const val EXPERIMENTAL_LOG = "experimental-ic-build.log" private const val SIMPLE_LOG = "build.log" } @@ -36,7 +34,6 @@ class BuildLogFinder( val matchedName = when { isGradleEnabled && GRADLE_LOG in files -> GRADLE_LOG isDataContainerBuildLogEnabled && DATA_CONTAINER_LOG in files -> DATA_CONTAINER_LOG - isExperimentalEnabled && EXPERIMENTAL_LOG in files -> EXPERIMENTAL_LOG SIMPLE_LOG in files -> SIMPLE_LOG else -> null } diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/KotlinStandaloneIncrementalCompilationTest.kt b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/KotlinStandaloneIncrementalCompilationTest.kt index c3596b08c98..689c25a3e5c 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/KotlinStandaloneIncrementalCompilationTest.kt +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/KotlinStandaloneIncrementalCompilationTest.kt @@ -189,7 +189,7 @@ class KotlinStandaloneIncrementalCompilationTest : TestWithWorkingDir() { File(jpsResourcesPath, "changeIncrementalOption"), File(jpsResourcesPath, "custom"), File(jpsResourcesPath, "lookupTracker")) - private val buildLogFinder = BuildLogFinder(isExperimentalEnabled = true, isGradleEnabled = true) + private val buildLogFinder = BuildLogFinder(isGradleEnabled = true) @Suppress("unused") @Parameterized.Parameters(name = "{1}") diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index eee914ebc4d..76dfa819f81 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -79,7 +79,7 @@ abstract class AbstractIncrementalJpsTest( protected var mapWorkingToOriginalFile: MutableMap = hashMapOf() protected open val buildLogFinder: BuildLogFinder - get() = BuildLogFinder(isExperimentalEnabled = true) + get() = BuildLogFinder() private fun enableDebugLogging() { com.intellij.openapi.diagnostic.Logger.setFactory(TestLoggerFactory::class.java) diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt index b15fb2daad9..418162340fb 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt @@ -37,7 +37,7 @@ abstract class AbstractExperimentalIncrementalCacheVersionChangedTest : Abstract abstract class AbstractDataContainerVersionChangedTest : AbstractExperimentalIncrementalCacheVersionChangedTest() { override val buildLogFinder: BuildLogFinder - get() = BuildLogFinder(isExperimentalEnabled = true, isDataContainerBuildLogEnabled = true) + get() = BuildLogFinder(isDataContainerBuildLogEnabled = true) override fun getVersions(cacheVersionProvider: CacheVersionProvider, targets: Iterable) = listOf(cacheVersionProvider.dataContainerVersion()) diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log b/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log index 81ba2b80649..efacb1f6e61 100644 --- a/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log +++ b/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log @@ -7,13 +7,17 @@ End of files Compiling files: src/constant.kt End of files +Marked as dirty by Kotlin: + src/usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/META-INF/module.kotlin_module + out/production/module/constant/ConstantKt.class out/production/module/usage/UsageKt.class End of files Compiling files: + src/constant.kt src/usage.kt End of files Exit code: OK diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/constant/experimental-ic-build.log b/jps-plugin/testData/incremental/lazyKotlinCaches/constant/experimental-ic-build.log deleted file mode 100644 index efacb1f6e61..00000000000 --- a/jps-plugin/testData/incremental/lazyKotlinCaches/constant/experimental-ic-build.log +++ /dev/null @@ -1,24 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/constant/ConstantKt.class -End of files -Compiling files: - src/constant.kt -End of files -Marked as dirty by Kotlin: - src/usage.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/constant/ConstantKt.class - out/production/module/usage/UsageKt.class -End of files -Compiling files: - src/constant.kt - src/usage.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log b/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log index c58da41ebcd..5635273b818 100644 --- a/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log +++ b/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log @@ -8,6 +8,8 @@ End of files Compiling files: module2/src/b.kt End of files +Marked as dirty by Kotlin: + module1/src/a.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log b/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log deleted file mode 100644 index 5635273b818..00000000000 --- a/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log +++ /dev/null @@ -1,23 +0,0 @@ -================ Step #1 ================= - -Building module1, module2 -Cleaning output files: - out/production/module2/b/B.class - out/production/module2/b/BB.class -End of files -Compiling files: - module2/src/b.kt -End of files -Marked as dirty by Kotlin: - module1/src/a.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module1/a/A.class - out/production/module1/a/AA.class -End of files -Compiling files: - module1/src/a.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log b/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log index ea6970558f1..e198f99e034 100644 --- a/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log +++ b/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log @@ -8,15 +8,5 @@ End of files Compiling files: module2/src/b.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module1/META-INF/module1.kotlin_module - out/production/module1/a/A.class - out/production/module1/a/AKt.class -End of files -Compiling files: - module1/src/a.kt -End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/experimental-ic-build.log b/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/experimental-ic-build.log deleted file mode 100644 index e198f99e034..00000000000 --- a/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/experimental-ic-build.log +++ /dev/null @@ -1,12 +0,0 @@ -================ Step #1 ================= - -Building module1, module2 -Cleaning output files: - out/production/module2/META-INF/module2.kotlin_module - out/production/module2/b/BKt.class -End of files -Compiling files: - module2/src/b.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log b/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log index 0788779c4ee..29e6af99f89 100644 --- a/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log +++ b/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log @@ -10,20 +10,5 @@ Compiling files: module1/src/a.kt module1/src/c2.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module1/META-INF/module1.kotlin_module - out/production/module1/c/C1Kt.class - out/production/module2/META-INF/module2.kotlin_module - out/production/module2/b/B.class - out/production/module2/b/BKt.class -End of files -Compiling files: - module1/src/c1.kt -End of files -Compiling files: - module2/src/b.kt -End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/experimental-ic-build.log b/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/experimental-ic-build.log deleted file mode 100644 index 29e6af99f89..00000000000 --- a/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/experimental-ic-build.log +++ /dev/null @@ -1,14 +0,0 @@ -================ Step #1 ================= - -Building module1, module2 -Cleaning output files: - out/production/module1/META-INF/module1.kotlin_module - out/production/module1/a/AKt.class - out/production/module1/c/C2Kt.class -End of files -Compiling files: - module1/src/a.kt - module1/src/c2.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/multiModule/classAdded/build.log b/jps-plugin/testData/incremental/multiModule/classAdded/build.log index 46c607d8c12..7e91e1f8b82 100644 --- a/jps-plugin/testData/incremental/multiModule/classAdded/build.log +++ b/jps-plugin/testData/incremental/multiModule/classAdded/build.log @@ -7,12 +7,18 @@ Building module2 Compiling files: module2/src/A.kt End of files +Marked as dirty by Kotlin: + module1/src/A.kt + module2/src/B.kt + module2/src/createA.kt + module2/src/createB.kt + module2/src/useAfoo.kt + module2/src/useBbar.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/foo/B.class - out/production/module2/other/OtherKt.class out/production/module2/use/CreateAKt.class out/production/module2/use/CreateBKt.class out/production/module2/use/UseAfooKt.class @@ -22,7 +28,6 @@ Compiling files: module2/src/B.kt module2/src/createA.kt module2/src/createB.kt - module2/src/other.kt module2/src/useAfoo.kt module2/src/useBbar.kt End of files @@ -34,7 +39,13 @@ Unresolved reference: foo ================ Step #2 ================= Building module1 -Exit code: NOTHING_DONE +Cleaning output files: + out/production/module1/foo/A.class +End of files +Compiling files: + module1/src/A.kt +End of files +Exit code: OK ------------------------------------------ Building module2 Cleaning output files: @@ -45,7 +56,6 @@ Compiling files: module2/src/B.kt module2/src/createA.kt module2/src/createB.kt - module2/src/other.kt module2/src/useAfoo.kt module2/src/useBbar.kt End of files diff --git a/jps-plugin/testData/incremental/multiModule/classAdded/experimental-ic-build.log b/jps-plugin/testData/incremental/multiModule/classAdded/experimental-ic-build.log deleted file mode 100644 index 7e91e1f8b82..00000000000 --- a/jps-plugin/testData/incremental/multiModule/classAdded/experimental-ic-build.log +++ /dev/null @@ -1,63 +0,0 @@ -================ Step #1 ================= - -Building module1 -Exit code: NOTHING_DONE ------------------------------------------- -Building module2 -Compiling files: - module2/src/A.kt -End of files -Marked as dirty by Kotlin: - module1/src/A.kt - module2/src/B.kt - module2/src/createA.kt - module2/src/createB.kt - module2/src/useAfoo.kt - module2/src/useBbar.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module2/META-INF/module2.kotlin_module - out/production/module2/foo/B.class - out/production/module2/use/CreateAKt.class - out/production/module2/use/CreateBKt.class - out/production/module2/use/UseAfooKt.class - out/production/module2/use/UseBbarKt.class -End of files -Compiling files: - module2/src/B.kt - module2/src/createA.kt - module2/src/createB.kt - module2/src/useAfoo.kt - module2/src/useBbar.kt -End of files -Exit code: ABORT ------------------------------------------- -COMPILATION FAILED -Unresolved reference: foo - -================ Step #2 ================= - -Building module1 -Cleaning output files: - out/production/module1/foo/A.class -End of files -Compiling files: - module1/src/A.kt -End of files -Exit code: OK ------------------------------------------- -Building module2 -Cleaning output files: - out/production/module2/foo/A.class -End of files -Compiling files: - module2/src/A.kt - module2/src/B.kt - module2/src/createA.kt - module2/src/createB.kt - module2/src/useAfoo.kt - module2/src/useBbar.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/multiModule/classRemoved/build.log b/jps-plugin/testData/incremental/multiModule/classRemoved/build.log index b4f3a4f7b1a..1655258a750 100644 --- a/jps-plugin/testData/incremental/multiModule/classRemoved/build.log +++ b/jps-plugin/testData/incremental/multiModule/classRemoved/build.log @@ -1,7 +1,13 @@ ================ Step #1 ================= Building module1 -Exit code: NOTHING_DONE +Cleaning output files: + out/production/module1/foo/A.class +End of files +Compiling files: + module1/src/A.kt +End of files +Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/foo/A.class @@ -34,26 +40,23 @@ Compiling files: module2/src/createA.kt module2/src/useAfoo.kt End of files +Marked as dirty by Kotlin: + module1/src/A.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ -Cleaning output files: - out/production/module2/META-INF/module2.kotlin_module - out/production/module2/other/OtherKt.class - out/production/module2/use/CreateBKt.class - out/production/module2/use/UseBbarKt.class -End of files -Compiling files: - module2/src/createB.kt - module2/src/other.kt - module2/src/useBbar.kt -End of files -Exit code: OK +Exit code: NOTHING_DONE ------------------------------------------ ================ Step #3 ================= Building module1 -Exit code: NOTHING_DONE +Cleaning output files: + out/production/module1/foo/A.class +End of files +Compiling files: + module1/src/A.kt +End of files +Exit code: OK ------------------------------------------ Building module2 Compiling files: @@ -62,4 +65,4 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Expecting a top level declaration \ No newline at end of file +Expecting a top level declaration diff --git a/jps-plugin/testData/incremental/multiModule/classRemoved/experimental-ic-build.log b/jps-plugin/testData/incremental/multiModule/classRemoved/experimental-ic-build.log deleted file mode 100644 index 1655258a750..00000000000 --- a/jps-plugin/testData/incremental/multiModule/classRemoved/experimental-ic-build.log +++ /dev/null @@ -1,68 +0,0 @@ -================ Step #1 ================= - -Building module1 -Cleaning output files: - out/production/module1/foo/A.class -End of files -Compiling files: - module1/src/A.kt -End of files -Exit code: OK ------------------------------------------- -Cleaning output files: - out/production/module2/foo/A.class -End of files -Building module2 -Cleaning output files: - out/production/module2/META-INF/module2.kotlin_module - out/production/module2/foo/B.class - out/production/module2/use/CreateAKt.class - out/production/module2/use/UseAfooKt.class -End of files -Compiling files: - module2/src/B.kt - module2/src/createA.kt - module2/src/useAfoo.kt -End of files -Exit code: ABORT ------------------------------------------- -COMPILATION FAILED -Unresolved reference: boo - -================ Step #2 ================= - -Building module1 -Exit code: NOTHING_DONE ------------------------------------------- -Building module2 -Compiling files: - module2/src/B.kt - module2/src/createA.kt - module2/src/useAfoo.kt -End of files -Marked as dirty by Kotlin: - module1/src/A.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE ------------------------------------------- - -================ Step #3 ================= - -Building module1 -Cleaning output files: - out/production/module1/foo/A.class -End of files -Compiling files: - module1/src/A.kt -End of files -Exit code: OK ------------------------------------------- -Building module2 -Compiling files: - module2/src/failCompilation.kt -End of files -Exit code: ABORT ------------------------------------------- -COMPILATION FAILED -Expecting a top level declaration diff --git a/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log b/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log index e4757362cf1..8372482bd22 100644 --- a/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log +++ b/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log @@ -8,9 +8,18 @@ End of files Compiling files: module1/src/const.kt End of files +Marked as dirty by Kotlin: + module2/src/usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ -Exit code: NOTHING_DONE +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/test/ConstKt.class +End of files +Compiling files: + module1/src/const.kt +End of files +Exit code: OK ------------------------------------------ Building module2 Cleaning output files: diff --git a/jps-plugin/testData/incremental/multiModule/constantValueChanged/experimental-ic-build.log b/jps-plugin/testData/incremental/multiModule/constantValueChanged/experimental-ic-build.log deleted file mode 100644 index 8372482bd22..00000000000 --- a/jps-plugin/testData/incremental/multiModule/constantValueChanged/experimental-ic-build.log +++ /dev/null @@ -1,32 +0,0 @@ -================ Step #1 ================= - -Building module1 -Cleaning output files: - out/production/module1/META-INF/module1.kotlin_module - out/production/module1/test/ConstKt.class -End of files -Compiling files: - module1/src/const.kt -End of files -Marked as dirty by Kotlin: - module2/src/usage.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module1/META-INF/module1.kotlin_module - out/production/module1/test/ConstKt.class -End of files -Compiling files: - module1/src/const.kt -End of files -Exit code: OK ------------------------------------------- -Building module2 -Cleaning output files: - out/production/module2/usage/Usage.class -End of files -Compiling files: - module2/src/usage.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/build.log b/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/build.log index 8dda87a5c9d..b10de0a77e1 100644 --- a/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/build.log +++ b/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/build.log @@ -4,25 +4,24 @@ Building module1 Compiling files: module1/src/b.kt End of files +Marked as dirty by Kotlin: + module2/src/b.kt + module2/src/useClassB.kt + module2/src/useFunB.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ -Cleaning output files: - out/production/module1/META-INF/module1.kotlin_module - out/production/module1/a/A.class - out/production/module1/a/AKt.class -End of files -Compiling files: - module1/src/a.kt -End of files -Exit code: OK +Exit code: NOTHING_DONE ------------------------------------------ Building module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module + out/production/module2/b/B.class + out/production/module2/b/BKt.class out/production/module2/usage/UseClassBKt.class out/production/module2/usage/UseFunBKt.class End of files Compiling files: + module2/src/b.kt module2/src/useClassB.kt module2/src/useFunB.kt End of files diff --git a/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/experimental-ic-build.log b/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/experimental-ic-build.log deleted file mode 100644 index b10de0a77e1..00000000000 --- a/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/experimental-ic-build.log +++ /dev/null @@ -1,40 +0,0 @@ -================ Step #1 ================= - -Building module1 -Compiling files: - module1/src/b.kt -End of files -Marked as dirty by Kotlin: - module2/src/b.kt - module2/src/useClassB.kt - module2/src/useFunB.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE ------------------------------------------- -Building module2 -Cleaning output files: - out/production/module2/META-INF/module2.kotlin_module - out/production/module2/b/B.class - out/production/module2/b/BKt.class - out/production/module2/usage/UseClassBKt.class - out/production/module2/usage/UseFunBKt.class -End of files -Compiling files: - module2/src/b.kt - module2/src/useClassB.kt - module2/src/useFunB.kt -End of files -Exit code: OK ------------------------------------------- - -================ Step #2 ================= - -Building module1 -Compiling files: - module1/src/failCompilation.kt -End of files -Exit code: ABORT ------------------------------------------- -COMPILATION FAILED -Expecting a top level declaration diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log b/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log index 823900e9c2d..c564275c40e 100644 --- a/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log +++ b/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log @@ -7,7 +7,11 @@ End of files Compiling files: module1/src/a.kt End of files -Exit code: OK +Marked as dirty by Kotlin: + module2/src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE ------------------------------------------ Building module2 Cleaning output files: diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/experimental-ic-build.log b/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/experimental-ic-build.log deleted file mode 100644 index c564275c40e..00000000000 --- a/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/experimental-ic-build.log +++ /dev/null @@ -1,25 +0,0 @@ -================ Step #1 ================= - -Building module1 -Cleaning output files: - out/production/module1/a/A.class -End of files -Compiling files: - module1/src/a.kt -End of files -Marked as dirty by Kotlin: - module2/src/usage.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE ------------------------------------------- -Building module2 -Cleaning output files: - out/production/module2/META-INF/module2.kotlin_module - out/production/module2/usage/UsageKt.class -End of files -Compiling files: - module2/src/usage.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/build.log b/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/build.log index 53a48c0d9f1..341318a6b84 100644 --- a/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/build.log +++ b/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/build.log @@ -8,7 +8,11 @@ End of files Compiling files: module1/src/a.kt End of files -Exit code: OK +Marked as dirty by Kotlin: + module2/src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE ------------------------------------------ Building module2 Cleaning output files: diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/experimental-ic-build.log b/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/experimental-ic-build.log deleted file mode 100644 index 341318a6b84..00000000000 --- a/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/experimental-ic-build.log +++ /dev/null @@ -1,26 +0,0 @@ -================ Step #1 ================= - -Building module1 -Cleaning output files: - out/production/module1/META-INF/module1.kotlin_module - out/production/module1/a/AKt.class -End of files -Compiling files: - module1/src/a.kt -End of files -Marked as dirty by Kotlin: - module2/src/usage.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE ------------------------------------------- -Building module2 -Cleaning output files: - out/production/module2/META-INF/module2.kotlin_module - out/production/module2/usage/UsageKt.class -End of files -Compiling files: - module2/src/usage.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log b/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log index 823900e9c2d..c564275c40e 100644 --- a/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log +++ b/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log @@ -7,7 +7,11 @@ End of files Compiling files: module1/src/a.kt End of files -Exit code: OK +Marked as dirty by Kotlin: + module2/src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE ------------------------------------------ Building module2 Cleaning output files: diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/experimental-ic-build.log b/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/experimental-ic-build.log deleted file mode 100644 index c564275c40e..00000000000 --- a/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/experimental-ic-build.log +++ /dev/null @@ -1,25 +0,0 @@ -================ Step #1 ================= - -Building module1 -Cleaning output files: - out/production/module1/a/A.class -End of files -Compiling files: - module1/src/a.kt -End of files -Marked as dirty by Kotlin: - module2/src/usage.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE ------------------------------------------- -Building module2 -Cleaning output files: - out/production/module2/META-INF/module2.kotlin_module - out/production/module2/usage/UsageKt.class -End of files -Compiling files: - module2/src/usage.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/build.log b/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/build.log index 53a48c0d9f1..341318a6b84 100644 --- a/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/build.log +++ b/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/build.log @@ -8,7 +8,11 @@ End of files Compiling files: module1/src/a.kt End of files -Exit code: OK +Marked as dirty by Kotlin: + module2/src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE ------------------------------------------ Building module2 Cleaning output files: diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/experimental-ic-build.log b/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/experimental-ic-build.log deleted file mode 100644 index 341318a6b84..00000000000 --- a/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/experimental-ic-build.log +++ /dev/null @@ -1,26 +0,0 @@ -================ Step #1 ================= - -Building module1 -Cleaning output files: - out/production/module1/META-INF/module1.kotlin_module - out/production/module1/a/AKt.class -End of files -Compiling files: - module1/src/a.kt -End of files -Marked as dirty by Kotlin: - module2/src/usage.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE ------------------------------------------- -Building module2 -Cleaning output files: - out/production/module2/META-INF/module2.kotlin_module - out/production/module2/usage/UsageKt.class -End of files -Compiling files: - module2/src/usage.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/build.log b/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/build.log index 74ac77bb357..003b40aecfd 100644 --- a/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/build.log +++ b/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/build.log @@ -4,17 +4,12 @@ Building module1 Compiling files: module1/src/b.kt End of files +Marked as dirty by Kotlin: + module2/src/useClassB.kt + module2/src/useFunB.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ -Cleaning output files: - out/production/module1/META-INF/module1.kotlin_module - out/production/module1/a/A.class - out/production/module1/a/AKt.class -End of files -Compiling files: - module1/src/a.kt -End of files -Exit code: OK +Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module @@ -30,16 +25,9 @@ Compiling files: module2/src/useClassB.kt module2/src/useFunB.kt End of files +Marked as dirty by Kotlin: + module1/src/b.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ -Cleaning output files: - out/production/module2/META-INF/module2.kotlin_module - out/production/module2/usage/UseClassAKt.class - out/production/module2/usage/UseFunAKt.class -End of files -Compiling files: - module2/src/useClassA.kt - module2/src/useFunA.kt -End of files -Exit code: OK +Exit code: NOTHING_DONE ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/experimental-ic-build.log b/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/experimental-ic-build.log deleted file mode 100644 index 757cb7c283c..00000000000 --- a/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/experimental-ic-build.log +++ /dev/null @@ -1,34 +0,0 @@ -================ Step #1 ================= - -Building module1 -Compiling files: - module1/src/b.kt -End of files -Marked as dirty by Kotlin: - module2/src/b.kt - module2/src/useClassB.kt - module2/src/useFunB.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE ------------------------------------------- -Cleaning output files: - out/production/module2/META-INF/module2.kotlin_module - out/production/module2/b/B.class - out/production/module2/b/BKt.class -End of files -Building module2 -Cleaning output files: - out/production/module2/usage/UseClassBKt.class - out/production/module2/usage/UseFunBKt.class -End of files -Compiling files: - module2/src/useClassB.kt - module2/src/useFunB.kt -End of files -Marked as dirty by Kotlin: - module1/src/b.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE ------------------------------------------- diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log b/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log index f296b0fb943..6ddaba7c84b 100644 --- a/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log +++ b/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log @@ -9,7 +9,11 @@ End of files Compiling files: module1/src/a.kt End of files -Exit code: OK +Marked as dirty by Kotlin: + module2/src/b.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE ------------------------------------------ Building module2 Cleaning output files: diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependency/experimental-ic-build.log b/jps-plugin/testData/incremental/multiModule/simpleDependency/experimental-ic-build.log deleted file mode 100644 index 6ddaba7c84b..00000000000 --- a/jps-plugin/testData/incremental/multiModule/simpleDependency/experimental-ic-build.log +++ /dev/null @@ -1,27 +0,0 @@ -================ Step #1 ================= - -Building module1 -Cleaning output files: - out/production/module1/META-INF/module1.kotlin_module - out/production/module1/a/A.class - out/production/module1/a/AKt.class -End of files -Compiling files: - module1/src/a.kt -End of files -Marked as dirty by Kotlin: - module2/src/b.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE ------------------------------------------- -Building module2 -Cleaning output files: - out/production/module2/META-INF/module2.kotlin_module - out/production/module2/b/BKt.class -End of files -Compiling files: - module2/src/b.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log index e8d2aee5cc8..21e1a572541 100644 --- a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log +++ b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log @@ -11,7 +11,11 @@ End of files Compiling files: module1/src/a.kt End of files -Exit code: OK +Marked as dirty by Kotlin: + module2/src/b.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE ------------------------------------------ Building module2 Cleaning output files: diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log deleted file mode 100644 index 21e1a572541..00000000000 --- a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log +++ /dev/null @@ -1,39 +0,0 @@ -================ Step #1 ================= - -Building module1 -Cleaning output files: - out/production/module1/META-INF/module1.kotlin_module - out/production/module1/a/A.class - out/production/module1/a/AKt.class - out/production/module1/a/ClassAnnotation.class - out/production/module1/a/FileAnnotation.class -End of files -Compiling files: - module1/src/a.kt -End of files -Marked as dirty by Kotlin: - module2/src/b.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE ------------------------------------------- -Building module2 -Cleaning output files: - out/production/module2/META-INF/module2.kotlin_module - out/production/module2/b/B.class - out/production/module2/b/BKt.class -End of files -Compiling files: - module2/src/b.kt -End of files -Exit code: ABORT ------------------------------------------- -COMPILATION FAILED -Cannot access 'FileAnnotation': it is internal in 'a' -Cannot access 'A': it is internal in 'a' -Cannot access 'FileAnnotation': it is internal in 'a' -Cannot access 'ClassAnnotation': it is internal in 'a' -Cannot access 'ClassAnnotation': it is internal in 'a' -'public' function exposes its 'internal' parameter type A -Cannot access 'A': it is internal in 'a' -Cannot access 'a': it is internal in 'a' diff --git a/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log b/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log index 274d1daaa59..4efd21570b5 100644 --- a/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log +++ b/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log @@ -9,7 +9,11 @@ End of files Compiling files: module1/src/a.kt End of files -Exit code: OK +Marked as dirty by Kotlin: + module2/src/b.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE ------------------------------------------ Building module2 Cleaning output files: diff --git a/jps-plugin/testData/incremental/multiModule/transitiveDependency/experimental-ic-build.log b/jps-plugin/testData/incremental/multiModule/transitiveDependency/experimental-ic-build.log deleted file mode 100644 index 4efd21570b5..00000000000 --- a/jps-plugin/testData/incremental/multiModule/transitiveDependency/experimental-ic-build.log +++ /dev/null @@ -1,30 +0,0 @@ -================ Step #1 ================= - -Building module1 -Cleaning output files: - out/production/module1/META-INF/module1.kotlin_module - out/production/module1/a/A.class - out/production/module1/a/AKt.class -End of files -Compiling files: - module1/src/a.kt -End of files -Marked as dirty by Kotlin: - module2/src/b.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE ------------------------------------------- -Building module2 -Cleaning output files: - out/production/module2/META-INF/module2.kotlin_module - out/production/module2/b/BKt.class -End of files -Compiling files: - module2/src/b.kt -End of files -Exit code: OK ------------------------------------------- -Building module3 -Exit code: NOTHING_DONE ------------------------------------------- diff --git a/jps-plugin/testData/incremental/multiModule/twoDependants/build.log b/jps-plugin/testData/incremental/multiModule/twoDependants/build.log index b6d4c85694c..10e8f1351b5 100644 --- a/jps-plugin/testData/incremental/multiModule/twoDependants/build.log +++ b/jps-plugin/testData/incremental/multiModule/twoDependants/build.log @@ -9,7 +9,12 @@ End of files Compiling files: module1/src/a.kt End of files -Exit code: OK +Marked as dirty by Kotlin: + module2/src/b.kt + module3/src/c.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE ------------------------------------------ Building module2 Cleaning output files: diff --git a/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log b/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log deleted file mode 100644 index 10e8f1351b5..00000000000 --- a/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log +++ /dev/null @@ -1,38 +0,0 @@ -================ Step #1 ================= - -Building module1 -Cleaning output files: - out/production/module1/META-INF/module1.kotlin_module - out/production/module1/a/A.class - out/production/module1/a/AKt.class -End of files -Compiling files: - module1/src/a.kt -End of files -Marked as dirty by Kotlin: - module2/src/b.kt - module3/src/c.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE ------------------------------------------- -Building module2 -Cleaning output files: - out/production/module2/META-INF/module2.kotlin_module - out/production/module2/b/BKt.class -End of files -Compiling files: - module2/src/b.kt -End of files -Exit code: OK ------------------------------------------- -Building module3 -Cleaning output files: - out/production/module3/META-INF/module3.kotlin_module - out/production/module3/c/CKt.class -End of files -Compiling files: - module3/src/c.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/build.log b/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/build.log index 5fdf7c1b9cc..d0f049c8713 100644 --- a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/build.log @@ -7,17 +7,15 @@ End of files Compiling files: src/b.kt End of files +Marked as dirty by Kotlin: + src/usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/META-INF/module.kotlin_module - out/production/module/other/OtherKt.class - out/production/module/test/AKt.class out/production/module/test/UsageKt.class End of files Compiling files: - src/a.kt - src/other.kt src/usage.kt End of files Exit code: OK diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/experimental-ic-build.log deleted file mode 100644 index d0f049c8713..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/experimental-ic-build.log +++ /dev/null @@ -1,22 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/BKt.class -End of files -Compiling files: - src/b.kt -End of files -Marked as dirty by Kotlin: - src/usage.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/UsageKt.class -End of files -Compiling files: - src/usage.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/addClass/build.log b/jps-plugin/testData/incremental/pureKotlin/addClass/build.log index 5a960463450..9d2a2de8931 100644 --- a/jps-plugin/testData/incremental/pureKotlin/addClass/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/addClass/build.log @@ -3,17 +3,18 @@ Compiling files: src/A.kt End of files +Marked as dirty by Kotlin: + src/funA.kt + src/useA.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/foo/FunAKt.class - out/production/module/other/OtherKt.class out/production/module/use/UseAKt.class End of files Compiling files: src/funA.kt - src/other.kt src/useA.kt End of files Exit code: OK diff --git a/jps-plugin/testData/incremental/pureKotlin/addClass/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/addClass/experimental-ic-build.log deleted file mode 100644 index 9d2a2de8931..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/addClass/experimental-ic-build.log +++ /dev/null @@ -1,21 +0,0 @@ -================ Step #1 ================= - -Compiling files: - src/A.kt -End of files -Marked as dirty by Kotlin: - src/funA.kt - src/useA.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/foo/FunAKt.class - out/production/module/use/UseAKt.class -End of files -Compiling files: - src/funA.kt - src/useA.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/build.log b/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/build.log index d91362e7c4c..3d8ecd171a1 100644 --- a/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/build.log @@ -3,17 +3,18 @@ Compiling files: src/foo2.kt End of files +Marked as dirty by Kotlin: + src/foo1.kt + src/use.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/foo/Foo1Kt.class - out/production/module/other/OtherKt.class out/production/module/use/UseKt.class End of files Compiling files: src/foo1.kt - src/other.kt src/use.kt End of files Exit code: OK diff --git a/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/experimental-ic-build.log deleted file mode 100644 index 3d8ecd171a1..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/experimental-ic-build.log +++ /dev/null @@ -1,21 +0,0 @@ -================ Step #1 ================= - -Compiling files: - src/foo2.kt -End of files -Marked as dirty by Kotlin: - src/foo1.kt - src/use.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/foo/Foo1Kt.class - out/production/module/use/UseKt.class -End of files -Compiling files: - src/foo1.kt - src/use.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/build.log b/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/build.log index e7664fe6108..523076d8fd0 100644 --- a/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/build.log @@ -7,16 +7,16 @@ End of files Compiling files: src/a.kt End of files +Marked as dirty by Kotlin: + src/a1Usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/usage/A1UsageKt.class - out/production/module/usage/A2UsageKt.class End of files Compiling files: src/a1Usage.kt - src/a2Usage.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/experimental-ic-build.log deleted file mode 100644 index 523076d8fd0..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/experimental-ic-build.log +++ /dev/null @@ -1,22 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/a/Outer$B.class - out/production/module/a/Outer.class -End of files -Compiling files: - src/a.kt -End of files -Marked as dirty by Kotlin: - src/a1Usage.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/usage/A1UsageKt.class -End of files -Compiling files: - src/a1Usage.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/build.log b/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/build.log index 6996a4d490b..4f5133e9753 100644 --- a/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/build.log @@ -8,16 +8,16 @@ End of files Compiling files: src/a.kt End of files +Marked as dirty by Kotlin: + src/a1Usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/usage/A1UsageKt.class - out/production/module/usage/A2UsageKt.class End of files Compiling files: src/a1Usage.kt - src/a2Usage.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/experimental-ic-build.log deleted file mode 100644 index 4f5133e9753..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/experimental-ic-build.log +++ /dev/null @@ -1,23 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/a/AKt.class - out/production/module/a/B.class -End of files -Compiling files: - src/a.kt -End of files -Marked as dirty by Kotlin: - src/a1Usage.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/usage/A1UsageKt.class -End of files -Compiling files: - src/a1Usage.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log b/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log index e92b97f77a8..2b59cc2ecff 100644 --- a/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log @@ -19,12 +19,17 @@ End of files Compiling files: src/const.kt End of files +Marked as dirty by Kotlin: + src/usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/ConstKt.class out/production/module/test/Usage.class End of files Compiling files: + src/const.kt src/usage.kt End of files Exit code: OK diff --git a/jps-plugin/testData/incremental/pureKotlin/allConstants/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/allConstants/experimental-ic-build.log deleted file mode 100644 index 2b59cc2ecff..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/allConstants/experimental-ic-build.log +++ /dev/null @@ -1,36 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/ConstKt.class -End of files -Compiling files: - src/const.kt -End of files -Exit code: OK ------------------------------------------- - -================ Step #2 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/ConstKt.class -End of files -Compiling files: - src/const.kt -End of files -Marked as dirty by Kotlin: - src/usage.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/ConstKt.class - out/production/module/test/Usage.class -End of files -Compiling files: - src/const.kt - src/usage.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/build.log b/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/build.log index 36487c59f20..a958ab5ed8f 100644 --- a/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/build.log @@ -7,6 +7,8 @@ End of files Compiling files: src/usage1.kt End of files +Marked as dirty by Kotlin: + src/usage2.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: @@ -16,5 +18,16 @@ End of files Compiling files: src/usage2.kt End of files +Marked as dirty by Kotlin: + src/usage1.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/Usage1Kt.class +End of files +Compiling files: + src/usage1.kt +End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/dont-check-caches-in-non-experimental-ic.txt b/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/dont-check-caches-in-non-experimental-ic.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/experimental-ic-build.log deleted file mode 100644 index a958ab5ed8f..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/experimental-ic-build.log +++ /dev/null @@ -1,33 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/Usage1Kt.class -End of files -Compiling files: - src/usage1.kt -End of files -Marked as dirty by Kotlin: - src/usage2.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/Usage2Kt.class -End of files -Compiling files: - src/usage2.kt -End of files -Marked as dirty by Kotlin: - src/usage1.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/Usage1Kt.class -End of files -Compiling files: - src/usage1.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log index fb1d8a2567e..8b4f21d7ead 100644 --- a/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log @@ -7,12 +7,17 @@ End of files Compiling files: src/const.kt End of files +Marked as dirty by Kotlin: + src/usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: + out/production/module/test/Klass$Companion.class + out/production/module/test/Klass.class out/production/module/test/Usage.class End of files Compiling files: + src/const.kt src/usage.kt End of files Exit code: OK diff --git a/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/experimental-ic-build.log deleted file mode 100644 index 8b4f21d7ead..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/experimental-ic-build.log +++ /dev/null @@ -1,24 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/test/Klass$Companion.class - out/production/module/test/Klass.class -End of files -Compiling files: - src/const.kt -End of files -Marked as dirty by Kotlin: - src/usage.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/test/Klass$Companion.class - out/production/module/test/Klass.class - out/production/module/test/Usage.class -End of files -Compiling files: - src/const.kt - src/usage.kt -End of files -Exit code: OK ------------------------------------------- \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log b/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log index bad1fc16aa9..d74096ec08b 100644 --- a/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log @@ -5,15 +5,6 @@ Cleaning output files: End of files Compiling files: End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/OtherKt.class -End of files -Compiling files: - src/other.kt -End of files Exit code: OK ------------------------------------------ @@ -22,14 +13,5 @@ Exit code: OK Compiling files: src/A.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/OtherKt.class -End of files -Compiling files: - src/other.kt -End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/pureKotlin/classRecreated/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/classRecreated/experimental-ic-build.log deleted file mode 100644 index d74096ec08b..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/classRecreated/experimental-ic-build.log +++ /dev/null @@ -1,17 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/test/A.class -End of files -Compiling files: -End of files -Exit code: OK ------------------------------------------- - -================ Step #2 ================= - -Compiling files: - src/A.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log index dec1e35b4f8..84d1cdafe6f 100644 --- a/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log @@ -6,6 +6,8 @@ End of files Compiling files: src/class.kt End of files +Marked as dirty by Kotlin: + src/usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: diff --git a/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/experimental-ic-build.log deleted file mode 100644 index 84d1cdafe6f..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/experimental-ic-build.log +++ /dev/null @@ -1,21 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/test/Klass.class -End of files -Compiling files: - src/class.kt -End of files -Marked as dirty by Kotlin: - src/usage.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/UsageKt.class -End of files -Compiling files: - src/usage.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log index 1529b7328e6..6a249e3d749 100644 --- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log @@ -20,14 +20,5 @@ Expecting an expression Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/FunKt.class - out/production/module/META-INF/module.kotlin_module -End of files -Compiling files: - src/fun.kt -End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/experimental-ic-build.log deleted file mode 100644 index 6a249e3d749..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/experimental-ic-build.log +++ /dev/null @@ -1,24 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/OtherKt.class -End of files -Cleaning output files: - out/production/module/UsageKt.class -End of files -Compiling files: - src/usage.kt -End of files -Exit code: ABORT ------------------------------------------- -COMPILATION FAILED -Expecting an expression - -================ Step #2 ================= - -Compiling files: - src/usage.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log index 0a51d3fc3ac..ed84bb8e478 100644 --- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log @@ -20,14 +20,5 @@ Compiling files: src/other.kt src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/FunKt.class - out/production/module/META-INF/module.kotlin_module -End of files -Compiling files: - src/fun.kt -End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/experimental-ic-build.log deleted file mode 100644 index ed84bb8e478..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/experimental-ic-build.log +++ /dev/null @@ -1,24 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/OtherKt.class - out/production/module/UsageKt.class -End of files -Compiling files: - src/other.kt - src/usage.kt -End of files -Exit code: ABORT ------------------------------------------- -COMPILATION FAILED -Expecting an expression - -================ Step #2 ================= - -Compiling files: - src/other.kt - src/usage.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log index bafc9adc1bd..7722838c8fe 100644 --- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log @@ -20,17 +20,13 @@ Compiling files: src/other.kt src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED +Exit code: OK ------------------------------------------ Cleaning output files: - out/production/module/A.class out/production/module/META-INF/module.kotlin_module out/production/module/UsageKt.class - out/production/module/new/LikePartKt.class End of files Compiling files: - src/fun.kt - src/likePart.kt src/usage.kt End of files Exit code: OK diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/experimental-ic-build.log deleted file mode 100644 index 7722838c8fe..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/experimental-ic-build.log +++ /dev/null @@ -1,33 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/B.class - out/production/module/META-INF/module.kotlin_module - out/production/module/UsageKt.class -End of files -Compiling files: - src/other.kt - src/usage.kt -End of files -Exit code: ABORT ------------------------------------------- -COMPILATION FAILED -Expecting an expression - -================ Step #2 ================= - -Compiling files: - src/other.kt - src/usage.kt -End of files -Exit code: OK ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/UsageKt.class -End of files -Compiling files: - src/usage.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/build.log b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/build.log index f0bdbb8c6f7..ed5652a5e41 100644 --- a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/build.log @@ -6,24 +6,22 @@ End of files Compiling files: src/A.kt End of files +Marked as dirty by Kotlin: + src/B.kt + src/createA.kt + src/useA.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/foo/B.class - out/production/module/foo/C.class out/production/module/foo/CreateAKt.class - out/production/module/foo/CreateBKt.class out/production/module/foo/UseAKt.class - out/production/module/foo/UseBKt.class End of files Compiling files: src/B.kt - src/C.kt src/createA.kt - src/createB.kt src/useA.kt - src/useB.kt End of files Exit code: OK ------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/experimental-ic-build.log deleted file mode 100644 index ed5652a5e41..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/experimental-ic-build.log +++ /dev/null @@ -1,27 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/foo/A.class -End of files -Compiling files: - src/A.kt -End of files -Marked as dirty by Kotlin: - src/B.kt - src/createA.kt - src/useA.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/foo/B.class - out/production/module/foo/CreateAKt.class - out/production/module/foo/UseAKt.class -End of files -Compiling files: - src/B.kt - src/createA.kt - src/useA.kt -End of files -Exit code: OK ------------------------------------------- \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/build.log index 430625ca53d..0ee15e9f36d 100644 --- a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/build.log @@ -6,26 +6,25 @@ End of files Compiling files: src/A.kt End of files +Marked as dirty by Kotlin: + src/B.kt + src/createADefault.kt + src/createANonDefault.kt + src/useA.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/foo/B.class - out/production/module/foo/C.class out/production/module/foo/CreateADefaultKt.class out/production/module/foo/CreateANonDefaultKt.class - out/production/module/foo/CreateBKt.class out/production/module/foo/UseAKt.class - out/production/module/foo/UseBKt.class End of files Compiling files: src/B.kt - src/C.kt src/createADefault.kt src/createANonDefault.kt - src/createB.kt src/useA.kt - src/useB.kt End of files Exit code: ABORT ------------------------------------------ @@ -40,11 +39,8 @@ End of files Compiling files: src/A.kt src/B.kt - src/C.kt src/createADefault.kt - src/createB.kt src/useA.kt - src/useB.kt End of files Exit code: OK ------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/experimental-ic-build.log deleted file mode 100644 index 0ee15e9f36d..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/experimental-ic-build.log +++ /dev/null @@ -1,46 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/foo/A.class -End of files -Compiling files: - src/A.kt -End of files -Marked as dirty by Kotlin: - src/B.kt - src/createADefault.kt - src/createANonDefault.kt - src/useA.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/foo/B.class - out/production/module/foo/CreateADefaultKt.class - out/production/module/foo/CreateANonDefaultKt.class - out/production/module/foo/UseAKt.class -End of files -Compiling files: - src/B.kt - src/createADefault.kt - src/createANonDefault.kt - src/useA.kt -End of files -Exit code: ABORT ------------------------------------------- -COMPILATION FAILED -Too many arguments for public constructor A() defined in foo.A - -================ Step #2 ================= - -Cleaning output files: - out/production/module/foo/A.class -End of files -Compiling files: - src/A.kt - src/B.kt - src/createADefault.kt - src/useA.kt -End of files -Exit code: OK ------------------------------------------- \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/build.log b/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/build.log index e5448796571..9c5c62e65b4 100644 --- a/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/build.log @@ -7,16 +7,17 @@ End of files Compiling files: src/fun.kt End of files +Marked as dirty by Kotlin: + src/useDefault.kt + src/useNonDefault.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/META-INF/module.kotlin_module - out/production/module/other/OtherKt.class out/production/module/test/UseDefaultKt.class out/production/module/test/UseNonDefaultKt.class End of files Compiling files: - src/other.kt src/useDefault.kt src/useNonDefault.kt End of files diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/experimental-ic-build.log deleted file mode 100644 index 9c5c62e65b4..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/experimental-ic-build.log +++ /dev/null @@ -1,25 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/FunKt.class -End of files -Compiling files: - src/fun.kt -End of files -Marked as dirty by Kotlin: - src/useDefault.kt - src/useNonDefault.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/UseDefaultKt.class - out/production/module/test/UseNonDefaultKt.class -End of files -Compiling files: - src/useDefault.kt - src/useNonDefault.kt -End of files -Exit code: OK ------------------------------------------- \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/build.log b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/build.log index eb037521ebe..ffa764fb740 100644 --- a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/build.log @@ -8,26 +8,25 @@ End of files Compiling files: src/A.kt End of files +Marked as dirty by Kotlin: + src/B.kt + src/createADefault.kt + src/createANonDefault.kt + src/useA.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/foo/B.class - out/production/module/foo/C.class out/production/module/foo/CreateADefaultKt.class out/production/module/foo/CreateANonDefaultKt.class - out/production/module/foo/CreateBKt.class out/production/module/foo/UseAKt.class - out/production/module/foo/UseBKt.class End of files Compiling files: src/B.kt - src/C.kt src/createADefault.kt src/createANonDefault.kt - src/createB.kt src/useA.kt - src/useB.kt End of files Exit code: OK ------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/experimental-ic-build.log deleted file mode 100644 index ffa764fb740..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/experimental-ic-build.log +++ /dev/null @@ -1,32 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/foo/A.class - out/production/module/foo/AKt.class -End of files -Compiling files: - src/A.kt -End of files -Marked as dirty by Kotlin: - src/B.kt - src/createADefault.kt - src/createANonDefault.kt - src/useA.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/foo/B.class - out/production/module/foo/CreateADefaultKt.class - out/production/module/foo/CreateANonDefaultKt.class - out/production/module/foo/UseAKt.class -End of files -Compiling files: - src/B.kt - src/createADefault.kt - src/createANonDefault.kt - src/useA.kt -End of files -Exit code: OK ------------------------------------------- \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/build.log index 8976835024b..938c0cb5792 100644 --- a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/build.log @@ -6,26 +6,25 @@ End of files Compiling files: src/A.kt End of files +Marked as dirty by Kotlin: + src/B.kt + src/createADefault.kt + src/createANonDefault.kt + src/useA.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/foo/B.class - out/production/module/foo/C.class out/production/module/foo/CreateADefaultKt.class out/production/module/foo/CreateANonDefaultKt.class - out/production/module/foo/CreateBKt.class out/production/module/foo/UseAKt.class - out/production/module/foo/UseBKt.class End of files Compiling files: src/B.kt - src/C.kt src/createADefault.kt src/createANonDefault.kt - src/createB.kt src/useA.kt - src/useB.kt End of files Exit code: ABORT ------------------------------------------ @@ -41,12 +40,9 @@ End of files Compiling files: src/A.kt src/B.kt - src/C.kt src/createADefault.kt src/createANonDefault.kt - src/createB.kt src/useA.kt - src/useB.kt End of files Exit code: OK ------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/experimental-ic-build.log deleted file mode 100644 index 938c0cb5792..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/experimental-ic-build.log +++ /dev/null @@ -1,48 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/foo/A.class -End of files -Compiling files: - src/A.kt -End of files -Marked as dirty by Kotlin: - src/B.kt - src/createADefault.kt - src/createANonDefault.kt - src/useA.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/foo/B.class - out/production/module/foo/CreateADefaultKt.class - out/production/module/foo/CreateANonDefaultKt.class - out/production/module/foo/UseAKt.class -End of files -Compiling files: - src/B.kt - src/createADefault.kt - src/createANonDefault.kt - src/useA.kt -End of files -Exit code: ABORT ------------------------------------------- -COMPILATION FAILED -No value passed for parameter 'x' -No value passed for parameter 'x' - -================ Step #2 ================= - -Cleaning output files: - out/production/module/foo/A.class -End of files -Compiling files: - src/A.kt - src/B.kt - src/createADefault.kt - src/createANonDefault.kt - src/useA.kt -End of files -Exit code: OK ------------------------------------------- \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/build.log b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/build.log index c38746b4aa5..a2c286b758a 100644 --- a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/build.log @@ -7,16 +7,17 @@ End of files Compiling files: src/fun.kt End of files +Marked as dirty by Kotlin: + src/useDefault.kt + src/useNonDefault.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/META-INF/module.kotlin_module - out/production/module/other/OtherKt.class out/production/module/test/UseDefaultKt.class out/production/module/test/UseNonDefaultKt.class End of files Compiling files: - src/other.kt src/useDefault.kt src/useNonDefault.kt End of files @@ -32,7 +33,6 @@ Cleaning output files: End of files Compiling files: src/fun.kt - src/other.kt src/useDefault.kt src/useNonDefault.kt End of files diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/experimental-ic-build.log deleted file mode 100644 index a2c286b758a..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/experimental-ic-build.log +++ /dev/null @@ -1,40 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/FunKt.class -End of files -Compiling files: - src/fun.kt -End of files -Marked as dirty by Kotlin: - src/useDefault.kt - src/useNonDefault.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/UseDefaultKt.class - out/production/module/test/UseNonDefaultKt.class -End of files -Compiling files: - src/useDefault.kt - src/useNonDefault.kt -End of files -Exit code: ABORT ------------------------------------------- -COMPILATION FAILED -No value passed for parameter 'x' - -================ Step #2 ================= - -Cleaning output files: - out/production/module/test/FunKt.class -End of files -Compiling files: - src/fun.kt - src/useDefault.kt - src/useNonDefault.kt -End of files -Exit code: OK ------------------------------------------- \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/build.log b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/build.log index d05014c1388..63fae62a61e 100644 --- a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/build.log @@ -7,17 +7,19 @@ End of files Compiling files: src/fun.kt End of files +Marked as dirty by Kotlin: + src/useDefault1.kt + src/useDefault2.kt + src/useNonDefault.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/META-INF/module.kotlin_module - out/production/module/other/OtherKt.class out/production/module/test/UseDefault1Kt.class out/production/module/test/UseDefault2Kt.class out/production/module/test/UseNonDefaultKt.class End of files Compiling files: - src/other.kt src/useDefault1.kt src/useDefault2.kt src/useNonDefault.kt @@ -35,7 +37,6 @@ Cleaning output files: End of files Compiling files: src/fun.kt - src/other.kt src/useDefault1.kt src/useDefault2.kt src/useNonDefault.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/experimental-ic-build.log deleted file mode 100644 index 63fae62a61e..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/experimental-ic-build.log +++ /dev/null @@ -1,45 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/FunKt.class -End of files -Compiling files: - src/fun.kt -End of files -Marked as dirty by Kotlin: - src/useDefault1.kt - src/useDefault2.kt - src/useNonDefault.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/UseDefault1Kt.class - out/production/module/test/UseDefault2Kt.class - out/production/module/test/UseNonDefaultKt.class -End of files -Compiling files: - src/useDefault1.kt - src/useDefault2.kt - src/useNonDefault.kt -End of files -Exit code: ABORT ------------------------------------------- -COMPILATION FAILED -No value passed for parameter 'y' -No value passed for parameter 'y' - -================ Step #2 ================= - -Cleaning output files: - out/production/module/test/FunKt.class -End of files -Compiling files: - src/fun.kt - src/useDefault1.kt - src/useDefault2.kt - src/useNonDefault.kt -End of files -Exit code: OK ------------------------------------------- \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log index 5e2bfab9714..841acd22cd2 100644 --- a/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log @@ -6,6 +6,8 @@ Cleaning output files: End of files Compiling files: End of files +Marked as dirty by Kotlin: + src/usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: diff --git a/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/experimental-ic-build.log deleted file mode 100644 index 841acd22cd2..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/experimental-ic-build.log +++ /dev/null @@ -1,24 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/ConstKt.class -End of files -Compiling files: -End of files -Marked as dirty by Kotlin: - src/usage.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/usage/UsageKt.class -End of files -Compiling files: - src/usage.kt -End of files -Exit code: ABORT ------------------------------------------- -COMPILATION FAILED -Unresolved reference: test -An annotation parameter must be a compile-time constant diff --git a/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log index 31b42a3d8c3..98e6b08649a 100644 --- a/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log @@ -6,6 +6,8 @@ Cleaning output files: End of files Compiling files: End of files +Marked as dirty by Kotlin: + src/usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: diff --git a/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/experimental-ic-build.log deleted file mode 100644 index 98e6b08649a..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/experimental-ic-build.log +++ /dev/null @@ -1,23 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/InlineKt.class -End of files -Compiling files: -End of files -Marked as dirty by Kotlin: - src/usage.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/usage/UsageKt.class -End of files -Compiling files: - src/usage.kt -End of files -Exit code: ABORT ------------------------------------------- -COMPILATION FAILED -Unresolved reference: test diff --git a/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log b/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log index 68a5e63cff8..669e2b72119 100644 --- a/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log @@ -9,14 +9,5 @@ Compiling files: src/b.kt src/c.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/foo/AKt.class -End of files -Compiling files: - src/a.kt -End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/experimental-ic-build.log deleted file mode 100644 index 669e2b72119..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/experimental-ic-build.log +++ /dev/null @@ -1,13 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/bar/CKt.class - out/production/module/foo/BKt.class -End of files -Compiling files: - src/b.kt - src/c.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/build.log b/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/build.log index 371bc7cb855..10803d22f67 100644 --- a/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/build.log @@ -6,6 +6,8 @@ End of files Compiling files: src/fun.kt End of files +Marked as dirty by Kotlin: + src/usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: diff --git a/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/experimental-ic-build.log deleted file mode 100644 index 10803d22f67..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/experimental-ic-build.log +++ /dev/null @@ -1,21 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/Y.class -End of files -Compiling files: - src/fun.kt -End of files -Marked as dirty by Kotlin: - src/usage.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/X$main$1.class - out/production/module/X.class -End of files -Compiling files: - src/usage.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/build.log b/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/build.log index 2320b705b27..b908417e51c 100644 --- a/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/build.log @@ -7,14 +7,5 @@ End of files Compiling files: src/inline.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/other/OtherKt.class -End of files -Compiling files: - src/other.kt -End of files Exit code: OK ------------------------------------------- +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/experimental-ic-build.log deleted file mode 100644 index b908417e51c..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/experimental-ic-build.log +++ /dev/null @@ -1,11 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/foo/InlineKt.class -End of files -Compiling files: - src/inline.kt -End of files -Exit code: OK ------------------------------------------- \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/build.log index 8af6b65b4d0..c6433f94cf9 100644 --- a/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/build.log @@ -6,13 +6,5 @@ End of files Compiling files: src/ClassA.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/test/Usage.class -End of files -Compiling files: - src/usage.kt -End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/experimental-ic-build.log deleted file mode 100644 index c6433f94cf9..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/experimental-ic-build.log +++ /dev/null @@ -1,10 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/test/ClassA.class -End of files -Compiling files: - src/ClassA.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/build.log index 8af6b65b4d0..c6433f94cf9 100644 --- a/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/build.log @@ -6,13 +6,5 @@ End of files Compiling files: src/ClassA.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/test/Usage.class -End of files -Compiling files: - src/usage.kt -End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/experimental-ic-build.log deleted file mode 100644 index c6433f94cf9..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/experimental-ic-build.log +++ /dev/null @@ -1,10 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/test/ClassA.class -End of files -Compiling files: - src/ClassA.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/moveClass/build.log b/jps-plugin/testData/incremental/pureKotlin/moveClass/build.log index 711548a7e6d..bb01e5d56e8 100644 --- a/jps-plugin/testData/incremental/pureKotlin/moveClass/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/moveClass/build.log @@ -16,14 +16,5 @@ Cleaning output files: End of files Compiling files: End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/other/OtherKt.class -End of files -Compiling files: - src/other.kt -End of files Exit code: OK ------------------------------------------- +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/moveClass/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/moveClass/experimental-ic-build.log deleted file mode 100644 index bb01e5d56e8..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/moveClass/experimental-ic-build.log +++ /dev/null @@ -1,20 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/Foo.class -End of files -Compiling files: - src/b.kt -End of files -Exit code: OK ------------------------------------------- - -================ Step #2 ================= - -Cleaning output files: - out/production/module/Foo.class -End of files -Compiling files: -End of files -Exit code: OK ------------------------------------------- \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/build.log b/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/build.log index 137e77df695..0a13b12ce80 100644 --- a/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/build.log @@ -14,16 +14,5 @@ Compiling files: src/useClass.kt src/useFun.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/bar/DummyKt.class - out/production/module/foo/DummyKt.class -End of files -Compiling files: - src/bar/dummy.kt - src/foo/dummy.kt -End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/experimental-ic-build.log deleted file mode 100644 index 0a13b12ce80..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/experimental-ic-build.log +++ /dev/null @@ -1,18 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/foo/AKt.class - out/production/module/foo/Foo.class -End of files -Cleaning output files: - out/production/module/baz/UseClassKt.class - out/production/module/baz/UseFunKt.class -End of files -Compiling files: - src/bar/a.kt - src/useClass.kt - src/useFun.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/build.log b/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/build.log index 582ead1c07f..b13957b6b52 100644 --- a/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/build.log @@ -8,6 +8,8 @@ End of files Compiling files: src/b.kt End of files +Marked as dirty by Kotlin: + src/usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/experimental-ic-build.log deleted file mode 100644 index b13957b6b52..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/experimental-ic-build.log +++ /dev/null @@ -1,26 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/Test.class - out/production/module/test/Test__BKt.class -End of files -Compiling files: - src/b.kt -End of files -Marked as dirty by Kotlin: - src/usage.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/Test.class - out/production/module/test/Test__AKt.class - out/production/module/usage/UsageKt.class -End of files -Compiling files: - src/a.kt - src/usage.kt -End of files -Exit code: OK ------------------------------------------- \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/build.log b/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/build.log index 76d714665b2..2fb46435909 100644 --- a/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/build.log @@ -3,15 +3,5 @@ Compiling files: src/b.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/Test.class - out/production/module/test/Test__AKt.class -End of files -Compiling files: - src/a.kt -End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/experimental-ic-build.log deleted file mode 100644 index 2fb46435909..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/experimental-ic-build.log +++ /dev/null @@ -1,7 +0,0 @@ -================ Step #1 ================= - -Compiling files: - src/b.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/build.log b/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/build.log index 2a6f3372739..82fd3845d42 100644 --- a/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/build.log @@ -8,7 +8,7 @@ End of files Compiling files: src/b.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED +Exit code: OK ------------------------------------------ Cleaning output files: out/production/module/META-INF/module.kotlin_module diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/experimental-ic-build.log deleted file mode 100644 index 82fd3845d42..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/experimental-ic-build.log +++ /dev/null @@ -1,22 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/Test.class - out/production/module/test/Test__BKt.class -End of files -Compiling files: - src/b.kt -End of files -Exit code: OK ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/Test.class - out/production/module/test/Test__AKt.class -End of files -Compiling files: - src/a.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/build.log b/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/build.log index 71c297533a5..654861fc4c1 100644 --- a/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/build.log @@ -16,15 +16,5 @@ Exit code: OK Compiling files: src/b.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test2/Test2.class - out/production/module/test2/Test2__AKt.class -End of files -Compiling files: - src/a.kt -End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/experimental-ic-build.log deleted file mode 100644 index 654861fc4c1..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/experimental-ic-build.log +++ /dev/null @@ -1,20 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/Test.class - out/production/module/test/Test__AKt.class -End of files -Compiling files: - src/a.kt -End of files -Exit code: OK ------------------------------------------- - -================ Step #2 ================= - -Compiling files: - src/b.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/build.log index 4c5eafa9b77..30620ff3626 100644 --- a/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/build.log @@ -10,14 +10,5 @@ Cleaning output files: End of files Compiling files: End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/foo/DummyKt.class -End of files -Compiling files: - src/dummy.kt -End of files Exit code: OK ------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/experimental-ic-build.log deleted file mode 100644 index 30620ff3626..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/experimental-ic-build.log +++ /dev/null @@ -1,14 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/Test.class - out/production/module/test/Test__AKt.class -End of files -Cleaning output files: - out/production/module/test/Test__BKt.class -End of files -Compiling files: -End of files -Exit code: OK ------------------------------------------- \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log b/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log index 32dee0bfdc1..e4510f053f8 100644 --- a/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log @@ -7,16 +7,5 @@ End of files Compiling files: src/a2.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/a/A1Kt.class - out/production/module/b/B1Kt.class -End of files -Compiling files: - src/a1.kt - src/b1.kt -End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/experimental-ic-build.log deleted file mode 100644 index e4510f053f8..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/experimental-ic-build.log +++ /dev/null @@ -1,11 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/b/B2Kt.class -End of files -Compiling files: - src/a2.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log index 144b5ab2934..4c041f2743b 100644 --- a/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log @@ -6,13 +6,17 @@ End of files Compiling files: src/const.kt End of files +Marked as dirty by Kotlin: + src/usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: + out/production/module/test/Object.class out/production/module/test/Usage.class End of files Compiling files: + src/const.kt src/usage.kt End of files Exit code: OK ------------------------------------------- \ No newline at end of file +------------------------------------------ diff --git a/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/experimental-ic-build.log deleted file mode 100644 index 4c041f2743b..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/experimental-ic-build.log +++ /dev/null @@ -1,22 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/test/Object.class -End of files -Compiling files: - src/const.kt -End of files -Marked as dirty by Kotlin: - src/usage.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/test/Object.class - out/production/module/test/Usage.class -End of files -Compiling files: - src/const.kt - src/usage.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log index c65246888fe..5df3e1b0c32 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log @@ -7,12 +7,17 @@ End of files Compiling files: src/const.kt End of files +Marked as dirty by Kotlin: + src/usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/ConstKt.class out/production/module/test/Usage.class End of files Compiling files: + src/const.kt src/usage.kt End of files Exit code: OK diff --git a/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/experimental-ic-build.log deleted file mode 100644 index 5df3e1b0c32..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/experimental-ic-build.log +++ /dev/null @@ -1,24 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/ConstKt.class -End of files -Compiling files: - src/const.kt -End of files -Marked as dirty by Kotlin: - src/usage.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/ConstKt.class - out/production/module/test/Usage.class -End of files -Compiling files: - src/const.kt - src/usage.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log b/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log index 28d9ce5c1a6..2fb46435909 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log @@ -3,14 +3,5 @@ Compiling files: src/b.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/AKt.class -End of files -Compiling files: - src/a.kt -End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/experimental-ic-build.log deleted file mode 100644 index 2fb46435909..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/experimental-ic-build.log +++ /dev/null @@ -1,7 +0,0 @@ -================ Step #1 ================= - -Compiling files: - src/b.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log b/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log index bc8c479e933..9c5c0846c6b 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log @@ -7,14 +7,5 @@ End of files Compiling files: src/b.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/AKt.class -End of files -Compiling files: - src/a.kt -End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/experimental-ic-build.log deleted file mode 100644 index 9c5c0846c6b..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/experimental-ic-build.log +++ /dev/null @@ -1,11 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/BKt.class -End of files -Compiling files: - src/b.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log index c5fb35ce4e4..da15fc4665c 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log @@ -18,14 +18,5 @@ Cleaning output files: End of files Compiling files: End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/AKt.class -End of files -Compiling files: - src/a.kt -End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/experimental-ic-build.log deleted file mode 100644 index da15fc4665c..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/experimental-ic-build.log +++ /dev/null @@ -1,22 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/AKt.class -End of files -Compiling files: - src/a.kt -End of files -Exit code: OK ------------------------------------------- - -================ Step #2 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/BKt.class -End of files -Compiling files: -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log index 7a88d57727c..0bae0872097 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log @@ -6,17 +6,6 @@ Cleaning output files: End of files Compiling files: End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/other/OtherKt.class - out/production/module/test/AKt.class -End of files -Compiling files: - src/a.kt - src/other.kt -End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/experimental-ic-build.log deleted file mode 100644 index 0bae0872097..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/experimental-ic-build.log +++ /dev/null @@ -1,22 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/BKt.class -End of files -Compiling files: -End of files -Exit code: OK ------------------------------------------- - -================ Step #2 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/other/OtherKt.class -End of files -Compiling files: - src/other.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/build.log b/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/build.log index fecba542c23..66ffa3ed402 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/build.log @@ -10,13 +10,5 @@ Compiling files: src/pkg1.kt src/pkg2.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/test/Usage.class -End of files -Compiling files: - src/usage.kt -End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/experimental-ic-build.log deleted file mode 100644 index 66ffa3ed402..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/experimental-ic-build.log +++ /dev/null @@ -1,14 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/Utils.class - out/production/module/test/Utils__Pkg1Kt.class - out/production/module/test/Utils__Pkg2Kt.class -End of files -Compiling files: - src/pkg1.kt - src/pkg2.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log b/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log index a1eaee6f95c..31068d6310a 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log @@ -15,14 +15,5 @@ Exit code: OK Compiling files: src/b.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test2/AKt.class -End of files -Compiling files: - src/a.kt -End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/experimental-ic-build.log deleted file mode 100644 index 31068d6310a..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/experimental-ic-build.log +++ /dev/null @@ -1,19 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/AKt.class -End of files -Compiling files: - src/a.kt -End of files -Exit code: OK ------------------------------------------- - -================ Step #2 ================= - -Compiling files: - src/b.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log index 5c5f23eea4a..b44cdc0a85f 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log @@ -9,14 +9,5 @@ Cleaning output files: End of files Compiling files: End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/other/OtherKt.class -End of files -Compiling files: - src/other.kt -End of files Exit code: OK ------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/packageRemoved/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/packageRemoved/experimental-ic-build.log deleted file mode 100644 index b44cdc0a85f..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/packageRemoved/experimental-ic-build.log +++ /dev/null @@ -1,13 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/AKt.class -End of files -Cleaning output files: - out/production/module/test/BKt.class -End of files -Compiling files: -End of files -Exit code: OK ------------------------------------------- \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/build.log b/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/build.log index ea5dcf8072f..157ba41596f 100644 --- a/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/build.log @@ -7,14 +7,5 @@ End of files Compiling files: src/prop2.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/Prop1Kt.class -End of files -Compiling files: - src/prop1.kt -End of files Exit code: OK ------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/experimental-ic-build.log deleted file mode 100644 index 157ba41596f..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/experimental-ic-build.log +++ /dev/null @@ -1,11 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test2/Prop2Kt.class -End of files -Compiling files: - src/prop2.kt -End of files -Exit code: OK ------------------------------------------- \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/build.log b/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/build.log index 967b20cf385..157ba41596f 100644 --- a/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/build.log @@ -7,15 +7,5 @@ End of files Compiling files: src/prop2.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/TTest.class - out/production/module/test/TTest__Prop1Kt.class -End of files -Compiling files: - src/prop1.kt -End of files Exit code: OK ------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/experimental-ic-build.log deleted file mode 100644 index 157ba41596f..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/experimental-ic-build.log +++ /dev/null @@ -1,11 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test2/Prop2Kt.class -End of files -Compiling files: - src/prop2.kt -End of files -Exit code: OK ------------------------------------------- \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/build.log b/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/build.log index 31986a634a4..27e070aa859 100644 --- a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/build.log @@ -7,17 +7,19 @@ End of files Compiling files: src/A.kt End of files +Marked as dirty by Kotlin: + src/useA.kt + src/useAbar.kt + src/useAfoo.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/META-INF/module.kotlin_module - out/production/module/other/OtherKt.class out/production/module/use/UseAKt.class out/production/module/use/UseAbarKt.class out/production/module/use/UseAfooKt.class End of files Compiling files: - src/other.kt src/useA.kt src/useAbar.kt src/useAfoo.kt @@ -35,10 +37,9 @@ Cleaning output files: End of files Compiling files: src/A.kt - src/other.kt src/useA.kt src/useAbar.kt src/useAfoo.kt End of files Exit code: OK ------------------------------------------- +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/experimental-ic-build.log deleted file mode 100644 index 27e070aa859..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/experimental-ic-build.log +++ /dev/null @@ -1,45 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/foo/A$Companion.class - out/production/module/foo/A.class -End of files -Compiling files: - src/A.kt -End of files -Marked as dirty by Kotlin: - src/useA.kt - src/useAbar.kt - src/useAfoo.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/use/UseAKt.class - out/production/module/use/UseAbarKt.class - out/production/module/use/UseAfooKt.class -End of files -Compiling files: - src/useA.kt - src/useAbar.kt - src/useAfoo.kt -End of files -Exit code: ABORT ------------------------------------------- -COMPILATION FAILED -Unresolved reference: bar -Unresolved reference: foo - -================ Step #2 ================= - -Cleaning output files: - out/production/module/foo/A.class -End of files -Compiling files: - src/A.kt - src/useA.kt - src/useAbar.kt - src/useAfoo.kt -End of files -Exit code: OK ------------------------------------------- \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/build.log b/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/build.log index 8525b99e72b..fd2fc164d00 100644 --- a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/build.log @@ -7,11 +7,17 @@ End of files Compiling files: src/A.kt End of files +Marked as dirty by Kotlin: + src/getACompanion.kt + src/getACompanionShort.kt + src/useACompanionImplicitly.kt + src/useACompanionShortImplicitly.kt + src/useAbarWithImplicitReceiver.kt + src/useAfooWithImplicitReceiver.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/META-INF/module.kotlin_module - out/production/module/other/OtherKt.class out/production/module/use/GetACompanionKt.class out/production/module/use/GetACompanionShortKt.class out/production/module/use/UseACompanionImplicitlyKt.class @@ -22,7 +28,6 @@ End of files Compiling files: src/getACompanion.kt src/getACompanionShort.kt - src/other.kt src/useACompanionImplicitly.kt src/useACompanionShortImplicitly.kt src/useAbarWithImplicitReceiver.kt @@ -43,7 +48,6 @@ Compiling files: src/A.kt src/getACompanion.kt src/getACompanionShort.kt - src/other.kt src/useACompanionImplicitly.kt src/useACompanionShortImplicitly.kt src/useAbarWithImplicitReceiver.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/experimental-ic-build.log deleted file mode 100644 index fd2fc164d00..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/experimental-ic-build.log +++ /dev/null @@ -1,57 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/foo/A$Companion.class - out/production/module/foo/A.class -End of files -Compiling files: - src/A.kt -End of files -Marked as dirty by Kotlin: - src/getACompanion.kt - src/getACompanionShort.kt - src/useACompanionImplicitly.kt - src/useACompanionShortImplicitly.kt - src/useAbarWithImplicitReceiver.kt - src/useAfooWithImplicitReceiver.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/use/GetACompanionKt.class - out/production/module/use/GetACompanionShortKt.class - out/production/module/use/UseACompanionImplicitlyKt.class - out/production/module/use/UseACompanionShortImplicitlyKt.class - out/production/module/use/UseAbarWithImplicitReceiverKt.class - out/production/module/use/UseAfooWithImplicitReceiverKt.class -End of files -Compiling files: - src/getACompanion.kt - src/getACompanionShort.kt - src/useACompanionImplicitly.kt - src/useACompanionShortImplicitly.kt - src/useAbarWithImplicitReceiver.kt - src/useAfooWithImplicitReceiver.kt -End of files -Exit code: ABORT ------------------------------------------- -COMPILATION FAILED -Unresolved reference: Companion -Classifier 'A' does not have a companion object, and thus must be initialized here - -================ Step #2 ================= - -Cleaning output files: - out/production/module/foo/A.class -End of files -Compiling files: - src/A.kt - src/getACompanion.kt - src/getACompanionShort.kt - src/useACompanionImplicitly.kt - src/useACompanionShortImplicitly.kt - src/useAbarWithImplicitReceiver.kt - src/useAfooWithImplicitReceiver.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/removeClass/build.log b/jps-plugin/testData/incremental/pureKotlin/removeClass/build.log index 370cf67d2c7..8d27a0a5d62 100644 --- a/jps-plugin/testData/incremental/pureKotlin/removeClass/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/removeClass/build.log @@ -10,16 +10,16 @@ End of files Compiling files: src/useA.kt End of files +Marked as dirty by Kotlin: + src/funA.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/foo/FunAKt.class - out/production/module/other/OtherKt.class End of files Compiling files: src/funA.kt - src/other.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/pureKotlin/removeClass/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/removeClass/experimental-ic-build.log deleted file mode 100644 index 8d27a0a5d62..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/removeClass/experimental-ic-build.log +++ /dev/null @@ -1,25 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/foo/A.class -End of files -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/use/UseAKt.class -End of files -Compiling files: - src/useA.kt -End of files -Marked as dirty by Kotlin: - src/funA.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/foo/FunAKt.class -End of files -Compiling files: - src/funA.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/build.log b/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/build.log index 7a143e87620..614096fbabd 100644 --- a/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/build.log @@ -10,16 +10,16 @@ End of files Compiling files: src/useA.kt End of files +Marked as dirty by Kotlin: + src/funA.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/FunAKt.class out/production/module/META-INF/module.kotlin_module - out/production/module/other/OtherKt.class End of files Compiling files: src/funA.kt - src/other.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/experimental-ic-build.log deleted file mode 100644 index 614096fbabd..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/experimental-ic-build.log +++ /dev/null @@ -1,25 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/A.class -End of files -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/UseAKt.class -End of files -Compiling files: - src/useA.kt -End of files -Marked as dirty by Kotlin: - src/funA.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/FunAKt.class - out/production/module/META-INF/module.kotlin_module -End of files -Compiling files: - src/funA.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/build.log b/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/build.log index 78d8ad00f8c..bd46dda7b7b 100644 --- a/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/build.log @@ -10,16 +10,16 @@ End of files Compiling files: src/use.kt End of files +Marked as dirty by Kotlin: + src/foo1.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/foo/Foo1Kt.class - out/production/module/other/OtherKt.class End of files Compiling files: src/foo1.kt - src/other.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/experimental-ic-build.log deleted file mode 100644 index bd46dda7b7b..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/experimental-ic-build.log +++ /dev/null @@ -1,25 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/foo/Foo2Kt.class -End of files -Cleaning output files: - out/production/module/use/UseKt.class -End of files -Compiling files: - src/use.kt -End of files -Marked as dirty by Kotlin: - src/foo1.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/foo/Foo1Kt.class -End of files -Compiling files: - src/foo1.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/build.log b/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/build.log index e7664fe6108..523076d8fd0 100644 --- a/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/build.log @@ -7,16 +7,16 @@ End of files Compiling files: src/a.kt End of files +Marked as dirty by Kotlin: + src/a1Usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/usage/A1UsageKt.class - out/production/module/usage/A2UsageKt.class End of files Compiling files: src/a1Usage.kt - src/a2Usage.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/experimental-ic-build.log deleted file mode 100644 index 523076d8fd0..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/experimental-ic-build.log +++ /dev/null @@ -1,22 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/a/Outer$B.class - out/production/module/a/Outer.class -End of files -Compiling files: - src/a.kt -End of files -Marked as dirty by Kotlin: - src/a1Usage.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/usage/A1UsageKt.class -End of files -Compiling files: - src/a1Usage.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/build.log b/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/build.log index 6996a4d490b..4f5133e9753 100644 --- a/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/build.log @@ -8,16 +8,16 @@ End of files Compiling files: src/a.kt End of files +Marked as dirty by Kotlin: + src/a1Usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/usage/A1UsageKt.class - out/production/module/usage/A2UsageKt.class End of files Compiling files: src/a1Usage.kt - src/a2Usage.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/experimental-ic-build.log deleted file mode 100644 index 4f5133e9753..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/experimental-ic-build.log +++ /dev/null @@ -1,23 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/a/AKt.class - out/production/module/a/B.class -End of files -Compiling files: - src/a.kt -End of files -Marked as dirty by Kotlin: - src/a1Usage.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/usage/A1UsageKt.class -End of files -Compiling files: - src/a1Usage.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/renameClass/build.log b/jps-plugin/testData/incremental/pureKotlin/renameClass/build.log index 5cba12d7339..7bbc0435dff 100644 --- a/jps-plugin/testData/incremental/pureKotlin/renameClass/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/renameClass/build.log @@ -6,18 +6,20 @@ End of files Compiling files: src/A.kt End of files +Marked as dirty by Kotlin: + src/funs.kt + src/useA.kt + src/useB.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/foo/FunsKt.class - out/production/module/other/OtherKt.class out/production/module/use/UseAKt.class out/production/module/use/UseBKt.class End of files Compiling files: src/funs.kt - src/other.kt src/useA.kt src/useB.kt End of files diff --git a/jps-plugin/testData/incremental/pureKotlin/renameClass/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/renameClass/experimental-ic-build.log deleted file mode 100644 index 7bbc0435dff..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/renameClass/experimental-ic-build.log +++ /dev/null @@ -1,27 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/foo/A.class -End of files -Compiling files: - src/A.kt -End of files -Marked as dirty by Kotlin: - src/funs.kt - src/useA.kt - src/useB.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/foo/FunsKt.class - out/production/module/use/UseAKt.class - out/production/module/use/UseBKt.class -End of files -Compiling files: - src/funs.kt - src/useA.kt - src/useB.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/build.log b/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/build.log index 8b44e0b2686..e2768cbeca8 100644 --- a/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/build.log @@ -11,20 +11,16 @@ Compiling files: src/foo3.kt src/useF.kt End of files +Marked as dirty by Kotlin: + src/foo1.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/META-INF/module.kotlin_module - out/production/module/foo/Foo0Kt.class out/production/module/foo/Foo1Kt.class - out/production/module/other/OtherKt.class - out/production/module/use/UseGKt.class End of files Compiling files: - src/foo0.kt src/foo1.kt - src/other.kt - src/useG.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/experimental-ic-build.log deleted file mode 100644 index e2768cbeca8..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/experimental-ic-build.log +++ /dev/null @@ -1,26 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/foo/Foo2Kt.class -End of files -Cleaning output files: - out/production/module/use/UseFKt.class -End of files -Compiling files: - src/foo3.kt - src/useF.kt -End of files -Marked as dirty by Kotlin: - src/foo1.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/foo/Foo1Kt.class -End of files -Compiling files: - src/foo1.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log index 1a655050bc7..bd047404e08 100644 --- a/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log @@ -7,6 +7,8 @@ End of files Compiling files: src/fun.kt End of files +Marked as dirty by Kotlin: + src/usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: diff --git a/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/experimental-ic-build.log deleted file mode 100644 index bd047404e08..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/experimental-ic-build.log +++ /dev/null @@ -1,22 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/FunKt.class -End of files -Compiling files: - src/fun.kt -End of files -Marked as dirty by Kotlin: - src/usage.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/UsageKt.class -End of files -Compiling files: - src/usage.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/build.log b/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/build.log index 1462c579df1..cce51e9e605 100644 --- a/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/build.log @@ -7,6 +7,8 @@ End of files Compiling files: src/function.kt End of files +Marked as dirty by Kotlin: + src/usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/experimental-ic-build.log deleted file mode 100644 index cce51e9e605..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/experimental-ic-build.log +++ /dev/null @@ -1,22 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/inline/FunctionKt.class -End of files -Compiling files: - src/function.kt -End of files -Marked as dirty by Kotlin: - src/usage.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/usage/UsageKt.class -End of files -Compiling files: - src/usage.kt -End of files -Exit code: OK ------------------------------------------- \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/build.log b/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/build.log index 980c6527681..c9ee99392d6 100644 --- a/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/build.log @@ -7,6 +7,8 @@ End of files Compiling files: src/property.kt End of files +Marked as dirty by Kotlin: + src/usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/experimental-ic-build.log deleted file mode 100644 index c9ee99392d6..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/experimental-ic-build.log +++ /dev/null @@ -1,22 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/PropertyKt.class -End of files -Compiling files: - src/property.kt -End of files -Marked as dirty by Kotlin: - src/usage.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/usage/UsageKt.class -End of files -Compiling files: - src/usage.kt -End of files -Exit code: OK ------------------------------------------- \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log index ff93496f568..ebb5d82b894 100644 --- a/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log @@ -7,13 +7,18 @@ End of files Compiling files: src/const.kt End of files +Marked as dirty by Kotlin: + src/usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: + out/production/module/test/Trait$Companion.class + out/production/module/test/Trait.class out/production/module/test/Usage.class End of files Compiling files: + src/const.kt src/usage.kt End of files Exit code: OK ------------------------------------------- \ No newline at end of file +------------------------------------------ diff --git a/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/experimental-ic-build.log deleted file mode 100644 index ebb5d82b894..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/experimental-ic-build.log +++ /dev/null @@ -1,24 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/test/Trait$Companion.class - out/production/module/test/Trait.class -End of files -Compiling files: - src/const.kt -End of files -Marked as dirty by Kotlin: - src/usage.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/test/Trait$Companion.class - out/production/module/test/Trait.class - out/production/module/test/Usage.class -End of files -Compiling files: - src/const.kt - src/usage.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log b/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log index 12944581320..1b9a86e1791 100644 --- a/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log @@ -6,6 +6,8 @@ End of files Compiling files: src/A.kt End of files +Marked as dirty by Kotlin: + src/usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: diff --git a/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/experimental-ic-build.log deleted file mode 100644 index 1b9a86e1791..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/experimental-ic-build.log +++ /dev/null @@ -1,23 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/test/A.class -End of files -Compiling files: - src/A.kt -End of files -Marked as dirty by Kotlin: - src/usage.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/UsageKt.class -End of files -Compiling files: - src/usage.kt -End of files -Exit code: ABORT ------------------------------------------- -COMPILATION FAILED -Smart cast to 'Int' is impossible, because 'a.x' is a property that has open or custom getter \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/experimental-ic-build.log b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/experimental-ic-build.log deleted file mode 100644 index 15d93beab43..00000000000 --- a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/experimental-ic-build.log +++ /dev/null @@ -1,19 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/TheClass.class -End of files -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/Usage.class - out/production/module/UsageInKotlinKt.class -End of files -Compiling files: - src/TheClass.kt - src/usageInKotlin.kt -End of files -Exit code: OK ------------------------------------------- -Compiling files: - src/Usage.java -End of files diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log index 499bdd9ebf4..5b9f74cd080 100644 --- a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log +++ b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log @@ -6,15 +6,6 @@ End of files Compiling files: src/TheClass.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/other/OtherKt.class -End of files -Compiling files: - src/other.kt -End of files Exit code: OK ------------------------------------------ @@ -25,14 +16,5 @@ Cleaning output files: End of files Compiling files: End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/other/OtherKt.class -End of files -Compiling files: - src/other.kt -End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/experimental-ic-build.log b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/experimental-ic-build.log deleted file mode 100644 index 5b9f74cd080..00000000000 --- a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/experimental-ic-build.log +++ /dev/null @@ -1,20 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/TheClass.class -End of files -Compiling files: - src/TheClass.kt -End of files -Exit code: OK ------------------------------------------- - -================ Step #2 ================= - -Cleaning output files: - out/production/module/TheClass.class -End of files -Compiling files: -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/experimental-ic-build.log b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/experimental-ic-build.log deleted file mode 100644 index 0d969d57975..00000000000 --- a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/experimental-ic-build.log +++ /dev/null @@ -1,28 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/TheClass.class -End of files -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/Usage.class - out/production/module/UsageInKotlinKt.class -End of files -Compiling files: - src/usageInKotlin.kt -End of files -Exit code: OK ------------------------------------------- -Compiling files: - src/TheClass.java - src/Usage.java -End of files -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/UsageInKotlinKt.class -End of files -Compiling files: - src/usageInKotlin.kt -End of files -Exit code: OK ------------------------------------------- \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/build.log index 288a865c164..f22ff34c7da 100644 --- a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/build.log +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/build.log @@ -32,16 +32,8 @@ Compiling files: src/AChild.kt src/useA.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED +Exit code: OK ------------------------------------------ Compiling files: src/A.java -End of files -Cleaning output files: - out/production/module/Dummy.class -End of files -Compiling files: - src/Dummy.kt -End of files -Exit code: OK ------------------------------------------- \ No newline at end of file +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/experimental-ic-build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/experimental-ic-build.log deleted file mode 100644 index f22ff34c7da..00000000000 --- a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/experimental-ic-build.log +++ /dev/null @@ -1,39 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/A.class -End of files -Exit code: NOTHING_DONE ------------------------------------------- -Compiling files: - src/A.java -End of files -Cleaning output files: - out/production/module/AChild.class - out/production/module/META-INF/module.kotlin_module - out/production/module/UseAKt.class -End of files -Compiling files: - src/AChild.kt - src/useA.kt -End of files -Exit code: ABORT ------------------------------------------- -COMPILATION FAILED -'f' overrides nothing -Null can not be a value of a non-null type String - -================ Step #2 ================= - -Cleaning output files: - out/production/module/A.class -End of files -Compiling files: - src/AChild.kt - src/useA.kt -End of files -Exit code: OK ------------------------------------------- -Compiling files: - src/A.java -End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/build.log index 09500bf6496..3aea89e6c85 100644 --- a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/build.log +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/build.log @@ -31,16 +31,8 @@ Compiling files: src/AChild.kt src/useA.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED +Exit code: OK ------------------------------------------ Compiling files: src/A.java -End of files -Cleaning output files: - out/production/module/Dummy.class -End of files -Compiling files: - src/Dummy.kt -End of files -Exit code: OK ------------------------------------------- \ No newline at end of file +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/experimental-ic-build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/experimental-ic-build.log deleted file mode 100644 index 3aea89e6c85..00000000000 --- a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/experimental-ic-build.log +++ /dev/null @@ -1,38 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/A.class -End of files -Exit code: NOTHING_DONE ------------------------------------------- -Compiling files: - src/A.java -End of files -Cleaning output files: - out/production/module/AChild.class - out/production/module/META-INF/module.kotlin_module - out/production/module/UseAKt.class -End of files -Compiling files: - src/AChild.kt - src/useA.kt -End of files -Exit code: ABORT ------------------------------------------- -COMPILATION FAILED -Return type of 'f' is not a subtype of the return type of the overridden member '@NotNull public/*package*/ open fun f(): String defined in A' - -================ Step #2 ================= - -Cleaning output files: - out/production/module/A.class -End of files -Compiling files: - src/AChild.kt - src/useA.kt -End of files -Exit code: OK ------------------------------------------- -Compiling files: - src/A.java -End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log index 0e565678f1c..7fcd3cd0cfe 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log @@ -7,17 +7,12 @@ End of files Compiling files: src/fun.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED +Exit code: OK ------------------------------------------ Cleaning output files: out/production/module/JavaUsage.class - out/production/module/META-INF/module.kotlin_module - out/production/module/test/OtherKt.class End of files -Compiling files: - src/other.kt -End of files -Exit code: OK +Exit code: NOTHING_DONE ------------------------------------------ Compiling files: src/JavaUsage.java diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/experimental-ic-build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/experimental-ic-build.log deleted file mode 100644 index 7fcd3cd0cfe..00000000000 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/experimental-ic-build.log +++ /dev/null @@ -1,19 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/FunKt.class -End of files -Compiling files: - src/fun.kt -End of files -Exit code: OK ------------------------------------------- -Cleaning output files: - out/production/module/JavaUsage.class -End of files -Exit code: NOTHING_DONE ------------------------------------------- -Compiling files: - src/JavaUsage.java -End of files diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log index 3544758175f..1d26bdaba08 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log @@ -7,12 +7,17 @@ End of files Compiling files: src/const.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED +Exit code: OK ------------------------------------------ Cleaning output files: out/production/module/Usage.class + out/production/module/test/Klass$Companion.class + out/production/module/test/Klass.class End of files -Exit code: NOTHING_DONE +Compiling files: + src/const.kt +End of files +Exit code: OK ------------------------------------------ Compiling files: src/Usage.java diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/experimental-ic-build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/experimental-ic-build.log deleted file mode 100644 index 1d26bdaba08..00000000000 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/experimental-ic-build.log +++ /dev/null @@ -1,24 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/test/Klass$Companion.class - out/production/module/test/Klass.class -End of files -Compiling files: - src/const.kt -End of files -Exit code: OK ------------------------------------------- -Cleaning output files: - out/production/module/Usage.class - out/production/module/test/Klass$Companion.class - out/production/module/test/Klass.class -End of files -Compiling files: - src/const.kt -End of files -Exit code: OK ------------------------------------------- -Compiling files: - src/Usage.java -End of files diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/build.log index 3544758175f..1d26bdaba08 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/build.log @@ -7,12 +7,17 @@ End of files Compiling files: src/const.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED +Exit code: OK ------------------------------------------ Cleaning output files: out/production/module/Usage.class + out/production/module/test/Klass$Companion.class + out/production/module/test/Klass.class End of files -Exit code: NOTHING_DONE +Compiling files: + src/const.kt +End of files +Exit code: OK ------------------------------------------ Compiling files: src/Usage.java diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/experimental-ic-build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/experimental-ic-build.log deleted file mode 100644 index 1d26bdaba08..00000000000 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/experimental-ic-build.log +++ /dev/null @@ -1,24 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/test/Klass$Companion.class - out/production/module/test/Klass.class -End of files -Compiling files: - src/const.kt -End of files -Exit code: OK ------------------------------------------- -Cleaning output files: - out/production/module/Usage.class - out/production/module/test/Klass$Companion.class - out/production/module/test/Klass.class -End of files -Compiling files: - src/const.kt -End of files -Exit code: OK ------------------------------------------- -Compiling files: - src/Usage.java -End of files diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log index bc8c479e933..9c5c0846c6b 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log @@ -7,14 +7,5 @@ End of files Compiling files: src/b.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/AKt.class -End of files -Compiling files: - src/a.kt -End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/experimental-ic-build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/experimental-ic-build.log deleted file mode 100644 index 9c5c0846c6b..00000000000 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/experimental-ic-build.log +++ /dev/null @@ -1,11 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/BKt.class -End of files -Compiling files: - src/b.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log index 6d4990d4f88..674ffb38d8f 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log @@ -6,17 +6,8 @@ End of files Compiling files: src/b.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED +Exit code: OK ------------------------------------------ Compiling files: src/Usage.java End of files -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/AKt.class -End of files -Compiling files: - src/a.kt -End of files -Exit code: OK ------------------------------------------- diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/experimental-ic-build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/experimental-ic-build.log deleted file mode 100644 index 674ffb38d8f..00000000000 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/experimental-ic-build.log +++ /dev/null @@ -1,13 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/Usage.class -End of files -Compiling files: - src/b.kt -End of files -Exit code: OK ------------------------------------------- -Compiling files: - src/Usage.java -End of files diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/jps/KotlinGradlePluginJpsParametrizedIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/jps/KotlinGradlePluginJpsParametrizedIT.kt index 0486b761b21..fb65b3976fb 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/jps/KotlinGradlePluginJpsParametrizedIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/jps/KotlinGradlePluginJpsParametrizedIT.kt @@ -27,7 +27,7 @@ class KotlinGradlePluginJpsParametrizedIT : BaseIncrementalGradleIT() { File(jpsResourcesPath, "changeIncrementalOption"), File(jpsResourcesPath, "custom"), File(jpsResourcesPath, "lookupTracker")) - private val buildLogFinder = BuildLogFinder(isExperimentalEnabled = true, isGradleEnabled = true) + private val buildLogFinder = BuildLogFinder(isGradleEnabled = true) @Suppress("unused") @Parameterized.Parameters(name = "{0}")