From 4b8c9c8b39abbf8a73fef5e10fceb89b9cfca6a6 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 23 Mar 2016 13:39:02 +0300 Subject: [PATCH] Minor: fix testdata --- .../clearedHasKotlin/build.log | 6 +-- .../exportedModule/build.log | 8 ++-- .../data-container-version-build.log | 16 +++---- .../javaOnlyModulesAreNotAffected/build.log | 4 +- .../module1Modified/build.log | 14 +++--- .../data-container-version-build.log | 22 ++++----- .../module2Modified/build.log | 8 ++-- .../data-container-version-build.log | 12 ++--- .../moduleWithConstantModified/build.log | 6 +-- .../data-container-version-build.log | 10 ++-- .../moduleWithInlineModified/build.log | 6 +-- .../data-container-version-build.log | 10 ++-- .../cacheVersionChanged/withError/build.log | 22 ++++----- .../data-container-version-build.log | 32 ++++++------- .../experimentalOn/build.log | 34 +++++++------- .../experimentalOnJavaChanged/build.log | 20 ++++---- .../experimentalOnOff/build.log | 46 +++++++++---------- .../incrementalOff/build.log | 16 +++---- .../incrementalOffOn/build.log | 36 +++++++-------- .../multiModuleCircular/build.log | 34 +++++++------- .../build.log | 18 ++++---- .../build.log | 18 ++++---- .../multiModuleExported/build.log | 30 ++++++------ .../multiModuleSimple/build.log | 26 +++++------ .../circularDependencyClasses/build.log | 4 +- .../experimental-ic-build.log | 6 +-- .../build.log | 4 +- .../build.log | 8 ++-- .../experimental-ic-build.log | 4 +- .../build.log | 16 +++---- .../experimental-ic-build.log | 8 ++-- .../constantValueChanged/build.log | 6 +-- .../experimental-ic-build.log | 12 ++--- .../defaultParameterAdded/build.log | 6 +-- .../experimental-ic-build.log | 8 ++-- .../build.log | 8 ++-- .../experimental-ic-build.log | 10 ++-- .../defaultParameterRemoved/build.log | 6 +-- .../experimental-ic-build.log | 8 ++-- .../build.log | 8 ++-- .../experimental-ic-build.log | 10 ++-- .../inlineFunctionInlined/build.log | 10 ++-- .../inlineFunctionTwoPackageParts/build.log | 20 ++++---- .../multiModule/simpleDependency/build.log | 8 ++-- .../experimental-ic-build.log | 10 ++-- .../build.log | 8 ++-- .../experimental-ic-build.log | 10 ++-- .../build.log | 8 ++-- .../simpleDependencyUnchanged/build.log | 4 +- .../transitiveDependency/build.log | 8 ++-- .../experimental-ic-build.log | 10 ++-- .../multiModule/transitiveInlining/build.log | 16 +++---- .../multiModule/twoDependants/build.log | 12 ++--- .../twoDependants/experimental-ic-build.log | 16 +++---- 54 files changed, 363 insertions(+), 363 deletions(-) diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log b/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log index 8186bbcbadf..c2086b69a47 100644 --- a/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log +++ b/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log @@ -6,7 +6,7 @@ End of files Exit code: NOTHING_DONE ------------------------------------------ Compiling files: - module1/src/module1_C.java + module1/src/C.java End of files Exit code: NOTHING_DONE ------------------------------------------ @@ -19,7 +19,7 @@ Cleaning output files: out/production/module1/A.class End of files Compiling files: - module1/src/module1_A.kt + module1/src/A.kt End of files Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ @@ -27,7 +27,7 @@ Cleaning output files: out/production/module1/B.class End of files Compiling files: - module1/src/module1_B.kt + module1/src/B.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/build.log b/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/build.log index d02fea7e638..10b162bd35e 100644 --- a/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/build.log +++ b/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/build.log @@ -4,7 +4,7 @@ Cleaning output files: out/production/module1/a/A.class End of files Compiling files: - module1/src/module1_A.kt + module1/src/A.kt End of files Exit code: OK ------------------------------------------ @@ -12,7 +12,7 @@ Cleaning output files: out/production/module2/b/B.class End of files Compiling files: - module2/src/module2_B.kt + module2/src/B.kt End of files Exit code: OK ------------------------------------------ @@ -20,7 +20,7 @@ Cleaning output files: out/production/module3/c/C.class End of files Compiling files: - module3/src/module3_C.kt + module3/src/C.kt End of files Exit code: OK ------------------------------------------ @@ -28,7 +28,7 @@ Cleaning output files: out/production/module4/D/D.class End of files Compiling files: - module4/src/module4_D.kt + module4/src/D.kt End of files Exit code: OK ------------------------------------------ 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 1a8d7b0695f..aaaa056607b 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 @@ -4,20 +4,20 @@ Cleaning output files: out/production/module1/a/A.class End of files Compiling files: - module1/src/module1_A.kt + module1/src/A.kt End of files Marked as dirty by Kotlin: - module1/src/module1_A.kt - module2/src/module2_B.kt - module3/src/module3_C.kt - module4/src/module4_D.kt + module1/src/A.kt + module2/src/B.kt + module3/src/C.kt + module4/src/D.kt Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/b/B.class End of files Compiling files: - module2/src/module2_B.kt + module2/src/B.kt End of files Exit code: OK ------------------------------------------ @@ -25,7 +25,7 @@ Cleaning output files: out/production/module3/c/C.class End of files Compiling files: - module3/src/module3_C.kt + module3/src/C.kt End of files Exit code: OK ------------------------------------------ @@ -33,7 +33,7 @@ Cleaning output files: out/production/module4/D/D.class End of files Compiling files: - module4/src/module4_D.kt + module4/src/D.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/build.log b/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/build.log index b7b0767477c..e6bdd80c5e7 100644 --- a/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/build.log +++ b/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/build.log @@ -6,7 +6,7 @@ End of files Exit code: NOTHING_DONE ------------------------------------------ Compiling files: - module1/src/module1_A.java + module1/src/A.java End of files Exit code: NOTHING_DONE ------------------------------------------ @@ -21,7 +21,7 @@ End of files Exit code: NOTHING_DONE ------------------------------------------ Compiling files: - module1/src/module1_B.java + module1/src/B.java End of files Exit code: NOTHING_DONE ------------------------------------------ diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log b/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log index 2894338355f..ded55f46d67 100644 --- a/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log +++ b/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log @@ -6,35 +6,35 @@ Cleaning output files: out/production/module4/module4/D.class End of files Compiling files: - module4/src/module4_d.kt + module4/src/d.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/module1/A.class - out/production/module1/module1/Module1_aKt.class + out/production/module1/module1/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/module2/Module2_bKt.class + out/production/module2/module2/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module3/META-INF/module3.kotlin_module - out/production/module3/module3/Module3_cKt.class + out/production/module3/module3/CKt.class End of files Compiling files: - module3/src/module3_c.kt + module3/src/c.kt End of files Exit code: OK ------------------------------------------ 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 2b342e3b58b..cb0f7a4ec83 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 @@ -6,40 +6,40 @@ Cleaning output files: out/production/module4/module4/D.class End of files Compiling files: - module4/src/module4_d.kt + module4/src/d.kt End of files Marked as dirty by Kotlin: - module1/src/module1_a.kt - module2/src/module2_b.kt - module3/src/module3_c.kt - module4/src/module4_d.kt + module1/src/a.kt + module2/src/b.kt + module3/src/c.kt + module4/src/d.kt Exit code: OK ------------------------------------------ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/module1/A.class - out/production/module1/module1/Module1_aKt.class + out/production/module1/module1/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/module2/Module2_bKt.class + out/production/module2/module2/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module3/META-INF/module3.kotlin_module - out/production/module3/module3/Module3_cKt.class + out/production/module3/module3/CKt.class End of files Compiling files: - module3/src/module3_c.kt + module3/src/c.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/build.log b/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/build.log index 9365c3e7817..e683eb51ead 100644 --- a/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/build.log +++ b/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/build.log @@ -3,19 +3,19 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/module1/A.class - out/production/module1/module1/Module1_aKt.class + out/production/module1/module1/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/module2/Module2_bKt.class + out/production/module2/module2/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/data-container-version-build.log b/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/data-container-version-build.log index da85b77b110..93442154ba3 100644 --- a/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/data-container-version-build.log +++ b/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/data-container-version-build.log @@ -3,22 +3,22 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/module1/A.class - out/production/module1/module1/Module1_aKt.class + out/production/module1/module1/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Marked as dirty by Kotlin: - module1/src/module1_a.kt - module2/src/module2_b.kt + module1/src/a.kt + module2/src/b.kt Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/module2/Module2_bKt.class + out/production/module2/module2/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log b/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log index 840832f2d80..11aa2c27032 100644 --- a/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log +++ b/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log @@ -2,10 +2,10 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/a/Module1_AKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_A.kt + module1/src/A.kt End of files Exit code: OK ------------------------------------------ @@ -13,7 +13,7 @@ Cleaning output files: out/production/module2/b/B.class End of files Compiling files: - module2/src/module2_B.kt + module2/src/B.kt End of files Exit code: OK ------------------------------------------ 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 e91ca18b7e9..22017d936e8 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 @@ -2,21 +2,21 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/a/Module1_AKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_A.kt + module1/src/A.kt End of files Marked as dirty by Kotlin: - module1/src/module1_A.kt - module2/src/module2_B.kt + module1/src/A.kt + module2/src/B.kt Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/b/B.class End of files Compiling files: - module2/src/module2_B.kt + module2/src/B.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log b/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log index b09b8be9b22..4a0adc2e40a 100644 --- a/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log +++ b/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log @@ -3,10 +3,10 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class - out/production/module1/a/Module1_AKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_A.kt + module1/src/A.kt End of files Exit code: OK ------------------------------------------ @@ -14,7 +14,7 @@ Cleaning output files: out/production/module2/b/B.class End of files Compiling files: - module2/src/module2_B.kt + module2/src/B.kt End of files Exit code: OK ------------------------------------------ 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 0fc485c9e08..e35086f3432 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 @@ -3,21 +3,21 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class - out/production/module1/a/Module1_AKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_A.kt + module1/src/A.kt End of files Marked as dirty by Kotlin: - module1/src/module1_A.kt - module2/src/module2_B.kt + module1/src/A.kt + module2/src/B.kt Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/b/B.class End of files Compiling files: - module2/src/module2_B.kt + module2/src/B.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log b/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log index a6ea3e076ec..f2b67ca3ace 100644 --- a/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log +++ b/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log @@ -6,19 +6,19 @@ Cleaning output files: out/production/module4/module4/D.class End of files Compiling files: - module4/src/module4_d.kt + module4/src/d.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/module1/A.class - out/production/module1/module1/Module1_aKt.class - out/production/module1/module1/Module1_fKt.class + out/production/module1/module1/AKt.class + out/production/module1/module1/FKt.class End of files Compiling files: - module1/src/module1_a.kt - module1/src/module1_f.kt + module1/src/a.kt + module1/src/f.kt End of files Exit code: ABORT ------------------------------------------ @@ -32,26 +32,26 @@ Exit code: NOTHING_DONE Exit code: NOTHING_DONE ------------------------------------------ Compiling files: - module1/src/module1_a.kt - module1/src/module1_f.kt + module1/src/a.kt + module1/src/f.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/module2/Module2_bKt.class + out/production/module2/module2/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module3/META-INF/module3.kotlin_module - out/production/module3/module3/Module3_cKt.class + out/production/module3/module3/CKt.class End of files Compiling files: - module3/src/module3_c.kt + module3/src/c.kt End of files Exit code: OK ------------------------------------------ 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 1a89d780789..ffad4243995 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 @@ -6,25 +6,25 @@ Cleaning output files: out/production/module4/module4/D.class End of files Compiling files: - module4/src/module4_d.kt + module4/src/d.kt End of files Marked as dirty by Kotlin: - module1/src/module1_a.kt - module1/src/module1_f.kt - module2/src/module2_b.kt - module3/src/module3_c.kt - module4/src/module4_d.kt + module1/src/a.kt + module1/src/f.kt + module2/src/b.kt + module3/src/c.kt + module4/src/d.kt Exit code: OK ------------------------------------------ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/module1/A.class - out/production/module1/module1/Module1_aKt.class - out/production/module1/module1/Module1_fKt.class + out/production/module1/module1/AKt.class + out/production/module1/module1/FKt.class End of files Compiling files: - module1/src/module1_a.kt - module1/src/module1_f.kt + module1/src/a.kt + module1/src/f.kt End of files Exit code: ABORT ------------------------------------------ @@ -38,26 +38,26 @@ Exit code: NOTHING_DONE Exit code: NOTHING_DONE ------------------------------------------ Compiling files: - module1/src/module1_a.kt - module1/src/module1_f.kt + module1/src/a.kt + module1/src/f.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/module2/Module2_bKt.class + out/production/module2/module2/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module3/META-INF/module3.kotlin_module - out/production/module3/module3/Module3_cKt.class + out/production/module3/module3/CKt.class End of files Compiling files: - module3/src/module3_c.kt + module3/src/c.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/build.log b/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/build.log index 5481324e411..0d14fe5c64f 100644 --- a/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/build.log +++ b/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/build.log @@ -4,30 +4,30 @@ Cleaning output files: out/production/module1/foo/Z.class End of files Compiling files: - module1/src/module1_z.kt + module1/src/z.kt End of files Marked as dirty by Kotlin: - module1/src/module1_z.kt - module2/src/module2_a.kt - module2/src/module2_b.kt - module2/src/module2_c.kt - module3/src/module3_d.kt - module4/src/module4_e.kt + module1/src/z.kt + module2/src/a.kt + module2/src/b.kt + module2/src/c.kt + module3/src/d.kt + module4/src/e.kt Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/foo/A.class + out/production/module2/foo/AKt.class out/production/module2/foo/B.class + out/production/module2/foo/BKt.class out/production/module2/foo/C.class - out/production/module2/foo/Module2_aKt.class - out/production/module2/foo/Module2_bKt.class - out/production/module2/foo/Module2_cKt.class + out/production/module2/foo/CKt.class End of files Compiling files: - module2/src/module2_a.kt - module2/src/module2_b.kt - module2/src/module2_c.kt + module2/src/a.kt + module2/src/b.kt + module2/src/c.kt End of files Exit code: OK ------------------------------------------ @@ -35,7 +35,7 @@ Cleaning output files: out/production/module3/foo/D.class End of files Compiling files: - module3/src/module3_d.kt + module3/src/d.kt End of files Exit code: OK ------------------------------------------ @@ -43,7 +43,7 @@ Cleaning output files: out/production/module4/foo/E.class End of files Compiling files: - module4/src/module4_e.kt + module4/src/e.kt End of files Exit code: OK ------------------------------------------ @@ -55,10 +55,10 @@ Exit code: NOTHING_DONE Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/foo/A.class - out/production/module2/foo/Module2_aKt.class + out/production/module2/foo/AKt.class End of files Compiling files: - module2/src/module2_a.kt + module2/src/a.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/build.log b/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/build.log index 0f54ba72254..a383c6b8b34 100644 --- a/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/build.log +++ b/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/build.log @@ -1,37 +1,37 @@ ================ Step #1 ================= Cleaning output files: + out/production/module1/AKt.class out/production/module1/META-INF/module1.kotlin_module - out/production/module1/Module1_aKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Marked as dirty by Kotlin: - module1/src/module1_a.kt - module2/src/module2_c.kt - module3/src/module3_d.kt + module1/src/a.kt + module2/src/c.kt + module3/src/d.kt Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/B.class + out/production/module2/CKt.class out/production/module2/META-INF/module2.kotlin_module - out/production/module2/Module2_cKt.class End of files Compiling files: - module2/src/module2_c.kt + module2/src/c.kt End of files Exit code: OK ------------------------------------------ Compiling files: - module2/src/module2_B.java + module2/src/B.java End of files Cleaning output files: + out/production/module3/DKt.class out/production/module3/META-INF/module3.kotlin_module - out/production/module3/Module3_dKt.class End of files Compiling files: - module3/src/module3_d.kt + module3/src/d.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/build.log b/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/build.log index 6d9f76555e3..5fb2084b8ca 100644 --- a/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/build.log +++ b/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/build.log @@ -4,30 +4,30 @@ Cleaning output files: out/production/module1/foo/Z.class End of files Compiling files: - module1/src/module1_z.kt + module1/src/z.kt End of files Marked as dirty by Kotlin: - module1/src/module1_z.kt - module2/src/module2_a.kt - module2/src/module2_b.kt - module2/src/module2_c.kt - module3/src/module3_d.kt - module4/src/module4_e.kt + module1/src/z.kt + module2/src/a.kt + module2/src/b.kt + module2/src/c.kt + module3/src/d.kt + module4/src/e.kt Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/foo/A.class + out/production/module2/foo/AKt.class out/production/module2/foo/B.class + out/production/module2/foo/BKt.class out/production/module2/foo/C.class - out/production/module2/foo/Module2_aKt.class - out/production/module2/foo/Module2_bKt.class - out/production/module2/foo/Module2_cKt.class + out/production/module2/foo/CKt.class End of files Compiling files: - module2/src/module2_a.kt - module2/src/module2_b.kt - module2/src/module2_c.kt + module2/src/a.kt + module2/src/b.kt + module2/src/c.kt End of files Exit code: OK ------------------------------------------ @@ -35,7 +35,7 @@ Cleaning output files: out/production/module3/foo/D.class End of files Compiling files: - module3/src/module3_d.kt + module3/src/d.kt End of files Exit code: OK ------------------------------------------ @@ -43,7 +43,7 @@ Cleaning output files: out/production/module4/foo/E.class End of files Compiling files: - module4/src/module4_e.kt + module4/src/e.kt End of files Exit code: OK ------------------------------------------ @@ -55,10 +55,10 @@ Exit code: NOTHING_DONE Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/foo/A.class - out/production/module2/foo/Module2_aKt.class + out/production/module2/foo/AKt.class End of files Compiling files: - module2/src/module2_a.kt + module2/src/a.kt End of files Exit code: OK ------------------------------------------ @@ -74,23 +74,23 @@ Exit code: NOTHING_DONE Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/foo/A.class - out/production/module2/foo/Module2_aKt.class + out/production/module2/foo/AKt.class End of files Compiling files: - module2/src/module2_a.kt + module2/src/a.kt End of files Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/foo/B.class + out/production/module2/foo/BKt.class out/production/module2/foo/C.class - out/production/module2/foo/Module2_bKt.class - out/production/module2/foo/Module2_cKt.class + out/production/module2/foo/CKt.class End of files Compiling files: - module2/src/module2_b.kt - module2/src/module2_c.kt + module2/src/b.kt + module2/src/c.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log b/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log index 551992f4603..aad8e10a540 100644 --- a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log +++ b/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log @@ -4,12 +4,12 @@ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/foo/Module2_aKt.class + out/production/module2/foo/AKt.class End of files Compiling files: - module2/src/module2_a.kt - module2/src/module2_b.kt - module2/src/module2_c.kt + module2/src/a.kt + module2/src/b.kt + module2/src/c.kt End of files Exit code: OK ------------------------------------------ @@ -24,12 +24,12 @@ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/foo/Module2_aKt.class + out/production/module2/foo/AKt.class End of files Compiling files: - module2/src/module2_a.kt - module2/src/module2_b.kt - module2/src/module2_c.kt + module2/src/a.kt + module2/src/b.kt + module2/src/c.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log b/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log index cd4b87fa3d1..6f5a9f3f178 100644 --- a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log +++ b/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log @@ -4,12 +4,12 @@ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/foo/Module2_aKt.class + out/production/module2/foo/AKt.class End of files Compiling files: - module2/src/module2_a.kt - module2/src/module2_b.kt - module2/src/module2_c.kt + module2/src/a.kt + module2/src/b.kt + module2/src/c.kt End of files Exit code: OK ------------------------------------------ @@ -24,20 +24,20 @@ Cleaning output files: out/production/module1/foo/Z.class End of files Compiling files: - module1/src/module1_z.kt + module1/src/z.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/foo/Module2_aKt.class - out/production/module2/foo/Module2_bKt.class - out/production/module2/foo/Module2_cKt.class + out/production/module2/foo/AKt.class + out/production/module2/foo/BKt.class + out/production/module2/foo/CKt.class End of files Compiling files: - module2/src/module2_a.kt - module2/src/module2_b.kt - module2/src/module2_c.kt + module2/src/a.kt + module2/src/b.kt + module2/src/c.kt End of files Exit code: OK ------------------------------------------ @@ -45,7 +45,7 @@ Cleaning output files: out/production/module3/foo/D.class End of files Compiling files: - module3/src/module3_d.kt + module3/src/d.kt End of files Exit code: OK ------------------------------------------ @@ -53,7 +53,7 @@ Cleaning output files: out/production/module4/foo/E.class End of files Compiling files: - module4/src/module4_e.kt + module4/src/e.kt End of files Exit code: OK ------------------------------------------ @@ -64,21 +64,21 @@ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/foo/Module2_aKt.class + out/production/module2/foo/AKt.class End of files Compiling files: - module2/src/module2_a.kt + module2/src/a.kt End of files Marked as dirty by Kotlin: - module2/src/module2_b.kt + module2/src/b.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/foo/Module2_bKt.class + out/production/module2/foo/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log index f73f3de34d0..75af85fd9a8 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log @@ -4,14 +4,14 @@ Cleaning output files: out/production/module1/foo/A.class End of files Compiling files: - module1/src/module1_A.kt + module1/src/A.kt End of files Marked as dirty by Kotlin: - module1/src/module1_D.kt - module2/src/module2_B.kt - module3/src/module3_C.kt - module4/src/module4_E.kt - module5/src/module5_F.kt + module1/src/D.kt + module2/src/B.kt + module3/src/C.kt + module4/src/E.kt + module5/src/F.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: @@ -20,13 +20,13 @@ Cleaning output files: out/production/module3/foo/C.class End of files Compiling files: - module2/src/module2_B.kt + module2/src/B.kt End of files Compiling files: - module3/src/module3_C.kt + module3/src/C.kt End of files Compiling files: - module1/src/module1_D.kt + module1/src/D.kt End of files Exit code: ABORT ------------------------------------------ @@ -39,18 +39,18 @@ Cleaning output files: out/production/module1/foo/A.class End of files Compiling files: - module2/src/module2_B.kt + module2/src/B.kt End of files Compiling files: - module3/src/module3_C.kt + module3/src/C.kt End of files Compiling files: - module1/src/module1_A.kt - module1/src/module1_D.kt + module1/src/A.kt + module1/src/D.kt End of files Marked as dirty by Kotlin: - module4/src/module4_E.kt - module5/src/module5_F.kt + module4/src/E.kt + module5/src/F.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE @@ -59,7 +59,7 @@ Cleaning output files: out/production/module4/foo/E.class End of files Compiling files: - module4/src/module4_E.kt + module4/src/E.kt End of files Exit code: OK ------------------------------------------ @@ -67,7 +67,7 @@ Cleaning output files: out/production/module5/foo/F.class End of files Compiling files: - module5/src/module5_F.kt + module5/src/F.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/build.log index a5bdbe5bd98..3b75376e9c1 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/build.log @@ -4,23 +4,23 @@ Cleaning output files: out/production/module1/foo/A.class End of files Compiling files: - module1/src/module1_A.kt + module1/src/A.kt End of files Marked as dirty by Kotlin: - module2/src/module2_createADefault.kt - module2/src/module2_createANonDefault.kt + module2/src/createADefault.kt + module2/src/createANonDefault.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/foo/Module2_createADefaultKt.class - out/production/module2/foo/Module2_createANonDefaultKt.class + out/production/module2/foo/CreateADefaultKt.class + out/production/module2/foo/CreateANonDefaultKt.class End of files Compiling files: - module2/src/module2_createADefault.kt - module2/src/module2_createANonDefault.kt + module2/src/createADefault.kt + module2/src/createANonDefault.kt End of files Exit code: ABORT ------------------------------------------ @@ -32,7 +32,7 @@ Too many arguments for public constructor A() defined in foo.A Exit code: NOTHING_DONE ------------------------------------------ Compiling files: - module2/src/module2_createADefault.kt + module2/src/createADefault.kt End of files Exit code: OK ------------------------------------------- \ No newline at end of file +------------------------------------------ diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/build.log index fd6e6c52645..33fd6c80e21 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/build.log @@ -4,23 +4,23 @@ Cleaning output files: out/production/module1/foo/A.class End of files Compiling files: - module1/src/module1_A.kt + module1/src/A.kt End of files Marked as dirty by Kotlin: - module2/src/module2_createADefault.kt - module2/src/module2_createANonDefault.kt + module2/src/createADefault.kt + module2/src/createANonDefault.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/foo/Module2_createADefaultKt.class - out/production/module2/foo/Module2_createANonDefaultKt.class + out/production/module2/foo/CreateADefaultKt.class + out/production/module2/foo/CreateANonDefaultKt.class End of files Compiling files: - module2/src/module2_createADefault.kt - module2/src/module2_createANonDefault.kt + module2/src/createADefault.kt + module2/src/createANonDefault.kt End of files Exit code: ABORT ------------------------------------------ @@ -32,7 +32,7 @@ No value passed for parameter x Exit code: NOTHING_DONE ------------------------------------------ Compiling files: - module2/src/module2_createANonDefault.kt + module2/src/createANonDefault.kt End of files Exit code: OK ------------------------------------------- \ No newline at end of file +------------------------------------------ diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log index 23d3560344a..165fd9620e4 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log @@ -4,13 +4,13 @@ Cleaning output files: out/production/module1/foo/A.class End of files Compiling files: - module1/src/module1_A.kt + module1/src/A.kt End of files Marked as dirty by Kotlin: - module2/src/module2_AChild.kt - module3/src/module3_AGrandChild.kt - module3/src/module3_importAGrandChild.kt - module4/src/module4_importAGrandChild.kt + module2/src/AChild.kt + module3/src/AGrandChild.kt + module3/src/importAGrandChild.kt + module4/src/importAGrandChild.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE @@ -19,7 +19,7 @@ Cleaning output files: out/production/module2/foo/AChild.class End of files Compiling files: - module2/src/module2_AChild.kt + module2/src/AChild.kt End of files Exit code: ABORT ------------------------------------------ @@ -33,19 +33,19 @@ Cleaning output files: out/production/module1/foo/A.class End of files Compiling files: - module1/src/module1_A.kt + module1/src/A.kt End of files Marked as dirty by Kotlin: - module2/src/module2_AChild.kt - module3/src/module3_AGrandChild.kt - module3/src/module3_importAGrandChild.kt - module4/src/module4_importAGrandChild.kt + module2/src/AChild.kt + module3/src/AGrandChild.kt + module3/src/importAGrandChild.kt + module4/src/importAGrandChild.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ Compiling files: - module2/src/module2_AChild.kt + module2/src/AChild.kt End of files Exit code: OK ------------------------------------------ @@ -53,13 +53,13 @@ Cleaning output files: out/production/module3/foo/AGrandChild.class End of files Compiling files: - module3/src/module3_AGrandChild.kt - module3/src/module3_importAGrandChild.kt + module3/src/AGrandChild.kt + module3/src/importAGrandChild.kt End of files Exit code: OK ------------------------------------------ Compiling files: - module4/src/module4_importAGrandChild.kt + module4/src/importAGrandChild.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log index fe2e77d7cc9..5e7cec4c4b0 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log @@ -4,12 +4,12 @@ Cleaning output files: out/production/module1/foo/A.class End of files Compiling files: - module1/src/module1_A.kt + module1/src/A.kt End of files Marked as dirty by Kotlin: - module2/src/module2_AChild.kt - module2/src/module2_importA.kt - module3/src/module3_importAChild.kt + module2/src/AChild.kt + module2/src/importA.kt + module3/src/importAChild.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE @@ -18,8 +18,8 @@ Cleaning output files: out/production/module2/foo/AChild.class End of files Compiling files: - module2/src/module2_AChild.kt - module2/src/module2_importA.kt + module2/src/AChild.kt + module2/src/importA.kt End of files Exit code: ABORT ------------------------------------------ @@ -34,24 +34,24 @@ Cleaning output files: out/production/module1/foo/A.class End of files Compiling files: - module1/src/module1_A.kt + module1/src/A.kt End of files Marked as dirty by Kotlin: - module2/src/module2_AChild.kt - module2/src/module2_importA.kt - module3/src/module3_importAChild.kt + module2/src/AChild.kt + module2/src/importA.kt + module3/src/importAChild.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ Compiling files: - module2/src/module2_AChild.kt - module2/src/module2_importA.kt + module2/src/AChild.kt + module2/src/importA.kt End of files Exit code: OK ------------------------------------------ Compiling files: - module3/src/module3_importAChild.kt + module3/src/importAChild.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log b/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log index aae52d91530..6a59313759a 100644 --- a/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log +++ b/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log @@ -5,7 +5,7 @@ Cleaning output files: out/production/module2/b/BB.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ @@ -14,7 +14,7 @@ Cleaning output files: out/production/module1/a/AA.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log b/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log index 62a6f378609..208566fb345 100644 --- a/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log +++ b/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log @@ -5,10 +5,10 @@ Cleaning output files: out/production/module2/b/BB.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Marked as dirty by Kotlin: - module1/src/module1_a.kt + module1/src/a.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: @@ -16,7 +16,7 @@ Cleaning output files: out/production/module1/a/AA.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log b/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log index a1121057132..848f3a8fddf 100644 --- a/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log +++ b/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log @@ -2,10 +2,10 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/test/Module1_aKt.class + out/production/module1/test/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log b/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log index 49b9b6ede95..955b8c2b4ec 100644 --- a/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log +++ b/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log @@ -2,20 +2,20 @@ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/b/Module2_bKt.class + out/production/module2/b/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class - out/production/module1/a/Module1_aKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/experimental-ic-build.log b/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/experimental-ic-build.log index 5bf4d44488b..ba77cb16739 100644 --- a/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/experimental-ic-build.log +++ b/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/experimental-ic-build.log @@ -2,10 +2,10 @@ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/b/Module2_bKt.class + out/production/module2/b/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log b/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log index 80367355c9a..26e8255c4d6 100644 --- a/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log +++ b/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log @@ -2,27 +2,27 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/a/Module1_aKt.class - out/production/module1/c/Module1_c2Kt.class + out/production/module1/a/AKt.class + out/production/module1/c/C2Kt.class End of files Compiling files: - module1/src/module1_a.kt - module1/src/module1_c2.kt + module1/src/a.kt + module1/src/c2.kt End of files Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/c/Module1_c1Kt.class + out/production/module1/c/C1Kt.class out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/B.class - out/production/module2/b/Module2_bKt.class + out/production/module2/b/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Compiling files: - module1/src/module1_c1.kt + module1/src/c1.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/experimental-ic-build.log b/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/experimental-ic-build.log index 5f2902249a4..dadff13db49 100644 --- a/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/experimental-ic-build.log +++ b/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/experimental-ic-build.log @@ -2,12 +2,12 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/a/Module1_aKt.class - out/production/module1/c/Module1_c2Kt.class + out/production/module1/a/AKt.class + out/production/module1/c/C2Kt.class End of files Compiling files: - module1/src/module1_a.kt - module1/src/module1_c2.kt + module1/src/a.kt + module1/src/c2.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log b/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log index 632ed20af04..4077bcfe970 100644 --- a/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log +++ b/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log @@ -2,10 +2,10 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/test/Module1_constKt.class + out/production/module1/test/ConstKt.class End of files Compiling files: - module1/src/module1_const.kt + module1/src/const.kt End of files Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ @@ -15,7 +15,7 @@ Cleaning output files: out/production/module2/usage/Usage.class End of files Compiling files: - module2/src/module2_usage.kt + module2/src/usage.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/constantValueChanged/experimental-ic-build.log b/jps-plugin/testData/incremental/multiModule/constantValueChanged/experimental-ic-build.log index 26e3e9444c3..9b0544e9a09 100644 --- a/jps-plugin/testData/incremental/multiModule/constantValueChanged/experimental-ic-build.log +++ b/jps-plugin/testData/incremental/multiModule/constantValueChanged/experimental-ic-build.log @@ -2,21 +2,21 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/test/Module1_constKt.class + out/production/module1/test/ConstKt.class End of files Compiling files: - module1/src/module1_const.kt + module1/src/const.kt End of files Marked as dirty by Kotlin: - module2/src/module2_usage.kt + module2/src/usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/test/Module1_constKt.class + out/production/module1/test/ConstKt.class End of files Compiling files: - module1/src/module1_const.kt + module1/src/const.kt End of files Exit code: OK ------------------------------------------ @@ -24,7 +24,7 @@ Cleaning output files: out/production/module2/usage/Usage.class End of files Compiling files: - module2/src/module2_usage.kt + module2/src/usage.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log b/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log index 461fca20478..0af338460eb 100644 --- a/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log +++ b/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log @@ -4,16 +4,16 @@ Cleaning output files: out/production/module1/a/A.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/usage/Module2_usageKt.class + out/production/module2/usage/UsageKt.class End of files Compiling files: - module2/src/module2_usage.kt + module2/src/usage.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/experimental-ic-build.log b/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/experimental-ic-build.log index c66be0707fa..95ae71bdc8e 100644 --- a/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/experimental-ic-build.log +++ b/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/experimental-ic-build.log @@ -4,20 +4,20 @@ Cleaning output files: out/production/module1/a/A.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Marked as dirty by Kotlin: - module2/src/module2_usage.kt + module2/src/usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/usage/Module2_usageKt.class + out/production/module2/usage/UsageKt.class End of files Compiling files: - module2/src/module2_usage.kt + module2/src/usage.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/build.log b/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/build.log index a59a38584ff..9d45f067205 100644 --- a/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/build.log +++ b/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/build.log @@ -2,19 +2,19 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/a/Module1_aKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/usage/Module2_usageKt.class + out/production/module2/usage/UsageKt.class End of files Compiling files: - module2/src/module2_usage.kt + module2/src/usage.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/experimental-ic-build.log b/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/experimental-ic-build.log index 8057ad99b15..7001866e2ad 100644 --- a/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/experimental-ic-build.log +++ b/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/experimental-ic-build.log @@ -2,23 +2,23 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/a/Module1_aKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Marked as dirty by Kotlin: - module2/src/module2_usage.kt + module2/src/usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/usage/Module2_usageKt.class + out/production/module2/usage/UsageKt.class End of files Compiling files: - module2/src/module2_usage.kt + module2/src/usage.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log b/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log index 461fca20478..0af338460eb 100644 --- a/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log +++ b/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log @@ -4,16 +4,16 @@ Cleaning output files: out/production/module1/a/A.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/usage/Module2_usageKt.class + out/production/module2/usage/UsageKt.class End of files Compiling files: - module2/src/module2_usage.kt + module2/src/usage.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/experimental-ic-build.log b/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/experimental-ic-build.log index c66be0707fa..95ae71bdc8e 100644 --- a/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/experimental-ic-build.log +++ b/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/experimental-ic-build.log @@ -4,20 +4,20 @@ Cleaning output files: out/production/module1/a/A.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Marked as dirty by Kotlin: - module2/src/module2_usage.kt + module2/src/usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/usage/Module2_usageKt.class + out/production/module2/usage/UsageKt.class End of files Compiling files: - module2/src/module2_usage.kt + module2/src/usage.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/build.log b/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/build.log index a59a38584ff..9d45f067205 100644 --- a/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/build.log +++ b/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/build.log @@ -2,19 +2,19 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/a/Module1_aKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/usage/Module2_usageKt.class + out/production/module2/usage/UsageKt.class End of files Compiling files: - module2/src/module2_usage.kt + module2/src/usage.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/experimental-ic-build.log b/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/experimental-ic-build.log index 8057ad99b15..7001866e2ad 100644 --- a/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/experimental-ic-build.log +++ b/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/experimental-ic-build.log @@ -2,23 +2,23 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/a/Module1_aKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Marked as dirty by Kotlin: - module2/src/module2_usage.kt + module2/src/usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/usage/Module2_usageKt.class + out/production/module2/usage/UsageKt.class End of files Compiling files: - module2/src/module2_usage.kt + module2/src/usage.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log b/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log index e2d78e0affb..7b0bdb5d27c 100644 --- a/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log +++ b/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log @@ -2,23 +2,23 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/inline/Module1_inlineKt.class + out/production/module1/inline/InlineKt.class End of files Compiling files: - module1/src/module1_inline.kt + module1/src/inline.kt End of files Marked as dirty by Kotlin: - module2/src/module2_usage.kt + module2/src/usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/usage/Module2_usageKt.class + out/production/module2/usage/UsageKt.class End of files Compiling files: - module2/src/module2_usage.kt + module2/src/usage.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log b/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log index 111b7e68719..9dfc11cb6f8 100644 --- a/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log +++ b/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log @@ -2,23 +2,23 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/inline/Module1_inlineFKt.class + out/production/module1/inline/InlineFKt.class End of files Compiling files: - module1/src/module1_inlineF.kt + module1/src/inlineF.kt End of files Marked as dirty by Kotlin: - module2/src/module2_usageF.kt + module2/src/usageF.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/usage/Module2_usageFKt.class + out/production/module2/usage/UsageFKt.class End of files Compiling files: - module2/src/module2_usageF.kt + module2/src/usageF.kt End of files Exit code: OK ------------------------------------------ @@ -27,23 +27,23 @@ Exit code: OK Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/inline/Module1_inlineGKt.class + out/production/module1/inline/InlineGKt.class End of files Compiling files: - module1/src/module1_inlineG.kt + module1/src/inlineG.kt End of files Marked as dirty by Kotlin: - module2/src/module2_usageG.kt + module2/src/usageG.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/usage/Module2_usageGKt.class + out/production/module2/usage/UsageGKt.class End of files Compiling files: - module2/src/module2_usageG.kt + module2/src/usageG.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log b/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log index e7962572eca..a90dd2ca872 100644 --- a/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log +++ b/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log @@ -3,19 +3,19 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class - out/production/module1/a/Module1_aKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/b/Module2_bKt.class + out/production/module2/b/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependency/experimental-ic-build.log b/jps-plugin/testData/incremental/multiModule/simpleDependency/experimental-ic-build.log index c7045de8aab..ab205a45bd4 100644 --- a/jps-plugin/testData/incremental/multiModule/simpleDependency/experimental-ic-build.log +++ b/jps-plugin/testData/incremental/multiModule/simpleDependency/experimental-ic-build.log @@ -3,23 +3,23 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class - out/production/module1/a/Module1_aKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Marked as dirty by Kotlin: - module2/src/module2_b.kt + module2/src/b.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/b/Module2_bKt.class + out/production/module2/b/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log index 97d0b6d11e8..6cded04bbb9 100644 --- a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log +++ b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log @@ -3,22 +3,22 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class + out/production/module1/a/AKt.class out/production/module1/a/ClassAnnotation.class out/production/module1/a/FileAnnotation.class - out/production/module1/a/Module1_aKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/B.class - out/production/module2/b/Module2_bKt.class + out/production/module2/b/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: ABORT ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log index b4c4f0f17d3..691b823d0bc 100644 --- a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log +++ b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log @@ -3,15 +3,15 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class + out/production/module1/a/AKt.class out/production/module1/a/ClassAnnotation.class out/production/module1/a/FileAnnotation.class - out/production/module1/a/Module1_aKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Marked as dirty by Kotlin: - module2/src/module2_b.kt + module2/src/b.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE @@ -19,10 +19,10 @@ Exit code: NOTHING_DONE Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/B.class - out/production/module2/b/Module2_bKt.class + out/production/module2/b/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: ABORT ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log index 8808e560689..4cfb676fca6 100644 --- a/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log +++ b/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log @@ -3,23 +3,23 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class + out/production/module1/a/AKt.class out/production/module1/a/InternalA.class out/production/module1/a/InternalClassAnnotation.class out/production/module1/a/InternalFileAnnotation.class - out/production/module1/a/Module1_aKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/B.class - out/production/module2/b/Module2_bKt.class + out/production/module2/b/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: ABORT ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log b/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log index 888b57a1c66..9919e125aa3 100644 --- a/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log +++ b/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log @@ -3,10 +3,10 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class - out/production/module1/a/Module1_aKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log b/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log index 0a7146547b9..47d0811cf99 100644 --- a/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log +++ b/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log @@ -3,19 +3,19 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class - out/production/module1/a/Module1_aKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/b/Module2_bKt.class + out/production/module2/b/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/transitiveDependency/experimental-ic-build.log b/jps-plugin/testData/incremental/multiModule/transitiveDependency/experimental-ic-build.log index 73b0b03f420..2504e97f8ca 100644 --- a/jps-plugin/testData/incremental/multiModule/transitiveDependency/experimental-ic-build.log +++ b/jps-plugin/testData/incremental/multiModule/transitiveDependency/experimental-ic-build.log @@ -3,23 +3,23 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class - out/production/module1/a/Module1_aKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Marked as dirty by Kotlin: - module2/src/module2_b.kt + module2/src/b.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/b/Module2_bKt.class + out/production/module2/b/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log b/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log index 23ad69e9bbc..412224b0f46 100644 --- a/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log +++ b/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log @@ -2,36 +2,36 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/a/Module1_aKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Marked as dirty by Kotlin: - module2/src/module2_b.kt + module2/src/b.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/b/Module2_bKt.class + out/production/module2/b/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Marked as dirty by Kotlin: - module3/src/module3_c.kt + module3/src/c.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module3/META-INF/module3.kotlin_module - out/production/module3/c/Module3_cKt.class + out/production/module3/c/CKt.class End of files Compiling files: - module3/src/module3_c.kt + module3/src/c.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/twoDependants/build.log b/jps-plugin/testData/incremental/multiModule/twoDependants/build.log index c5d46a2cdad..1e5cd25f8ff 100644 --- a/jps-plugin/testData/incremental/multiModule/twoDependants/build.log +++ b/jps-plugin/testData/incremental/multiModule/twoDependants/build.log @@ -3,28 +3,28 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class - out/production/module1/a/Module1_aKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module3/META-INF/module3.kotlin_module - out/production/module3/c/Module3_cKt.class + out/production/module3/c/CKt.class End of files Compiling files: - module3/src/module3_c.kt + module3/src/c.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/b/Module2_bKt.class + out/production/module2/b/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log b/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log index 99c74cffa62..74815f1a93b 100644 --- a/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log +++ b/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log @@ -3,33 +3,33 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class - out/production/module1/a/Module1_aKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Marked as dirty by Kotlin: - module2/src/module2_b.kt - module3/src/module3_c.kt + module2/src/b.kt + module3/src/c.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module3/META-INF/module3.kotlin_module - out/production/module3/c/Module3_cKt.class + out/production/module3/c/CKt.class End of files Compiling files: - module3/src/module3_c.kt + module3/src/c.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/b/Module2_bKt.class + out/production/module2/b/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: OK ------------------------------------------