diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log b/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log index f03d1cfe3b9..d83166dbc16 100644 --- a/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log +++ b/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log @@ -7,16 +7,6 @@ Compiling files: module1/src/module1_inline.kt End of files Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/inline/InlinePackage.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/META-INF/module2.kotlin_module out/production/module2/usage/Module2_usageKt.class out/production/module2/usage/UsagePackage.class diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log b/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log index f03d1cfe3b9..e58786bb51a 100644 --- a/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log +++ b/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log @@ -1,26 +1,34 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/inline/InlinePackage.class -out/production/module1/inline/Module1_inlineKt.class +out/production/module1/inline/Module1_inlineFKt.class End of files Compiling files: -module1/src/module1_inline.kt -End of files -Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/inline/InlinePackage.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 +module1/src/module1_inlineF.kt End of files Cleaning output files: out/production/module2/META-INF/module2.kotlin_module -out/production/module2/usage/Module2_usageKt.class +out/production/module2/usage/Module2_usageFKt.class out/production/module2/usage/UsagePackage.class End of files Compiling files: -module2/src/module2_usage.kt +module2/src/module2_usageF.kt +End of files + + +Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module +out/production/module1/inline/InlinePackage.class +out/production/module1/inline/Module1_inlineGKt.class +End of files +Compiling files: +module1/src/module1_inlineG.kt +End of files +Cleaning output files: +out/production/module2/META-INF/module2.kotlin_module +out/production/module2/usage/Module2_usageGKt.class +out/production/module2/usage/UsagePackage.class +End of files +Compiling files: +module2/src/module2_usageG.kt End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log b/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log index 2e4f60176ff..cbcb127580d 100644 --- a/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log +++ b/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log @@ -7,16 +7,6 @@ Compiling files: module1/src/module1_a.kt End of files Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/a/APackage.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 -module1/src/module1_other.kt -End of files -Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/BPackage.class out/production/module2/b/Module2_bKt.class diff --git a/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log index ccd83f9121d..66ea0c9264b 100644 --- a/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log @@ -6,11 +6,9 @@ src/inline.kt End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module -out/production/module/inline/Klass.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 \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log index 119e029fc18..1610391fa42 100644 --- a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log @@ -5,12 +5,4 @@ out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt -End of files -Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/inline/InlineKt.class -out/production/module/inline/InlinePackage.class -End of files -Compiling files: -src/inline.kt End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log b/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log index 8c256b559ec..4fc890074a5 100644 --- a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log @@ -8,11 +8,17 @@ src/a.kt End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module -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 +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/AKt.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/a.kt End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/build.log index ad663d5522d..387aadf985d 100644 --- a/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/build.log @@ -1,14 +1,16 @@ Cleaning output files: -out/production/module/inline/InlinePackage$inline$*.class +out/production/module/META-INF/module.kotlin_module +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/usage/UsagePackage$useG$*.class +out/production/module/META-INF/module.kotlin_module out/production/module/usage/UsagePackage.class +out/production/module/usage/UseGKt.class End of files Compiling files: src/useG.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log index 793ddfbc22e..c881d0f9efe 100644 --- a/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log @@ -1,14 +1,16 @@ Cleaning output files: -out/production/module/inline/InlinePackage$inline$*.class +out/production/module/META-INF/module.kotlin_module +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/usage/UsagePackage$usesG$*.class +out/production/module/META-INF/module.kotlin_module out/production/module/usage/UsagePackage.class +out/production/module/usage/UsesGKt.class End of files Compiling files: src/usesG.kt -End of files +End of files \ No newline at end of file