From 1bd1fbeee4a4010a264b5ae8c9604a6923af8621 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Mon, 19 Oct 2015 15:20:23 +0300 Subject: [PATCH] Drop package facades: - update tests - cleanup JetTyMapper after rebase Original commit: dda508234fa8a6e4b7afb21f6d9888ebc9285538 --- .../multiModule/constantValueChanged/build.log | 3 +-- .../incremental/pureKotlin/allConstants/build.log | 3 +-- .../pureKotlin/packageConstantChanged/build.log | 3 +-- .../pureKotlin/propertyRedeclaration/build.log | 11 ++++------- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log index fd4b25b3281..144dd0bb291 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log @@ -8,7 +8,6 @@ End of files Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/test/Module1_constKt.class -out/production/module1/test/TestPackage.class End of files Compiling files: module1/src/module1_const.kt @@ -18,4 +17,4 @@ out/production/module2/usage/Usage.class End of files Compiling files: module2/src/module2_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 d06d82dfad0..46b44cd6dd2 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log @@ -17,10 +17,9 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/ConstKt.class -out/production/module/test/TestPackage.class out/production/module/test/Usage.class End of files Compiling files: src/const.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/packageConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log index e2f10970eb7..52d2dfe569e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log @@ -8,10 +8,9 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/ConstKt.class -out/production/module/test/TestPackage.class out/production/module/test/Usage.class End of files Compiling files: src/const.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/propertyRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log index 6314d92d2ad..03c96004241 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log @@ -5,10 +5,7 @@ End of files Compiling files: src/prop2.kt End of files -Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/Prop1Kt.class -End of files -Compiling files: -src/prop1.kt -End of files \ No newline at end of file +COMPILATION FAILED +Platform declaration clash: The following declarations have the same JVM signature (getProperty()I): + fun (): kotlin.Int + fun (): kotlin.Int \ No newline at end of file