From 084def4ffca5014a3803be256989d7a0d22cb96c Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 7 Dec 2017 03:12:32 +0300 Subject: [PATCH] Recompile all subclasses of removed classes Original commit: a31f503fa5106bdf4be86572302032becb409afc --- .../classRemoved/gradle-build.log | 33 +++++++++++++++++ .../classRemovedAndRestored/gradle-build.log | 36 +++++++++++++++++++ .../multiModule/classRemoved/build.log | 14 ++++++++ 3 files changed, 83 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/gradle-build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/gradle-build.log diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/gradle-build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/gradle-build.log new file mode 100644 index 00000000000..c6ed1e50299 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/gradle-build.log @@ -0,0 +1,33 @@ +================ Step #1 ================= + +Compiling files: + src/B.kt + src/C.kt + src/createA.kt + src/createB.kt + src/createC.kt + src/useAfoo.kt + src/useBbar.kt + src/useCbaz.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Unresolved reference: A +Unresolved reference: A + +================ Step #2 ================= + +Compiling files: + src/B.kt + src/C.kt + src/createA.kt + src/createB.kt + src/createC.kt + src/funA.kt + src/useAfoo.kt + src/useBbar.kt + src/useCbaz.kt +End of files +Exit code: OK + diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/gradle-build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/gradle-build.log new file mode 100644 index 00000000000..d84bd394fbd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/gradle-build.log @@ -0,0 +1,36 @@ +================ Step #1 ================= + +Compiling files: + src/B.kt + src/createA.kt + src/createB.kt + src/useAfoo.kt + src/useBbar.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Unresolved reference: A +Unresolved reference: A + +================ Step #2 ================= + +Compiling files: + src/A.kt + src/B.kt + src/createA.kt + src/createB.kt + src/useAfoo.kt + src/useBbar.kt +End of files +Exit code: OK + +================ Step #3 ================= + +Compiling files: + src/failCompilation.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Expecting a top level declaration diff --git a/jps/jps-plugin/testData/incremental/multiModule/classRemoved/build.log b/jps/jps-plugin/testData/incremental/multiModule/classRemoved/build.log index 4a1d1fc30bd..9b620ddd4fc 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/classRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/classRemoved/build.log @@ -34,6 +34,20 @@ Compiling files: module2/src/createA.kt module2/src/useAfoo.kt End of files +Marked as dirty by Kotlin: + module2/src/createB.kt + module2/src/useBbar.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/use/CreateBKt.class + out/production/module2/use/UseBbarKt.class +End of files +Compiling files: + module2/src/createB.kt + module2/src/useBbar.kt +End of files Exit code: OK ------------------------------------------