diff --git a/js/js.libraries/src/core/collections.kt b/js/js.libraries/src/core/collections.kt index 17e6631628f..f083de320ee 100644 --- a/js/js.libraries/src/core/collections.kt +++ b/js/js.libraries/src/core/collections.kt @@ -16,7 +16,6 @@ package kotlin.collections -import java.util.Comparator import kotlin.comparisons.naturalOrder @library("copyToArray") diff --git a/js/js.libraries/src/core/generated/_ArraysJs.kt b/js/js.libraries/src/core/generated/_ArraysJs.kt index 7cd4f4077fc..fca5e2162bc 100644 --- a/js/js.libraries/src/core/generated/_ArraysJs.kt +++ b/js/js.libraries/src/core/generated/_ArraysJs.kt @@ -9,7 +9,6 @@ package kotlin.collections // import kotlin.comparisons.* -import java.util.* /** * Returns a [List] that wraps the original array. diff --git a/libraries/stdlib/src/generated/_Arrays.kt b/libraries/stdlib/src/generated/_Arrays.kt index f1f498132e2..1e1b75c5903 100644 --- a/libraries/stdlib/src/generated/_Arrays.kt +++ b/libraries/stdlib/src/generated/_Arrays.kt @@ -9,7 +9,6 @@ package kotlin.collections // import kotlin.comparisons.* -import java.util.* /** * Returns 1st *element* from the collection. diff --git a/libraries/stdlib/src/generated/_Collections.kt b/libraries/stdlib/src/generated/_Collections.kt index 25d4cc64675..692554f2fed 100644 --- a/libraries/stdlib/src/generated/_Collections.kt +++ b/libraries/stdlib/src/generated/_Collections.kt @@ -9,7 +9,6 @@ package kotlin.collections // import kotlin.comparisons.* -import java.util.* /** * Returns 1st *element* from the collection. diff --git a/libraries/stdlib/src/generated/_Maps.kt b/libraries/stdlib/src/generated/_Maps.kt index 7192ebccc01..62a462c6c7f 100644 --- a/libraries/stdlib/src/generated/_Maps.kt +++ b/libraries/stdlib/src/generated/_Maps.kt @@ -9,7 +9,6 @@ package kotlin.collections // import kotlin.comparisons.* -import java.util.* /** * Returns a [List] containing all key-value pairs. diff --git a/libraries/stdlib/src/generated/_Ranges.kt b/libraries/stdlib/src/generated/_Ranges.kt index 46edef3b720..9f856f13760 100644 --- a/libraries/stdlib/src/generated/_Ranges.kt +++ b/libraries/stdlib/src/generated/_Ranges.kt @@ -9,7 +9,6 @@ package kotlin.ranges // import kotlin.comparisons.* -import java.util.* /** * Checks if the specified [value] belongs to this range. diff --git a/libraries/stdlib/src/generated/_Sequences.kt b/libraries/stdlib/src/generated/_Sequences.kt index 2e923122f5a..a6148c2e877 100644 --- a/libraries/stdlib/src/generated/_Sequences.kt +++ b/libraries/stdlib/src/generated/_Sequences.kt @@ -9,7 +9,6 @@ package kotlin.sequences // import kotlin.comparisons.* -import java.util.* /** * Returns `true` if [element] is found in the sequence. diff --git a/libraries/stdlib/src/generated/_Sets.kt b/libraries/stdlib/src/generated/_Sets.kt index 6f9f5f076b4..ac4ab1799ad 100644 --- a/libraries/stdlib/src/generated/_Sets.kt +++ b/libraries/stdlib/src/generated/_Sets.kt @@ -9,7 +9,6 @@ package kotlin.collections // import kotlin.comparisons.* -import java.util.* /** * Returns a set containing all elements of the original set except the given [element]. diff --git a/libraries/stdlib/src/generated/_Strings.kt b/libraries/stdlib/src/generated/_Strings.kt index 3abbde33eb6..485f3611e09 100644 --- a/libraries/stdlib/src/generated/_Strings.kt +++ b/libraries/stdlib/src/generated/_Strings.kt @@ -9,7 +9,6 @@ package kotlin.text // import kotlin.comparisons.* -import java.util.* /** * Returns a character at the given [index] or throws an [IndexOutOfBoundsException] if the [index] is out of bounds of this char sequence. diff --git a/libraries/stdlib/src/kotlin/collections/Iterables.kt b/libraries/stdlib/src/kotlin/collections/Iterables.kt index c9abe4a882f..b46421658f3 100644 --- a/libraries/stdlib/src/kotlin/collections/Iterables.kt +++ b/libraries/stdlib/src/kotlin/collections/Iterables.kt @@ -17,8 +17,6 @@ @file:kotlin.jvm.JvmName("CollectionsKt") package kotlin.collections -import java.util.* - /** * Given an [iterator] function constructs an [Iterable] instance that returns values through the [Iterator] * provided by that function. diff --git a/libraries/stdlib/src/kotlin/comparisons/Comparisons.kt b/libraries/stdlib/src/kotlin/comparisons/Comparisons.kt index 6141994958a..c352bd02321 100644 --- a/libraries/stdlib/src/kotlin/comparisons/Comparisons.kt +++ b/libraries/stdlib/src/kotlin/comparisons/Comparisons.kt @@ -17,8 +17,6 @@ package kotlin.comparisons -import java.util.Comparator - /** * Compares two values using the specified functions [selectors] to calculate the result of the comparison. * The functions are called sequentially, receive the given values [a] and [b] and return [Comparable] diff --git a/libraries/stdlib/test/collections/IterableTests.kt b/libraries/stdlib/test/collections/IterableTests.kt index 3fb8f34de62..9ac76ea86bd 100644 --- a/libraries/stdlib/test/collections/IterableTests.kt +++ b/libraries/stdlib/test/collections/IterableTests.kt @@ -17,7 +17,6 @@ package test.collections import org.junit.Test -import java.util.* import kotlin.test.* fun iterableOf(vararg items: T): Iterable = Iterable { items.iterator() } diff --git a/libraries/stdlib/test/js/JsCollectionsTest.kt b/libraries/stdlib/test/js/JsCollectionsTest.kt index 17b8b549250..47202349807 100644 --- a/libraries/stdlib/test/js/JsCollectionsTest.kt +++ b/libraries/stdlib/test/js/JsCollectionsTest.kt @@ -38,7 +38,7 @@ class JsCollectionsTest { } @test fun arrayListCapacity() { - val list = java.util.ArrayList(20) + val list = ArrayList(20) list.ensureCapacity(100) list.trimToSize() assertTrue(list.isEmpty()) diff --git a/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt b/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt index 70d5feb4a65..e23c6e5ff4b 100644 --- a/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt +++ b/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt @@ -81,8 +81,8 @@ private fun List.writeTo(file: File, sourceFile: SourceFile) { writer.append("@file:kotlin.jvm.JvmName(\"${sourceFile.jvmClassName}\")\n\n") writer.append("package ${sourceFile.packageName ?: "kotlin"}\n\n") writer.append("$COMMON_AUTOGENERATED_WARNING\n\n") - writer.append("import kotlin.comparisons.*\n") - writer.append("import java.util.*\n\n") + writer.append("import kotlin.comparisons.*\n\n") + for (f in this) { f.textBuilder(writer) }