diff --git a/compiler/testData/builtin-classes/java8/kotlin-collections.txt b/compiler/testData/builtin-classes/java8/kotlin-collections.txt index a208f05c3c3..88225a553d4 100644 --- a/compiler/testData/builtin-classes/java8/kotlin-collections.txt +++ b/compiler/testData/builtin-classes/java8/kotlin-collections.txt @@ -87,7 +87,6 @@ public interface List : kotlin.collections.Collection { public abstract fun listIterator(): kotlin.collections.ListIterator public abstract fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.ListIterator public open override /*1*/ /*fake_override*/ fun parallelStream(): java.util.stream.Stream! - public open /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun sort(/*0*/ p0: java.util.Comparator!): kotlin.Unit public open override /*1*/ fun spliterator(): java.util.Spliterator! public open override /*1*/ /*fake_override*/ fun stream(): java.util.stream.Stream! public abstract fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.List @@ -194,7 +193,7 @@ public interface MutableList : kotlin.collections.List, kotlin.colle public open fun replaceAll(/*0*/ p0: java.util.function.UnaryOperator!): kotlin.Unit public abstract override /*1*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean public abstract operator fun set(/*0*/ index: kotlin.Int, /*1*/ element: E): E - public open override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun sort(/*0*/ p0: java.util.Comparator!): kotlin.Unit + public open /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun sort(/*0*/ p0: java.util.Comparator!): kotlin.Unit public open override /*2*/ /*fake_override*/ fun spliterator(): java.util.Spliterator! public open override /*2*/ /*fake_override*/ fun stream(): java.util.stream.Stream! public abstract override /*1*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmBuiltInsSettings.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmBuiltInsSettings.kt index 0d470ff1680..95ff622ecbc 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmBuiltInsSettings.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmBuiltInsSettings.kt @@ -386,7 +386,7 @@ open class JvmBuiltInsSettings( signatures { inJavaUtil("Collection", "removeIf(Ljava/util/function/Predicate;)Z") + - inJavaUtil("List", "replaceAll(Ljava/util/function/UnaryOperator;)V") + + inJavaUtil("List", "replaceAll(Ljava/util/function/UnaryOperator;)V", "sort(Ljava/util/Comparator;)V") + inJavaUtil("Map", "computeIfAbsent(Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object;",