From 1e2c4659cdb04358e9110e6eb92d17547984a612 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 28 Oct 2014 22:41:59 +0300 Subject: [PATCH] Committed wrong behavior of Java+Kotlin incremental compilation (Java files recompiled twice). --- .../convertBetweenJavaAndKotlin/javaToKotlin/build.log | 3 +++ .../convertBetweenJavaAndKotlin/kotlinToJava/build.log | 1 + .../withJava/kotlinUsedInJava/changeSignature/build.log | 3 +++ .../withJava/kotlinUsedInJava/constantChanged/build.log | 3 +++ 4 files changed, 10 insertions(+) diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log index 314bb5ebad4..ec95b26dd18 100644 --- a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log +++ b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log @@ -4,6 +4,9 @@ End of files Compiling files: src/TheClass.kt End of files +Compiling files: +src/Usage.java +End of files Cleaning output files: out/production/module/Usage.class out/production/module/_DefaultPackage$usage$*.class diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log index 7d8a70153b1..31cb37fef8a 100644 --- a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log +++ b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log @@ -5,6 +5,7 @@ Compiling files: End of files Compiling files: src/TheClass.java +src/Usage.java End of files Cleaning output files: out/production/module/Usage.class diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log index 0433af7364a..f0e3ef372f9 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log @@ -5,6 +5,9 @@ End of files Compiling files: src/fun.kt End of files +Compiling files: +src/Usage.java +End of files Cleaning output files: out/production/module/Usage.class End of files diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log index 78e27d0e4e4..7cafe0b9fe4 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log @@ -5,6 +5,9 @@ End of files Compiling files: src/const.kt End of files +Compiling files: +src/Usage.java +End of files Cleaning output files: out/production/module/Usage.class out/production/module/test/Klass$object.class