From 80772892423c5bdbb2381653fe74313df32113fd Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Fri, 26 May 2017 10:26:30 +0300 Subject: [PATCH] Update testData after changes in diagnostics Original commit: c83b764c7394efa3364915d973ae79c4ebed2437 --- .../pureKotlin/conflictingPlatformDeclarations/build.log | 4 ++-- .../incremental/pureKotlin/funRedeclaration/build.log | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log index 47083313579..75079fd9213 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log @@ -13,7 +13,7 @@ Exit code: ABORT COMPILATION FAILED Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V): fun function(list: List): Unit defined in test - fun function(list: List): Unit defined in test + fun function(list: List): Unit defined in test in file fun2.kt Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V): fun function(list: List): Unit defined in test - fun function(list: List): Unit defined in test \ No newline at end of file + fun function(list: List): Unit defined in test in file fun2.kt \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log index f79a79a7337..f22853c57fb 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log @@ -10,4 +10,4 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Conflicting overloads: public fun function(): Unit defined in test, public fun function(): Unit defined in test \ No newline at end of file +Conflicting overloads: public fun function(): Unit defined in test in file fun2.kt, public fun function(): Unit defined in test \ No newline at end of file