diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/build.log b/jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/build.log index 4515d41dc9c..20769f534c9 100644 --- a/jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/build.log +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/build.log @@ -1,6 +1,6 @@ Cleaning output files: -out/production/module/test/A.class -out/production/module/test/B.class +out/production/module/test/AKt.class +out/production/module/test/BKt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log index 6a64cdced63..5fe2ba1a018 100644 --- a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log @@ -1,11 +1,11 @@ Cleaning output files: -out/production/module/test/B.class +out/production/module/test/BKt.class out/production/module/test/TestPackage.class End of files Cleaning output files: -out/production/module/other/Other.class +out/production/module/other/OtherKt.class out/production/module/other/OtherPackage.class -out/production/module/test/A.class +out/production/module/test/AKt.class End of files Compiling files: src/a.kt diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/build.log b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/build.log index d171334035e..de5ea860df8 100644 --- a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/build.log +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/build.log @@ -1,14 +1,14 @@ Cleaning output files: out/production/module1/a/A.class out/production/module1/a/APackage.class -out/production/module1/a/Module1_a.class +out/production/module1/a/Module1_aKt.class End of files Compiling files: module1/src/module1_a.kt End of files Cleaning output files: out/production/module2/b/BPackage.class -out/production/module2/b/Module2_b.class +out/production/module2/b/Module2_bKt.class End of files Compiling files: module2/src/module2_b.kt diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log index fdc98eb8730..5ce22b13f31 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module1/test/Module1_a.class +out/production/module1/test/Module1_aKt.class out/production/module1/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log index ffac776c374..7f67ddc3c5c 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log @@ -1,6 +1,6 @@ Cleaning output files: out/production/module2/b/BPackage.class -out/production/module2/b/Module2_b.class +out/production/module2/b/Module2_bKt.class End of files Compiling files: module2/src/module2_b.kt @@ -8,7 +8,7 @@ End of files Cleaning output files: out/production/module1/a/A.class out/production/module1/a/APackage.class -out/production/module1/a/Module1_a.class +out/production/module1/a/Module1_aKt.class End of files Compiling files: module1/src/module1_a.kt diff --git a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log index 12e559d1298..6d8cb0dfa1b 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module1/test/Module1_const.class +out/production/module1/test/Module1_constKt.class out/production/module1/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/build.log index 3e4fd010efb..a1763492476 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/build.log @@ -1,21 +1,21 @@ Cleaning output files: out/production/module1/inline/InlinePackage.class -out/production/module1/inline/Module1_inline.class +out/production/module1/inline/Module1_inlineKt.class End of files Compiling files: module1/src/module1_inline.kt End of files Cleaning output files: out/production/module1/inline/InlinePackage.class -out/production/module1/inline/Module1_inline.class -out/production/module1/inline/Module1_other.class +out/production/module1/inline/Module1_inlineKt.class +out/production/module1/inline/Module1_otherKt.class End of files Compiling files: module1/src/module1_inline.kt module1/src/module1_other.kt End of files Cleaning output files: -out/production/module2/usage/Module2_usage.class +out/production/module2/usage/Module2_usageKt.class out/production/module2/usage/UsagePackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log index 3e4fd010efb..a1763492476 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log @@ -1,21 +1,21 @@ Cleaning output files: out/production/module1/inline/InlinePackage.class -out/production/module1/inline/Module1_inline.class +out/production/module1/inline/Module1_inlineKt.class End of files Compiling files: module1/src/module1_inline.kt End of files Cleaning output files: out/production/module1/inline/InlinePackage.class -out/production/module1/inline/Module1_inline.class -out/production/module1/inline/Module1_other.class +out/production/module1/inline/Module1_inlineKt.class +out/production/module1/inline/Module1_otherKt.class End of files Compiling files: module1/src/module1_inline.kt module1/src/module1_other.kt End of files Cleaning output files: -out/production/module2/usage/Module2_usage.class +out/production/module2/usage/Module2_usageKt.class out/production/module2/usage/UsagePackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log index d171334035e..de5ea860df8 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log @@ -1,14 +1,14 @@ Cleaning output files: out/production/module1/a/A.class out/production/module1/a/APackage.class -out/production/module1/a/Module1_a.class +out/production/module1/a/Module1_aKt.class End of files Compiling files: module1/src/module1_a.kt End of files Cleaning output files: out/production/module2/b/BPackage.class -out/production/module2/b/Module2_b.class +out/production/module2/b/Module2_bKt.class End of files Compiling files: module2/src/module2_b.kt diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log index dab8c472205..c1d19b434c2 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log @@ -1,7 +1,7 @@ Cleaning output files: out/production/module1/a/A.class out/production/module1/a/APackage.class -out/production/module1/a/Module1_a.class +out/production/module1/a/Module1_aKt.class End of files Compiling files: module1/src/module1_a.kt diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log index d171334035e..de5ea860df8 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log @@ -1,14 +1,14 @@ Cleaning output files: out/production/module1/a/A.class out/production/module1/a/APackage.class -out/production/module1/a/Module1_a.class +out/production/module1/a/Module1_aKt.class End of files Compiling files: module1/src/module1_a.kt End of files Cleaning output files: out/production/module2/b/BPackage.class -out/production/module2/b/Module2_b.class +out/production/module2/b/Module2_bKt.class End of files Compiling files: module2/src/module2_b.kt diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log index 6733bf955d1..0b175864d07 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log @@ -1,14 +1,14 @@ Cleaning output files: out/production/module1/a/APackage.class -out/production/module1/a/Module1_a.class +out/production/module1/a/Module1_aKt.class End of files Compiling files: module1/src/module1_a.kt End of files Cleaning output files: out/production/module1/a/APackage.class -out/production/module1/a/Module1_a.class -out/production/module1/a/Module1_other.class +out/production/module1/a/Module1_aKt.class +out/production/module1/a/Module1_otherKt.class End of files Compiling files: module1/src/module1_a.kt @@ -16,14 +16,14 @@ module1/src/module1_other.kt End of files Cleaning output files: out/production/module2/b/BPackage.class -out/production/module2/b/Module2_b.class +out/production/module2/b/Module2_bKt.class End of files Compiling files: module2/src/module2_b.kt End of files Cleaning output files: out/production/module3/c/CPackage.class -out/production/module3/c/Module3_c.class +out/production/module3/c/Module3_cKt.class End of files Compiling files: module3/src/module3_c.kt diff --git a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log index c5045143b2a..a3ec0221636 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log @@ -1,21 +1,21 @@ Cleaning output files: out/production/module1/a/A.class out/production/module1/a/APackage.class -out/production/module1/a/Module1_a.class +out/production/module1/a/Module1_aKt.class End of files Compiling files: module1/src/module1_a.kt End of files Cleaning output files: out/production/module3/c/CPackage.class -out/production/module3/c/Module3_c.class +out/production/module3/c/Module3_cKt.class End of files Compiling files: module3/src/module3_c.kt End of files Cleaning output files: out/production/module2/b/BPackage.class -out/production/module2/b/Module2_b.class +out/production/module2/b/Module2_bKt.class End of files Compiling files: module2/src/module2_b.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log index 4b8f2ce15de..6780d784887 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/Bar.class +out/production/module/test/BarKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/bar.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log index 3231a7e0e4f..297cb32de76 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log @@ -1,9 +1,9 @@ Cleaning output files: -out/production/module/test/B.class +out/production/module/test/BKt.class out/production/module/test/TestPackage.class -out/production/module/test/Usage.class +out/production/module/test/UsageKt.class End of files Compiling files: src/b.kt src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log index 3231a7e0e4f..297cb32de76 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log @@ -1,9 +1,9 @@ Cleaning output files: -out/production/module/test/B.class +out/production/module/test/BKt.class out/production/module/test/TestPackage.class -out/production/module/test/Usage.class +out/production/module/test/UsageKt.class End of files Compiling files: src/b.kt src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log index 8b44b97716e..e43e3fd039d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Const.class +out/production/module/test/ConstKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -8,7 +8,7 @@ End of files Cleaning output files: -out/production/module/test/Const.class +out/production/module/test/ConstKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -19,4 +19,4 @@ out/production/module/test/Usage.class End of files Compiling files: src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log index 7d0f02c00a4..0a7519d35c5 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/Other.class +out/production/module/test/OtherKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/other.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log index 0f0bb774f44..4e900cca87d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log @@ -1,6 +1,6 @@ Cleaning output files: -out/production/module/a/A$foo$1.class -out/production/module/a/A.class +out/production/module/a/AKt$foo$1.class +out/production/module/a/AKt.class out/production/module/a/APackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log index 5ea037dc95a..907d0503304 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log @@ -6,10 +6,10 @@ src/inline.kt End of files Cleaning output files: out/production/module/inline/Klass.class -out/production/module/usage/Usage.class +out/production/module/usage/UsageKt.class out/production/module/usage/UsagePackage.class End of files Compiling files: src/inline.kt src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log index b3ac0aae802..4272704a502 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log @@ -4,7 +4,7 @@ End of files Compiling files: End of files Cleaning output files: -out/production/module/test/Other.class +out/production/module/test/OtherKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -16,7 +16,7 @@ Compiling files: src/A.kt End of files Cleaning output files: -out/production/module/test/Other.class +out/production/module/test/OtherKt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log index 4ab778caaff..d41dbd731a4 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log @@ -6,8 +6,8 @@ src/class.kt End of files Cleaning output files: out/production/module/test/TestPackage.class -out/production/module/test/Usage.class +out/production/module/test/UsageKt.class End of files Compiling files: src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log index bd1fda0f4ea..2a1d15653e6 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/usage/Usage.class +out/production/module/usage/UsageKt.class out/production/module/usage/UsagePackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log index 24a112c76b4..7ce32de16cc 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/Usage.class +out/production/module/UsageKt.class out/production/module/_DefaultPackage.class End of files Compiling files: @@ -10,7 +10,7 @@ Expecting an expression Cleaning output files: -out/production/module/Fun.class +out/production/module/FunKt.class End of files Compiling files: src/fun.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log index b328af8e3a5..56385078f3a 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log @@ -1,9 +1,9 @@ Cleaning output files: -out/production/module/Other.class +out/production/module/OtherKt.class out/production/module/_DefaultPackage.class End of files Cleaning output files: -out/production/module/Usage.class +out/production/module/UsageKt.class End of files Compiling files: src/usage.kt @@ -13,7 +13,7 @@ Expecting an expression Cleaning output files: -out/production/module/Fun.class +out/production/module/FunKt.class End of files Compiling files: src/fun.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log index ed7c4295733..30584bfe5d7 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log @@ -1,6 +1,6 @@ Cleaning output files: -out/production/module/Other.class -out/production/module/Usage.class +out/production/module/OtherKt.class +out/production/module/UsageKt.class out/production/module/_DefaultPackage.class End of files Compiling files: @@ -12,7 +12,7 @@ Expecting an expression Cleaning output files: -out/production/module/Fun.class +out/production/module/FunKt.class End of files Compiling files: src/fun.kt @@ -20,11 +20,11 @@ src/other.kt src/usage.kt End of files Cleaning output files: -out/production/module/Fun.class -out/production/module/Usage.class +out/production/module/FunKt.class +out/production/module/UsageKt.class out/production/module/_DefaultPackage.class out/production/module/new/NewPackage.class -out/production/module/new/Other.class +out/production/module/new/OtherKt.class End of files Compiling files: src/fun.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log index 35b980c31f6..11dbb8afd85 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log @@ -1,6 +1,6 @@ Cleaning output files: out/production/module/B.class -out/production/module/Usage.class +out/production/module/UsageKt.class out/production/module/_DefaultPackage.class End of files Compiling files: @@ -17,13 +17,13 @@ src/usage.kt End of files Cleaning output files: out/production/module/A.class -out/production/module/Usage.class +out/production/module/UsageKt.class out/production/module/_DefaultPackage.class -out/production/module/new/LikePart.class +out/production/module/new/LikePartKt.class out/production/module/new/NewPackage.class End of files Compiling files: src/fun.kt src/likePart.kt src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log index 5613d7fe110..dbf64919d99 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Fun2.class +out/production/module/test/Fun2Kt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log index 659c2dbb504..b794167acd1 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/Const.class +out/production/module/test/ConstKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/const.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log index 225764441db..ac0a61f4a9c 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log @@ -1,9 +1,9 @@ Cleaning output files: -out/production/module/test/Const.class +out/production/module/test/ConstKt.class out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class out/production/module/test/TestPackage.class End of files Compiling files: src/const.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log index 9104d731416..76c39d54d0e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/A.class +out/production/module/AKt.class out/production/module/_DefaultPackage.class End of files Compiling files: src/a.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log index 0ad6529ee73..06ca3a83e53 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log index d65d2dd1b90..dc047fca05f 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log @@ -1,11 +1,11 @@ Cleaning output files: -out/production/module/test/Const.class +out/production/module/test/ConstKt.class out/production/module/test/TestPackage.class End of files Compiling files: End of files Cleaning output files: -out/production/module/usage/Usage.class +out/production/module/usage/UsageKt.class out/production/module/usage/UsagePackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log index d2714d00b68..42768060bc9 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log @@ -1,11 +1,11 @@ Cleaning output files: -out/production/module/inline/Inline.class +out/production/module/inline/InlineKt.class out/production/module/inline/InlinePackage.class End of files Compiling files: End of files Cleaning output files: -out/production/module/usage/Usage.class +out/production/module/usage/UsageKt.class out/production/module/usage/UsagePackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log index a61ed9b58f5..fc4e42b6812 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log @@ -1,7 +1,7 @@ Cleaning output files: out/production/module/bar/BarPackage.class -out/production/module/bar/C.class -out/production/module/foo/B.class +out/production/module/bar/CKt.class +out/production/module/foo/BKt.class out/production/module/foo/FooPackage.class End of files Compiling files: @@ -9,10 +9,10 @@ src/b.kt src/c.kt End of files Cleaning output files: -out/production/module/bar/B.class +out/production/module/bar/BKt.class out/production/module/bar/BarPackage.class -out/production/module/foo/A.class -out/production/module/foo/C.class +out/production/module/foo/AKt.class +out/production/module/foo/CKt.class out/production/module/foo/FooPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log index 397ce32b0a9..3f3c94dbdc7 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Fun2.class +out/production/module/test/Fun2Kt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log index 39f5f52c58e..bf3a483e16d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log @@ -1,12 +1,12 @@ Cleaning output files: -out/production/module/inline/Inline.class +out/production/module/inline/InlineKt.class out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt End of files Cleaning output files: -out/production/module/inline/Inline.class +out/production/module/inline/InlineKt.class out/production/module/inline/InlinePackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log index 8c8a8c204d6..e3b5d564721 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log @@ -1,16 +1,16 @@ Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt End of files Cleaning output files: -out/production/module/test/A.class -out/production/module/test/B.class +out/production/module/test/AKt.class +out/production/module/test/BKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt src/b.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log index 496646cc7ba..2181542318d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log @@ -1,8 +1,8 @@ Cleaning output files: -out/production/module/inline/Inline.class +out/production/module/inline/InlineKt.class out/production/module/inline/InlinePackage.class out/production/module/inline/Klass.class End of files Compiling files: src/inline.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log index 9b19bca18bb..1cf27b4c6cb 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log @@ -1,6 +1,6 @@ Cleaning output files: -out/production/module/test/A$foo$X.class -out/production/module/test/A.class +out/production/module/test/AKt$foo$X.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log index 10ae55fd3fc..ebde80e9f8e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log @@ -1,14 +1,14 @@ Cleaning output files: -out/production/module/b/B2.class +out/production/module/b/B2Kt.class out/production/module/b/BPackage.class End of files Compiling files: src/a2.kt End of files Cleaning output files: -out/production/module/a/A1.class +out/production/module/a/A1Kt.class out/production/module/a/APackage.class -out/production/module/b/B1.class +out/production/module/b/B1Kt.class out/production/module/b/BPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log index 7d0f02c00a4..0a7519d35c5 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/Other.class +out/production/module/test/OtherKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/other.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log index b66392a883c..8a474953e3a 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -9,10 +9,10 @@ End of files Cleaning output files: out/production/module/klass/Klass.class -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/Klass.kt src/a.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log index e43a40c534a..0ecd5a944e3 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Const.class +out/production/module/test/ConstKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -10,4 +10,4 @@ out/production/module/test/Usage.class End of files Compiling files: src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log index 1cae0774d42..0cc5e507ad6 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log @@ -2,7 +2,7 @@ Compiling files: src/b.kt End of files Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log index 1d91a602d06..2f4733727ff 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log @@ -1,17 +1,17 @@ Cleaning output files: -out/production/module/test/B.class +out/production/module/test/BKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/b.kt End of files Cleaning output files: -out/production/module/newName/B.class +out/production/module/newName/BKt.class out/production/module/newName/NewNamePackage.class -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt src/b.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log index 7b94d3dff7d..61712f9bd6d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -8,15 +8,15 @@ End of files Cleaning output files: -out/production/module/test/B.class +out/production/module/test/BKt.class out/production/module/test/TestPackage.class End of files Compiling files: End of files Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log index 106bcb3840d..28ab0a7b660 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log @@ -1,13 +1,13 @@ Cleaning output files: -out/production/module/test/B.class +out/production/module/test/BKt.class out/production/module/test/TestPackage.class End of files Compiling files: End of files Cleaning output files: -out/production/module/other/Other.class +out/production/module/other/OtherKt.class out/production/module/other/OtherPackage.class -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -17,9 +17,9 @@ End of files Cleaning output files: -out/production/module/other/Other.class +out/production/module/other/OtherKt.class out/production/module/other/OtherPackage.class End of files Compiling files: src/other.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log index 3cb42f701db..d857bf6ace4 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -8,7 +8,7 @@ End of files Cleaning output files: -out/production/module/test/B.class +out/production/module/test/BKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -17,7 +17,7 @@ End of files Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log index 4c1244a1678..b680e49a2b5 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log @@ -1,7 +1,7 @@ Cleaning output files: out/production/module/test/TestPackage.class -out/production/module/test/Usage.class +out/production/module/test/UsageKt.class End of files Compiling files: src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log index d12f6912c76..6df4bbf3181 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log @@ -1,17 +1,17 @@ Cleaning output files: -out/production/module/inline/Inline.class +out/production/module/inline/InlineKt.class out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt End of files Cleaning output files: -out/production/module/inline/Inline.class +out/production/module/inline/InlineKt.class out/production/module/inline/InlinePackage.class -out/production/module/usage/Usage.class +out/production/module/usage/UsageKt.class out/production/module/usage/UsagePackage.class End of files Compiling files: src/inline.kt src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log index 4c1244a1678..b680e49a2b5 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log @@ -1,7 +1,7 @@ Cleaning output files: out/production/module/test/TestPackage.class -out/production/module/test/Usage.class +out/production/module/test/UsageKt.class End of files Compiling files: src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log index e265035bf65..8239640a50e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -8,4 +8,4 @@ End of files Compiling files: src/b.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log index 0b5d2a4a551..eeeef4416c8 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log @@ -1,12 +1,12 @@ Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt End of files Cleaning output files: -out/production/module/test2/A.class +out/production/module/test2/AKt.class out/production/module/test2/Test2Package.class End of files Compiling files: @@ -18,9 +18,9 @@ Compiling files: src/b.kt End of files Cleaning output files: -out/production/module/test2/A.class +out/production/module/test2/AKt.class out/production/module/test2/Test2Package.class End of files Compiling files: src/a.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log index 14a46382a5e..80486282e0a 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log @@ -1,9 +1,9 @@ Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Cleaning output files: -out/production/module/test/B.class +out/production/module/test/BKt.class End of files Compiling files: -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log index e96c01ed671..e8a35afbc11 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Prop2.class +out/production/module/test/Prop2Kt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log index 55a4a60b263..e64dd3eaa61 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Fun.class +out/production/module/test/FunKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -7,8 +7,8 @@ src/fun.kt End of files Cleaning output files: out/production/module/test/TestPackage.class -out/production/module/test/Usage.class +out/production/module/test/UsageKt.class End of files Compiling files: src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log index 4148bf5ec4f..40b306dd41e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log @@ -1,12 +1,12 @@ Cleaning output files: -out/production/module/foo/A.class +out/production/module/foo/AKt.class out/production/module/foo/FooPackage.class End of files Compiling files: src/a.kt End of files Cleaning output files: -out/production/module/bar/A.class +out/production/module/bar/AKt.class out/production/module/bar/BarPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log index cd0fd87d4e0..e8060b3d718 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log @@ -1,8 +1,8 @@ Cleaning output files: -out/production/module/outer/nested/Nested$main$1.class -out/production/module/outer/nested/Nested.class +out/production/module/outer/nested/NestedKt$main$1.class +out/production/module/outer/nested/NestedKt.class out/production/module/outer/nested/NestedPackage.class End of files Compiling files: src/nested.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log index bee7dcaa35e..a72de562da8 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/Fun.class +out/production/module/test/FunKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/fun.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log index 0ad6529ee73..06ca3a83e53 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log index 8fdaf9f5191..fa9d750b5e4 100644 --- a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log @@ -6,7 +6,7 @@ src/TheClass.kt End of files Cleaning output files: out/production/module/Usage.class -out/production/module/UsageInKotlin.class +out/production/module/UsageInKotlinKt.class out/production/module/_DefaultPackage.class End of files Compiling files: @@ -14,4 +14,4 @@ src/usageInKotlin.kt End of files Compiling files: src/Usage.java -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log index f0ef53e7b51..1a055b6661b 100644 --- a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log @@ -2,7 +2,7 @@ Cleaning output files: out/production/module/Foo.class End of files Cleaning output files: -out/production/module/Usage.class +out/production/module/UsageKt.class out/production/module/_DefaultPackage.class End of files Compiling files: @@ -10,7 +10,7 @@ src/Foo.kt src/usage.kt End of files Cleaning output files: -out/production/module/Usage.class +out/production/module/UsageKt.class out/production/module/_DefaultPackage.class End of files Compiling files: @@ -22,7 +22,7 @@ Cleaning output files: out/production/module/Foo.class End of files Cleaning output files: -out/production/module/Usage.class +out/production/module/UsageKt.class out/production/module/_DefaultPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log index 83446a96350..c3734eac50b 100644 --- a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log @@ -8,7 +8,7 @@ src/TheClass.java End of files Cleaning output files: out/production/module/Usage.class -out/production/module/UsageInKotlin.class +out/production/module/UsageInKotlinKt.class out/production/module/_DefaultPackage.class End of files Compiling files: @@ -16,4 +16,4 @@ src/usageInKotlin.kt End of files Compiling files: src/Usage.java -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log index 088504b2487..a6aeb64d131 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log @@ -5,9 +5,9 @@ Compiling files: src/JavaClass.java End of files Cleaning output files: -out/production/module/Usage.class +out/production/module/UsageKt.class out/production/module/_DefaultPackage.class End of files Compiling files: src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log index dcda0f53cf0..2e16f49a6e4 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log @@ -1,6 +1,6 @@ Cleaning output files: out/production/module/JavaClass.class -out/production/module/Usage.class +out/production/module/UsageKt.class out/production/module/_DefaultPackage.class End of files Compiling files: @@ -8,4 +8,4 @@ src/usage.kt End of files Compiling files: src/JavaClass.java -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log index 00ecbd8664a..2f97d604bab 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log @@ -5,9 +5,9 @@ Compiling files: src/JavaClass.java End of files Cleaning output files: -out/production/module/WillBeResolvedToOther$willBeResolvedToOther$1.class -out/production/module/WillBeResolvedToOther.class -out/production/module/WillBeUnresolved.class +out/production/module/WillBeResolvedToOtherKt$willBeResolvedToOther$1.class +out/production/module/WillBeResolvedToOtherKt.class +out/production/module/WillBeUnresolvedKt.class out/production/module/_DefaultPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log index a0a8e61a9e3..d272966842a 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log @@ -5,10 +5,10 @@ Compiling files: src/SamInterface.java End of files Cleaning output files: -out/production/module/UsageWithFunctionExpression$usageWithFunctionExpression$a$1.class -out/production/module/UsageWithFunctionExpression.class -out/production/module/UsageWithFunctionLiteral$usageWithFunctionLiteral$1.class -out/production/module/UsageWithFunctionLiteral.class +out/production/module/UsageWithFunctionExpressionKt$usageWithFunctionExpression$a$1.class +out/production/module/UsageWithFunctionExpressionKt.class +out/production/module/UsageWithFunctionLiteralKt$usageWithFunctionLiteral$1.class +out/production/module/UsageWithFunctionLiteralKt.class out/production/module/_DefaultPackage$sam$SamInterface$*.class out/production/module/_DefaultPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log index 93ab0f079cd..671ce9953c7 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log @@ -5,14 +5,14 @@ Compiling files: src/SamInterface.java End of files Cleaning output files: -out/production/module/UsageWithFunctionExpression$usageWithFunctionExpression$a$1.class -out/production/module/UsageWithFunctionExpression.class -out/production/module/UsageWithFunctionLiteral$usageWithFunctionLiteral$1.class -out/production/module/UsageWithFunctionLiteral.class +out/production/module/UsageWithFunctionExpressionKt$usageWithFunctionExpression$a$1.class +out/production/module/UsageWithFunctionExpressionKt.class +out/production/module/UsageWithFunctionLiteralKt$usageWithFunctionLiteral$1.class +out/production/module/UsageWithFunctionLiteralKt.class out/production/module/_DefaultPackage$sam$SamInterface$*.class out/production/module/_DefaultPackage.class End of files Compiling files: src/usageWithFunctionExpression.kt src/usageWithFunctionLiteral.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log index f3d10e07203..41ca845b2db 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Fun.class +out/production/module/test/FunKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -7,7 +7,7 @@ src/fun.kt End of files Cleaning output files: out/production/module/JavaUsage.class -out/production/module/test/Other.class +out/production/module/test/OtherKt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log index bee7dcaa35e..a72de562da8 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/Fun.class +out/production/module/test/FunKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/fun.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log index 1870e29e800..174d9b3de64 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Fun.class +out/production/module/test/FunKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -10,4 +10,4 @@ out/production/module/Usage.class End of files Compiling files: src/Usage.java -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log index 916d6b88043..ad53551c271 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Fun.class +out/production/module/test/FunKt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log index bee7dcaa35e..a72de562da8 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/Fun.class +out/production/module/test/FunKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/fun.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log index 94afef94da4..9ccd8296e83 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/B.class +out/production/module/test/BKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -7,7 +7,7 @@ src/b.kt End of files Cleaning output files: out/production/module/Usage.class -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log index 2b2f8cd5369..21340e6e03a 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log @@ -9,7 +9,7 @@ src/Usage.java End of files Cleaning output files: out/production/module/Usage.class -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log index 8e7f8310761..66c2da28efa 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Prop.class +out/production/module/test/PropKt.class out/production/module/test/TestPackage.class End of files Compiling files: