diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log index ded55f46d67..67e562b20bd 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log @@ -1,15 +1,5 @@ ================ Step #1 ================= -Exit code: NOTHING_DONE ------------------------------------------- -Cleaning output files: - out/production/module4/module4/D.class -End of files -Compiling files: - 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 @@ -38,3 +28,13 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Cleaning output files: + out/production/module4/module4/D.class +End of files +Compiling files: + module4/src/d.kt +End of files +Exit code: OK +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log index cb0f7a4ec83..163d054d0b9 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log @@ -1,20 +1,5 @@ ================ Step #1 ================= -Exit code: NOTHING_DONE ------------------------------------------- -Cleaning output files: - out/production/module4/module4/D.class -End of files -Compiling files: - module4/src/d.kt -End of files -Marked as dirty by Kotlin: - 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 @@ -23,6 +8,11 @@ End of files Compiling files: module1/src/a.kt End of files +Marked as dirty by Kotlin: + module1/src/a.kt + module2/src/b.kt + module3/src/c.kt + module4/src/d.kt Exit code: OK ------------------------------------------ Cleaning output files: @@ -43,3 +33,13 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Cleaning output files: + out/production/module4/module4/D.class +End of files +Compiling files: + module4/src/d.kt +End of files +Exit code: OK +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log index f2b67ca3ace..53abd8d0f27 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log @@ -1,15 +1,5 @@ ================ Step #1 ================= -Exit code: NOTHING_DONE ------------------------------------------- -Cleaning output files: - out/production/module4/module4/D.class -End of files -Compiling files: - 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 @@ -27,10 +17,6 @@ Name expected ================ Step #2 ================= -Exit code: NOTHING_DONE ------------------------------------------- -Exit code: NOTHING_DONE ------------------------------------------- Compiling files: module1/src/a.kt module1/src/f.kt @@ -55,3 +41,13 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Cleaning output files: + out/production/module4/module4/D.class +End of files +Compiling files: + module4/src/d.kt +End of files +Exit code: OK +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log index 75af85fd9a8..546018cf81f 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log @@ -19,15 +19,15 @@ Cleaning output files: out/production/module2/foo/B.class out/production/module3/foo/C.class End of files +Compiling files: + module1/src/D.kt +End of files Compiling files: module2/src/B.kt End of files Compiling files: module3/src/C.kt End of files -Compiling files: - module1/src/D.kt -End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED @@ -38,16 +38,16 @@ This type is final, so it cannot be inherited from Cleaning output files: out/production/module1/foo/A.class End of files +Compiling files: + module1/src/A.kt + module1/src/D.kt +End of files Compiling files: module2/src/B.kt End of files Compiling files: module3/src/C.kt End of files -Compiling files: - module1/src/A.kt - module1/src/D.kt -End of files Marked as dirty by Kotlin: module4/src/E.kt module5/src/F.kt diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log index 26e8255c4d6..8492947881b 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log @@ -19,10 +19,10 @@ Cleaning output files: out/production/module2/b/BKt.class End of files Compiling files: - module2/src/b.kt + module1/src/c1.kt End of files Compiling files: - module1/src/c1.kt + module2/src/b.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log index 1e5cd25f8ff..b80a977a499 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log @@ -10,15 +10,6 @@ Compiling files: End of files Exit code: OK ------------------------------------------ -Cleaning output files: - out/production/module3/META-INF/module3.kotlin_module - out/production/module3/c/CKt.class -End of files -Compiling files: - module3/src/c.kt -End of files -Exit code: OK ------------------------------------------- Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/BKt.class @@ -28,3 +19,12 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Cleaning output files: + out/production/module3/META-INF/module3.kotlin_module + out/production/module3/c/CKt.class +End of files +Compiling files: + module3/src/c.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log index 74815f1a93b..3537a221734 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log @@ -15,15 +15,6 @@ Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ -Cleaning output files: - out/production/module3/META-INF/module3.kotlin_module - out/production/module3/c/CKt.class -End of files -Compiling files: - module3/src/c.kt -End of files -Exit code: OK ------------------------------------------- Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/BKt.class @@ -33,3 +24,12 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Cleaning output files: + out/production/module3/META-INF/module3.kotlin_module + out/production/module3/c/CKt.class +End of files +Compiling files: + module3/src/c.kt +End of files +Exit code: OK +------------------------------------------ \ 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 cb63f56fc99..964b7dddef9 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log @@ -19,5 +19,5 @@ Compiling files: End of files COMPILATION FAILED cannot find symbol -symbol : method f(java.lang.String) -location: class test.FunKt + symbol: method f(java.lang.String) + location: class test.FunKt \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log index c1d74686c36..4012e1613ad 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log @@ -17,4 +17,5 @@ Compiling files: src/Sub.java End of files COMPILATION FAILED -y() in Sub cannot override y() in Super; overridden method is final +y() in Sub cannot override y() in Super + overridden method is final \ No newline at end of file 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 938f61c54ac..b4add23f8b0 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log @@ -19,5 +19,5 @@ Compiling files: End of files COMPILATION FAILED cannot find symbol -symbol : method getProp() -location: class test.PropKt + symbol: method getProp() + location: class test.PropKt \ No newline at end of file