diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java index 38070e3cb99..3669c7afd30 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java @@ -62,7 +62,7 @@ public class ClassFileFactory implements OutputFileCollection { private boolean isDone = false; - private final Set packagePartSourceFiles = new HashSet<>(); + private final Set sourceFiles = new HashSet<>(); private final Map partsGroupedByPackage = new LinkedHashMap<>(); public ClassFileFactory(@NotNull GenerationState state, @NotNull ClassBuilderFactory builderFactory) { @@ -122,7 +122,7 @@ public class ClassFileFactory implements OutputFileCollection { JvmModuleProtoBuf.Module moduleProto = builder.build(); - generators.put(outputFilePath, new OutAndSourceFileList(CollectionsKt.toList(packagePartSourceFiles)) { + generators.put(outputFilePath, new OutAndSourceFileList(CollectionsKt.toList(sourceFiles)) { @Override public byte[] asBytes(ClassBuilderFactory factory) { return ModuleMappingKt.serializeToByteArray(moduleProto, JvmMetadataVersion.INSTANCE.toArray()); @@ -233,14 +233,14 @@ public class ClassFileFactory implements OutputFileCollection { @NotNull public PackageCodegen forPackage(@NotNull FqName fqName, @NotNull Collection files) { assert !isDone : "Already done!"; - registerPackagePartSourceFiles(files); + registerSourceFiles(files); return state.getCodegenFactory().createPackageCodegen(state, files, fqName, buildNewPackagePartRegistry(fqName)); } @NotNull public MultifileClassCodegen forMultifileClass(@NotNull FqName facadeFqName, @NotNull Collection files) { assert !isDone : "Already done!"; - registerPackagePartSourceFiles(files); + registerSourceFiles(files); return state.getCodegenFactory().createMultifileClassCodegen(state, files, facadeFqName, buildNewPackagePartRegistry(facadeFqName.parent())); } @@ -252,8 +252,8 @@ public class ClassFileFactory implements OutputFileCollection { }; } - private void registerPackagePartSourceFiles(Collection files) { - packagePartSourceFiles.addAll(toIoFilesIgnoringNonPhysical(PackagePartClassUtils.getFilesWithCallables(files))); + private void registerSourceFiles(Collection files) { + sourceFiles.addAll(toIoFilesIgnoringNonPhysical(files)); } @NotNull diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 2de6c488f24..f1ba6d7506e 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -421,7 +421,10 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { assertFilesExistInOutput(module, "Foo.class") assertFilesNotExistInOutput(module, *EXCLUDE_FILES) - checkWhen(touch("src/foo.kt"), null, arrayOf(klass("kotlinProject", "Foo"))) + checkWhen( + touch("src/foo.kt"), null, + arrayOf(klass("kotlinProject", "Foo"), module("kotlinProject")) + ) } fun testExcludeModuleFolderInSourceRootOfAnotherModule() { @@ -431,8 +434,14 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { assertFilesExistInOutput(module, "Foo.class") } - checkWhen(touch("src/foo.kt"), null, arrayOf(klass("kotlinProject", "Foo"))) - checkWhen(touch("src/module2/src/foo.kt"), null, arrayOf(klass("module2", "Foo"))) + checkWhen( + touch("src/foo.kt"), null, + arrayOf(klass("kotlinProject", "Foo"), module("kotlinProject")) + ) + checkWhen( + touch("src/module2/src/foo.kt"), null, + arrayOf(klass("module2", "Foo"), module("module2")) + ) } fun testExcludeFileUsingCompilerSettings() { @@ -443,7 +452,7 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { assertFilesNotExistInOutput(module, *EXCLUDE_FILES) if (IncrementalCompilation.isEnabled()) { - checkWhen(touch("src/foo.kt"), null, arrayOf(klass("kotlinProject", "Foo"))) + checkWhen(touch("src/foo.kt"), null, arrayOf(module("kotlinProject"), klass("kotlinProject", "Foo"))) } else { val allClasses = myProject.outputPaths() @@ -462,8 +471,8 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { assertFilesNotExistInOutput(module, *EXCLUDE_FILES) if (IncrementalCompilation.isEnabled()) { - checkWhen(touch("src/foo.kt"), null, arrayOf(klass("kotlinProject", "Foo"))) - checkWhen(touch("src/dir/subdir/bar.kt"), null, arrayOf(klass("kotlinProject", "Bar"))) + checkWhen(touch("src/foo.kt"), null, arrayOf(module("kotlinProject"), klass("kotlinProject", "Foo"))) + checkWhen(touch("src/dir/subdir/bar.kt"), null, arrayOf(module("kotlinProject"), klass("kotlinProject", "Bar"))) } else { val allClasses = myProject.outputPaths() @@ -483,7 +492,7 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { assertFilesNotExistInOutput(module, *EXCLUDE_FILES) if (IncrementalCompilation.isEnabled()) { - checkWhen(touch("src/foo.kt"), null, arrayOf(klass("kotlinProject", "Foo"))) + checkWhen(touch("src/foo.kt"), null, arrayOf(module("kotlinProject"), klass("kotlinProject", "Foo"))) } else { val allClasses = myProject.outputPaths() diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.172 b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.172 index 2d7aeb2cde5..bc8ad5e7836 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.172 +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.172 @@ -420,7 +420,10 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { assertFilesExistInOutput(module, "Foo.class") assertFilesNotExistInOutput(module, *EXCLUDE_FILES) - checkWhen(touch("src/foo.kt"), null, arrayOf(klass("kotlinProject", "Foo"))) + checkWhen( + touch("src/foo.kt"), null, + arrayOf(klass("kotlinProject", "Foo"), module("kotlinProject")) + ) } fun testExcludeModuleFolderInSourceRootOfAnotherModule() { @@ -430,8 +433,14 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { assertFilesExistInOutput(module, "Foo.class") } - checkWhen(touch("src/foo.kt"), null, arrayOf(klass("kotlinProject", "Foo"))) - checkWhen(touch("src/module2/src/foo.kt"), null, arrayOf(klass("module2", "Foo"))) + checkWhen( + touch("src/foo.kt"), null, + arrayOf(klass("kotlinProject", "Foo"), module("kotlinProject")) + ) + checkWhen( + touch("src/module2/src/foo.kt"), null, + arrayOf(klass("module2", "Foo"), module("module2")) + ) } fun testExcludeFileUsingCompilerSettings() { @@ -442,7 +451,7 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { assertFilesNotExistInOutput(module, *EXCLUDE_FILES) if (IncrementalCompilation.isEnabled()) { - checkWhen(touch("src/foo.kt"), null, arrayOf(klass("kotlinProject", "Foo"))) + checkWhen(touch("src/foo.kt"), null, arrayOf(module("kotlinProject"), klass("kotlinProject", "Foo"))) } else { val allClasses = myProject.outputPaths() @@ -461,8 +470,8 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { assertFilesNotExistInOutput(module, *EXCLUDE_FILES) if (IncrementalCompilation.isEnabled()) { - checkWhen(touch("src/foo.kt"), null, arrayOf(klass("kotlinProject", "Foo"))) - checkWhen(touch("src/dir/subdir/bar.kt"), null, arrayOf(klass("kotlinProject", "Bar"))) + checkWhen(touch("src/foo.kt"), null, arrayOf(module("kotlinProject"), klass("kotlinProject", "Foo"))) + checkWhen(touch("src/dir/subdir/bar.kt"), null, arrayOf(module("kotlinProject"), klass("kotlinProject", "Bar"))) } else { val allClasses = myProject.outputPaths() @@ -482,7 +491,7 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { assertFilesNotExistInOutput(module, *EXCLUDE_FILES) if (IncrementalCompilation.isEnabled()) { - checkWhen(touch("src/foo.kt"), null, arrayOf(klass("kotlinProject", "Foo"))) + checkWhen(touch("src/foo.kt"), null, arrayOf(module("kotlinProject"), klass("kotlinProject", "Foo"))) } else { val allClasses = myProject.outputPaths() diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTestIncremental.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTestIncremental.kt index b7b2328853b..1e7f69a7d4a 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTestIncremental.kt +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTestIncremental.kt @@ -87,7 +87,7 @@ class KotlinJpsBuildTestIncremental : KotlinJpsBuildTest() { checkWhen(touch("src/main.kt"), null, packageClasses("kotlinProject", "src/main.kt", "foo.MainKt")) checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooKt")) - checkWhen(touch("src/Bar.kt"), arrayOf("src/Bar.kt"), arrayOf(klass("kotlinProject", "foo.Bar"))) + checkWhen(touch("src/Bar.kt"), arrayOf("src/Bar.kt"), arrayOf(module("kotlinProject"), klass("kotlinProject", "foo.Bar"))) checkWhen(del("src/main.kt"), pathsToCompile = null, @@ -96,7 +96,7 @@ class KotlinJpsBuildTestIncremental : KotlinJpsBuildTest() { assertFilesNotExistInOutput(module, "foo/MainKt.class") checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooKt")) - checkWhen(touch("src/Bar.kt"), null, arrayOf(klass("kotlinProject", "foo.Bar"))) + checkWhen(touch("src/Bar.kt"), null, arrayOf(module("kotlinProject"), klass("kotlinProject", "foo.Bar"))) } fun testManyFilesForPackage() { diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log b/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log index dcdf52d9ec2..5d72b80b48a 100644 --- a/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log +++ b/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log @@ -21,6 +21,7 @@ Exit code: NOTHING_DONE Building module1 Cleaning output files: out/production/module1/A.class + out/production/module1/META-INF/module1.kotlin_module End of files Compiling files: module1/src/A.kt @@ -29,6 +30,7 @@ Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module1/B.class + out/production/module1/META-INF/module1.kotlin_module End of files Compiling files: module1/src/B.kt diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/build.log b/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/build.log index dda4e0b18ad..c4525673afa 100644 --- a/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/build.log +++ b/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/build.log @@ -3,6 +3,7 @@ Building module1 Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class End of files Compiling files: @@ -13,6 +14,7 @@ Exit code: OK Building module2 Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/B.class End of files Compiling files: @@ -23,6 +25,7 @@ Exit code: OK Building module3 Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: + out/production/module3/META-INF/module3.kotlin_module out/production/module3/c/C.class End of files Compiling files: @@ -34,6 +37,7 @@ Building module4 Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module4/D/D.class + out/production/module4/META-INF/module4.kotlin_module End of files Compiling files: module4/src/D.kt diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/data-container-version-build.log b/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/data-container-version-build.log index f42c3fd9de2..a0532d92bd3 100644 --- a/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/data-container-version-build.log +++ b/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/data-container-version-build.log @@ -3,6 +3,7 @@ Building module1 Actions after cache changed: [REBUILD_ALL_KOTLIN, DO_NOTHING] Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class End of files Compiling files: @@ -18,6 +19,7 @@ Exit code: OK Building module2 Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/B.class End of files Compiling files: @@ -28,6 +30,7 @@ Exit code: OK Building module3 Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: + out/production/module3/META-INF/module3.kotlin_module out/production/module3/c/C.class End of files Compiling files: @@ -39,6 +42,7 @@ Building module4 Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module4/D/D.class + out/production/module4/META-INF/module4.kotlin_module End of files Compiling files: module4/src/D.kt diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log b/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log index 49c145f5a39..147a909f94a 100644 --- a/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log +++ b/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log @@ -37,6 +37,7 @@ Exit code: OK Building module4 Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: + out/production/module4/META-INF/module4.kotlin_module out/production/module4/module4/D.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log b/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log index aed2ed7538c..4a55c7fdaf2 100644 --- a/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log +++ b/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log @@ -42,6 +42,7 @@ Exit code: OK Building module4 Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: + out/production/module4/META-INF/module4.kotlin_module out/production/module4/module4/D.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log b/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log index 2c82d0bd8c1..46c3182b0b3 100644 --- a/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log +++ b/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log @@ -14,6 +14,7 @@ Exit code: OK Building module2 Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/B.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log b/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log index 6eb82eb7996..bfa894afa17 100644 --- a/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log +++ b/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log @@ -17,6 +17,7 @@ Exit code: OK Building module2 Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/B.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log b/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log index 8e9addf64de..cdd46868ec5 100644 --- a/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log +++ b/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log @@ -15,6 +15,7 @@ Exit code: OK Building module2 Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/B.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log b/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log index f762162fae9..3eb02e0f67a 100644 --- a/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log +++ b/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log @@ -18,6 +18,7 @@ Exit code: OK Building module2 Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/B.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log b/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log index 24be8877d3c..f3c27df32a1 100644 --- a/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log +++ b/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log @@ -51,6 +51,7 @@ Exit code: OK Building module4 Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: + out/production/module4/META-INF/module4.kotlin_module out/production/module4/module4/D.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log b/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log index 1f7e6e48e2a..d2337355e89 100644 --- a/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log +++ b/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log @@ -64,6 +64,7 @@ Exit code: OK Building module4 Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: + out/production/module4/META-INF/module4.kotlin_module out/production/module4/module4/D.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log b/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log index 8a34d6e3f46..2067766ef1a 100644 --- a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log +++ b/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log @@ -34,6 +34,7 @@ Exit code: NOTHING_DONE Building module1 Actions after cache changed: [REBUILD_ALL_KOTLIN, REBUILD_CHUNK] Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module out/production/module1/foo/Z.class End of files Compiling files: @@ -66,6 +67,7 @@ Exit code: OK Building module3 Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: + out/production/module3/META-INF/module3.kotlin_module out/production/module3/foo/D.class End of files Compiling files: @@ -76,6 +78,7 @@ Exit code: OK Building module4 Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: + out/production/module4/META-INF/module4.kotlin_module out/production/module4/foo/E.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/build.log index b607fd0ae73..b70458dbf75 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/build.log @@ -2,6 +2,7 @@ Cleaning output files: out/production/module/Ann1.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: src/Ann1.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/build.log index 90734c31c1f..ab20a6a587d 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/foo/A.class End of files Compiling files: @@ -54,6 +55,7 @@ Exit code: OK ================ Step #2 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/foo/A.class out/production/module/foo/Ann.class End of files diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/build.log index 75ce0f50b92..8bed89d2097 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/foo/AChild.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/build.log index 1d81d372079..885ef88c299 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/foo/A.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/build.log index 2cdbf5e2693..302867e79fa 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/foo/A.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log index 43fa0a23936..0831b069e1d 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/foo/A.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/build.log index 2e473554bf6..fce0dad5936 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/build.log @@ -10,6 +10,7 @@ Cleaning output files: out/production/module/B.class out/production/module/C$Z.class out/production/module/C.class + out/production/module/META-INF/module.kotlin_module out/production/module/X.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/build.log index 445a31369b3..924010ea22b 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/foo/A.class End of files Marked as dirty by Kotlin: @@ -13,7 +14,6 @@ Marked as dirty by Kotlin: src/useBbar.kt src/useCbaz.kt 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/use/CreateAKt.class diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/build.log index e5692680c19..0b22828467c 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/foo/A.class End of files Marked as dirty by Kotlin: @@ -10,7 +11,6 @@ Marked as dirty by Kotlin: src/useAfoo.kt src/useBbar.kt Cleaning output files: - out/production/module/META-INF/module.kotlin_module out/production/module/foo/B.class out/production/module/use/CreateAKt.class out/production/module/use/CreateBKt.class diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log index dfe2d963e1e..880e2168bd2 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log @@ -2,6 +2,7 @@ Cleaning output files: out/production/module/B.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: src/B.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log index 4d2113b7a99..db1bb1a9feb 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log @@ -3,6 +3,7 @@ Cleaning output files: out/production/module/A$AA.class out/production/module/A.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: src/A.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/build.log index 6888cded901..7f1637ab23a 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/build.log @@ -3,6 +3,7 @@ Cleaning output files: out/production/module/A$AA.class out/production/module/A.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: src/A.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log index 9c37cd50b36..a58d7729c36 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/foo/A.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log index 6475e307e9f..9b457f35f2b 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log @@ -2,6 +2,7 @@ Cleaning output files: out/production/module/Enum.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: src/Enum.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/build.log index e18e538942d..625f7161de5 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/build.log @@ -2,6 +2,7 @@ Cleaning output files: out/production/module/Enum.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: src/Enum.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log index c1aa2e715de..2e447994088 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log @@ -2,6 +2,7 @@ Cleaning output files: out/production/module/Enum.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: src/Enum.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/build.log index 6e452d4e087..0f6b6b5ecf7 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/foo/A.class out/production/module/foo/B.class End of files diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log index ac9509d8ef2..0ea18eb1df9 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log @@ -2,6 +2,7 @@ Cleaning output files: out/production/module/A.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: src/A.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/build.log index b5acda80c81..96b6b8397e0 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/build.log @@ -2,6 +2,7 @@ Cleaning output files: out/production/module/B.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: src/B.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log index 059e63deb32..6f8261227ca 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log @@ -2,6 +2,7 @@ Cleaning output files: out/production/module/B.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: src/B.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/build.log index c579b21600e..5db82ebd1ef 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/build.log @@ -2,6 +2,7 @@ Cleaning output files: out/production/module/B.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: src/B.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/build.log index def5bbc388c..c9d58c7ac6f 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/build.log @@ -2,6 +2,7 @@ Cleaning output files: out/production/module/B.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: src/B.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/build.log index fc282e041ab..42d665fcb09 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/foo/A.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/build.log index fc282e041ab..42d665fcb09 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/foo/A.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log index cf30e6eee91..09190cc5903 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/foo/A.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/build.log index fc282e041ab..42d665fcb09 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/foo/A.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/build.log index 89ea52f71f9..98d534a47f9 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/foo/A.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/build.log index 9312d975657..2d9097f7a28 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/build.log @@ -2,6 +2,7 @@ Cleaning output files: out/production/module/A.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: src/A.kt @@ -12,6 +13,7 @@ Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/B.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: src/B.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log index 2533be1703d..6c6fecaba8d 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log @@ -2,6 +2,7 @@ Cleaning output files: out/production/module/B.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: src/B.kt @@ -12,6 +13,7 @@ Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/BA.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: src/BA.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log index f5140879637..24ab5d17af9 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/foo/A$x$1.class out/production/module/foo/A.class End of files diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/build.log index 8517024c192..9595fe1c990 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/build.log @@ -4,6 +4,7 @@ Cleaning output files: out/production/module/A.class out/production/module/B.class out/production/module/Base.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: src/Base.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/build.log index 5f9c5ba277b..81586cce712 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/build.log @@ -4,6 +4,7 @@ Cleaning output files: out/production/module/Base.class out/production/module/Impl1.class out/production/module/Intermediate.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: src/Base.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/build.log index 5ea3c686357..251ff3160b7 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/build.log @@ -4,6 +4,7 @@ Cleaning output files: out/production/module/Base$A.class out/production/module/Base$B.class out/production/module/Base.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: src/Base.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log index 7a8cff7e254..e6347e4b56c 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log @@ -2,6 +2,7 @@ Cleaning output files: out/production/module/A.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: src/A.kt @@ -15,7 +16,6 @@ Conflicting overloads: public constructor A(x: String) defined in A, public fun Cleaning output files: out/production/module/AConstructorFunctionKt.class - out/production/module/META-INF/module.kotlin_module End of files Cleaning output files: out/production/module/CreateAFromStringKt.class diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/build.log index dc56fb5ef5d..15d6c05aea1 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/build.log @@ -2,6 +2,7 @@ Cleaning output files: out/production/module/A.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: src/A.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/build.log index 03c2b4f77a5..247b87b2ccd 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/foo/A.class End of files Compiling files: @@ -55,6 +56,7 @@ Exit code: OK ================ Step #2 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/foo/A.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/build.log index b172c86a66c..348ac307190 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/foo/A.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/build.log index 43cd1930bf1..6cc3c6ff04e 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/build.log @@ -2,6 +2,7 @@ Cleaning output files: out/production/module/A.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: src/A.kt diff --git a/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/build.log b/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/build.log index 3d1ff1d5deb..2345ef9b2bf 100644 --- a/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/build.log +++ b/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/build.log @@ -9,6 +9,7 @@ Compiling files: src/JavaClass.java End of files Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/Usage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log b/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log index ca359d0908b..241aa8b80bd 100644 --- a/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log +++ b/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class End of files diff --git a/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log b/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log index 51a3c22c851..009db0433dc 100644 --- a/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log +++ b/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class End of files diff --git a/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/build.log b/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/build.log index ca359d0908b..241aa8b80bd 100644 --- a/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/build.log +++ b/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class End of files diff --git a/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/build.log b/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/build.log index 51a3c22c851..009db0433dc 100644 --- a/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/build.log +++ b/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class End of files diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/build.log index c9d1b22852b..70b880e5d39 100644 --- a/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/build.log +++ b/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/build.log @@ -12,6 +12,7 @@ Marked as dirty by Kotlin: Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/usage/Usage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log index 1dc3c981ab9..ac49f401b9f 100644 --- a/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log +++ b/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log @@ -12,6 +12,7 @@ Marked as dirty by Kotlin: Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/usage/Usage$Companion.class out/production/module/usage/Usage.class End of files diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/method/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/method/build.log index c9d1b22852b..70b880e5d39 100644 --- a/jps-plugin/testData/incremental/inlineFunCallSite/method/build.log +++ b/jps-plugin/testData/incremental/inlineFunCallSite/method/build.log @@ -12,6 +12,7 @@ Marked as dirty by Kotlin: Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/usage/Usage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log index c9d1b22852b..70b880e5d39 100644 --- a/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log +++ b/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log @@ -12,6 +12,7 @@ Marked as dirty by Kotlin: Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/usage/Usage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/superCall/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/superCall/build.log index c9d1b22852b..70b880e5d39 100644 --- a/jps-plugin/testData/incremental/inlineFunCallSite/superCall/build.log +++ b/jps-plugin/testData/incremental/inlineFunCallSite/superCall/build.log @@ -12,6 +12,7 @@ Marked as dirty by Kotlin: Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/usage/Usage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/build.log index c9d1b22852b..70b880e5d39 100644 --- a/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/build.log +++ b/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/build.log @@ -12,6 +12,7 @@ Marked as dirty by Kotlin: Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/usage/Usage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log index c9d1b22852b..70b880e5d39 100644 --- a/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log +++ b/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log @@ -12,6 +12,7 @@ Marked as dirty by Kotlin: Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/usage/Usage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/class/build.log b/jps-plugin/testData/incremental/lazyKotlinCaches/class/build.log index b24880f3547..162050ab436 100644 --- a/jps-plugin/testData/incremental/lazyKotlinCaches/class/build.log +++ b/jps-plugin/testData/incremental/lazyKotlinCaches/class/build.log @@ -2,6 +2,7 @@ Cleaning output files: out/production/module/A.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: src/A.kt diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/build.log b/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/build.log index 095763a2b7d..36f39a9eda4 100644 --- a/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/build.log +++ b/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/build.log @@ -4,6 +4,7 @@ Cleaning output files: out/production/module/A.class out/production/module/B.class out/production/module/C.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: src/main.kt diff --git a/jps-plugin/testData/incremental/multiModule/circular/build.log b/jps-plugin/testData/incremental/multiModule/circular/build.log index 60cda5933e7..21745068b95 100644 --- a/jps-plugin/testData/incremental/multiModule/circular/build.log +++ b/jps-plugin/testData/incremental/multiModule/circular/build.log @@ -2,6 +2,7 @@ Building module1, module2, module3 Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module out/production/module1/foo/A.class End of files Compiling files: @@ -16,8 +17,11 @@ Marked as dirty by Kotlin: Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module out/production/module1/foo/D.class + out/production/module2/META-INF/module2.kotlin_module out/production/module2/foo/B.class + out/production/module3/META-INF/module3.kotlin_module out/production/module3/foo/C.class End of files Compiling files: @@ -59,6 +63,7 @@ Exit code: NOTHING_DONE ------------------------------------------ Building module4 Cleaning output files: + out/production/module4/META-INF/module4.kotlin_module out/production/module4/foo/E.class End of files Compiling files: @@ -68,6 +73,7 @@ Exit code: OK ------------------------------------------ Building module5 Cleaning output files: + out/production/module5/META-INF/module5.kotlin_module out/production/module5/foo/F.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log b/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log index 5635273b818..c779a39139b 100644 --- a/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log +++ b/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log @@ -2,6 +2,7 @@ Building module1, module2 Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/B.class out/production/module2/b/BB.class End of files @@ -13,6 +14,7 @@ Marked as dirty by Kotlin: 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/AA.class End of files diff --git a/jps-plugin/testData/incremental/multiModule/classRemoved/build.log b/jps-plugin/testData/incremental/multiModule/classRemoved/build.log index dd488292f04..f062010967a 100644 --- a/jps-plugin/testData/incremental/multiModule/classRemoved/build.log +++ b/jps-plugin/testData/incremental/multiModule/classRemoved/build.log @@ -4,6 +4,7 @@ Building module1 Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module out/production/module2/foo/A.class End of files Building module2 @@ -14,7 +15,6 @@ Marked as dirty by Kotlin: module2/src/useAfoo.kt module2/src/useBbar.kt 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 diff --git a/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log b/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log index 22a4e112d5d..5c1d1a5b278 100644 --- a/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log +++ b/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log @@ -16,6 +16,7 @@ Exit code: NOTHING_DONE ------------------------------------------ Building module2 Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module out/production/module2/usage/Usage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/build.log b/jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/build.log index f20325065ed..eeeb3ad5787 100644 --- a/jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/build.log +++ b/jps-plugin/testData/incremental/multiModule/defaultArgumentInConstructorRemoved/build.log @@ -2,6 +2,7 @@ Building module1 Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module out/production/module1/foo/A.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log b/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log index c564275c40e..3641d307715 100644 --- a/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log +++ b/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log @@ -2,6 +2,7 @@ Building module1 Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log b/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log index c564275c40e..3641d307715 100644 --- a/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log +++ b/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log @@ -2,6 +2,7 @@ Building module1 Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/build.log b/jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/build.log index 8d380cc03c5..73dd59fe253 100644 --- a/jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/build.log +++ b/jps-plugin/testData/incremental/multiModule/defaultValueInConstructorRemoved/build.log @@ -2,6 +2,7 @@ Building module1 Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module out/production/module1/foo/A.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/multiModule/exportedDependency/build.log b/jps-plugin/testData/incremental/multiModule/exportedDependency/build.log index eadd060bf39..f829e13b976 100644 --- a/jps-plugin/testData/incremental/multiModule/exportedDependency/build.log +++ b/jps-plugin/testData/incremental/multiModule/exportedDependency/build.log @@ -2,6 +2,7 @@ Building module1 Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module out/production/module1/foo/A.class End of files Compiling files: @@ -18,6 +19,7 @@ Exit code: NOTHING_DONE ------------------------------------------ Building module2 Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module out/production/module2/foo/AChild.class End of files Compiling files: @@ -33,6 +35,7 @@ Cannot access 'A': it is private in file Building module1 Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module out/production/module1/foo/A.class End of files Compiling files: @@ -55,6 +58,7 @@ Exit code: OK ------------------------------------------ Building module3 Cleaning output files: + out/production/module3/META-INF/module3.kotlin_module out/production/module3/foo/AGrandChild.class End of files Compiling files: @@ -64,6 +68,9 @@ End of files Exit code: OK ------------------------------------------ Building module4 +Cleaning output files: + out/production/module4/META-INF/module4.kotlin_module +End of files Compiling files: module4/src/importAGrandChild.kt End of files diff --git a/jps-plugin/testData/incremental/multiModule/simple/build.log b/jps-plugin/testData/incremental/multiModule/simple/build.log index 5422b612067..a28b1b225ab 100644 --- a/jps-plugin/testData/incremental/multiModule/simple/build.log +++ b/jps-plugin/testData/incremental/multiModule/simple/build.log @@ -2,6 +2,7 @@ Building module1 Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module out/production/module1/foo/A.class End of files Compiling files: @@ -17,6 +18,7 @@ Exit code: NOTHING_DONE ------------------------------------------ Building module2 Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module out/production/module2/foo/AChild.class End of files Compiling files: @@ -34,6 +36,7 @@ Cannot access 'A': it is private in file Building module1 Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module out/production/module1/foo/A.class End of files Compiling files: @@ -55,6 +58,9 @@ End of files Exit code: OK ------------------------------------------ Building module3 +Cleaning output files: + out/production/module3/META-INF/module3.kotlin_module +End of files Compiling files: module3/src/importAChild.kt End of files diff --git a/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/build.log b/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/build.log index 523076d8fd0..2b216fb7c01 100644 --- a/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/a/Outer$B.class out/production/module/a/Outer.class End of files diff --git a/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log b/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log index f2ac1d7ced7..4a4663318ab 100644 --- a/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log @@ -24,6 +24,7 @@ Marked as dirty by Kotlin: Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/Usage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log index e2309cc51dd..0c97baf5ae2 100644 --- a/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/inline/Klass.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log index 00df1933e85..0413c6c6531 100644 --- a/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class End of files @@ -12,6 +13,7 @@ Marked as dirty by Kotlin: Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/Usage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log b/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log index d74096ec08b..af487848341 100644 --- a/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/A.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log index 84d1cdafe6f..63944eb03db 100644 --- a/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/Klass.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/build.log b/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/build.log index f48076f22fb..f9702be2ea8 100644 --- a/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/Klass.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/build.log b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/build.log index ed5652a5e41..6120b0c6beb 100644 --- a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/foo/A.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/build.log index 0ee15e9f36d..6b9705bd901 100644 --- a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/foo/A.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/build.log index 0859bcf46fd..760428f3e58 100644 --- a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/foo/A.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/build.log index 938c0cb5792..dbd011c7bdb 100644 --- a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/foo/A.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log b/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log index 3de05e9c23a..2de0bdbba74 100644 --- a/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log @@ -13,6 +13,7 @@ Marked as dirty by Kotlin: Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/usage/UsageVal.class out/production/module/usage/UsageVar.class End of files @@ -37,6 +38,7 @@ Marked as dirty by Kotlin: Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/usage/UsageVar.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log b/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log index d11c5b74875..4c198b355d1 100644 --- a/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/inline/Inline.class End of files Compiling files: @@ -12,6 +13,7 @@ Marked as dirty by Kotlin: Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/usage/UsageVal.class out/production/module/usage/UsageVar.class End of files @@ -25,6 +27,7 @@ Exit code: OK ================ Step #2 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/inline/Inline.class End of files Compiling files: @@ -35,6 +38,7 @@ Marked as dirty by Kotlin: Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/usage/UsageVar.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/build.log b/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/build.log index 10803d22f67..7813ba95add 100644 --- a/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/Y.class End of files Compiling files: @@ -11,6 +12,7 @@ Marked as dirty by Kotlin: Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/X$main$1.class out/production/module/X.class End of files diff --git a/jps-plugin/testData/incremental/pureKotlin/independentClasses/build.log b/jps-plugin/testData/incremental/pureKotlin/independentClasses/build.log index 671ed4c9ac5..56c874a71d5 100644 --- a/jps-plugin/testData/incremental/pureKotlin/independentClasses/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/independentClasses/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/Foo.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/build.log b/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/build.log index d033febaf8e..d2cee847725 100644 --- a/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/inline/A.class End of files Compiling files: @@ -23,6 +24,7 @@ Exit code: OK ================ Step #2 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/inline/A.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/build.log index c6433f94cf9..40268c20a0f 100644 --- a/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/ClassA.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/build.log index c6433f94cf9..40268c20a0f 100644 --- a/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/ClassA.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/moveClass/build.log b/jps-plugin/testData/incremental/pureKotlin/moveClass/build.log index bb01e5d56e8..f4a45aa0f2d 100644 --- a/jps-plugin/testData/incremental/pureKotlin/moveClass/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/moveClass/build.log @@ -2,6 +2,7 @@ Cleaning output files: out/production/module/Foo.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: src/b.kt @@ -13,6 +14,7 @@ Exit code: OK Cleaning output files: out/production/module/Foo.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: End of files diff --git a/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log index 9ef71d29039..261ecf14752 100644 --- a/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/Object.class End of files Compiling files: @@ -11,6 +12,7 @@ Marked as dirty by Kotlin: Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/Usage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log index 103791bfeb0..d140a2774bb 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log @@ -12,6 +12,7 @@ Marked as dirty by Kotlin: Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/Usage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/build.log b/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/build.log index c6433f94cf9..40268c20a0f 100644 --- a/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/ClassA.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/build.log b/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/build.log index c6433f94cf9..40268c20a0f 100644 --- a/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/ClassA.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/build.log index c6433f94cf9..40268c20a0f 100644 --- a/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/ClassA.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/build.log b/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/build.log index c6433f94cf9..40268c20a0f 100644 --- a/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/ClassA.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/build.log b/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/build.log index c6433f94cf9..40268c20a0f 100644 --- a/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/ClassA.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/build.log index c6433f94cf9..40268c20a0f 100644 --- a/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/ClassA.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/privateValAdded/build.log b/jps-plugin/testData/incremental/pureKotlin/privateValAdded/build.log index c6433f94cf9..40268c20a0f 100644 --- a/jps-plugin/testData/incremental/pureKotlin/privateValAdded/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/privateValAdded/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/ClassA.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/build.log b/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/build.log index c6433f94cf9..40268c20a0f 100644 --- a/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/ClassA.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/build.log index c6433f94cf9..40268c20a0f 100644 --- a/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/ClassA.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/build.log b/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/build.log index c6433f94cf9..40268c20a0f 100644 --- a/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/ClassA.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/build.log b/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/build.log index c6433f94cf9..40268c20a0f 100644 --- a/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/ClassA.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/build.log index c6433f94cf9..40268c20a0f 100644 --- a/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/ClassA.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/build.log b/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/build.log index 27e070aa859..f398a402ba4 100644 --- a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/foo/A$Companion.class out/production/module/foo/A.class End of files diff --git a/jps-plugin/testData/incremental/pureKotlin/removeClass/build.log b/jps-plugin/testData/incremental/pureKotlin/removeClass/build.log index 6379a603e78..1c0af2098a4 100644 --- a/jps-plugin/testData/incremental/pureKotlin/removeClass/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/removeClass/build.log @@ -1,13 +1,13 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/foo/A.class End of files Marked as dirty by Kotlin: src/funA.kt src/useA.kt 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 diff --git a/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/build.log b/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/build.log index 4125b564b49..4686e037381 100644 --- a/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/build.log @@ -2,13 +2,13 @@ Cleaning output files: out/production/module/A.class + out/production/module/META-INF/module.kotlin_module End of files Marked as dirty by Kotlin: src/funA.kt src/useA.kt Cleaning output files: out/production/module/FunAKt.class - out/production/module/META-INF/module.kotlin_module out/production/module/UseAKt.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/build.log b/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/build.log index 523076d8fd0..2b216fb7c01 100644 --- a/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/a/Outer$B.class out/production/module/a/Outer.class End of files diff --git a/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/build.log b/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/build.log index 71e757e4d58..16947c0b61d 100644 --- a/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/Foo$Boo.class out/production/module/test/Foo.class End of files diff --git a/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log index 1ac3cdb2401..10639a549f6 100644 --- a/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/Trait$Companion.class out/production/module/test/Trait.class End of files @@ -12,6 +13,7 @@ Marked as dirty by Kotlin: Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/Usage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log b/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log index 1b9a86e1791..3a6140adab1 100644 --- a/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/A.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log index ad5506abcaf..0b689288111 100644 --- a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log +++ b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log @@ -18,11 +18,11 @@ Exit code: OK Cleaning output files: out/production/module/Foo.class + out/production/module/META-INF/module.kotlin_module End of files Marked as dirty by Kotlin: src/usage.kt Cleaning output files: - out/production/module/META-INF/module.kotlin_module out/production/module/UsageKt.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log index 5b9f74cd080..00b0e38e94f 100644 --- a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log +++ b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log @@ -12,6 +12,7 @@ Exit code: OK ================ Step #2 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/TheClass.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log index c9574603a1b..ce3183f7f70 100644 --- a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log +++ b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log @@ -1,12 +1,12 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/TheClass.class End of files Marked as dirty by Kotlin: src/usageInKotlin.kt Cleaning output files: - out/production/module/META-INF/module.kotlin_module out/production/module/Usage.class out/production/module/UsageInKotlinKt.class End of files diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log index 37db9b3570d..0d8bced13df 100644 --- a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log @@ -9,6 +9,7 @@ Compiling files: src/JavaClass.java End of files Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/Usage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/build.log index bb953cb9f0a..cc331800e3b 100644 --- a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/build.log +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/build.log @@ -9,6 +9,7 @@ Compiling files: src/Super.java End of files Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/Sub.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/build.log index 268087eb177..0c139a9f061 100644 --- a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/build.log +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/build.log @@ -2,6 +2,7 @@ Cleaning output files: out/production/module/BaseClass.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: src/BaseClass.kt diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log index 7e9f5a92d93..e15e43e97ff 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class End of files diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log index 51a3c22c851..009db0433dc 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class 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 7e9f5a92d93..e15e43e97ff 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class End of files diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/build.log index 51a3c22c851..009db0433dc 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class End of files diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log index 4012e1613ad..ecbfcfb5fa2 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/Super.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/build.log index c6433f94cf9..40268c20a0f 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/test/ClassA.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/withJava/other/classRedeclaration/build.log b/jps-plugin/testData/incremental/withJava/other/classRedeclaration/build.log index 1e854056845..f507ae55e95 100644 --- a/jps-plugin/testData/incremental/withJava/other/classRedeclaration/build.log +++ b/jps-plugin/testData/incremental/withJava/other/classRedeclaration/build.log @@ -7,6 +7,7 @@ Exit code: OK ------------------------------------------ Cleaning output files: out/production/module/Klass.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: src/class1.kt diff --git a/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/build.log b/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/build.log index 75ee007497a..f49b2b6fd80 100644 --- a/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/build.log +++ b/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/build.log @@ -3,6 +3,7 @@ Cleaning output files: out/production/module/A$Companion.class out/production/module/A.class + out/production/module/META-INF/module.kotlin_module End of files Marked as dirty by Kotlin: src/AChild.kt @@ -16,7 +17,6 @@ Cleaning output files: out/production/module/AChild.class out/production/module/GetAChildKt.class out/production/module/GetAKt.class - out/production/module/META-INF/module.kotlin_module out/production/module/UseFKt.class out/production/module/UseGKt.class out/production/module/UseHKt.class diff --git a/jps-plugin/testData/incremental/withJava/other/jvmNameChanged/build.log b/jps-plugin/testData/incremental/withJava/other/jvmNameChanged/build.log index fc282e041ab..42d665fcb09 100644 --- a/jps-plugin/testData/incremental/withJava/other/jvmNameChanged/build.log +++ b/jps-plugin/testData/incremental/withJava/other/jvmNameChanged/build.log @@ -1,6 +1,7 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/META-INF/module.kotlin_module out/production/module/foo/A.class End of files Compiling files: