From 00020f6d742c13d4f9862c2455c9defa0fdc79d2 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Sat, 28 Nov 2015 01:42:20 +0300 Subject: [PATCH] Fix testData in compiler: add collections and ranges package to fq-names. Original commit: f4822cd75747f659356a8d3cd9a8b1c2ba835b15 --- .../pureKotlin/conflictingPlatformDeclarations/build.log | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log index a52dc89f8cb..33f02d294ad 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log @@ -8,8 +8,8 @@ src/fun2.kt End of files COMPILATION FAILED Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V): - fun function(list: kotlin.List): kotlin.Unit - fun function(list: kotlin.List): kotlin.Unit + fun function(list: kotlin.collections.List): kotlin.Unit + fun function(list: kotlin.collections.List): kotlin.Unit Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V): - fun function(list: kotlin.List): kotlin.Unit - fun function(list: kotlin.List): kotlin.Unit \ No newline at end of file + fun function(list: kotlin.collections.List): kotlin.Unit + fun function(list: kotlin.collections.List): kotlin.Unit \ No newline at end of file