diff --git a/js/js.libraries/src/dom/Dom.kt b/js/js.libraries/src/dom/Dom.kt index 1684006b228..5a79f612431 100644 --- a/js/js.libraries/src/dom/Dom.kt +++ b/js/js.libraries/src/dom/Dom.kt @@ -19,7 +19,7 @@ package kotlin.dom import org.w3c.dom.* import java.util.* import kotlin.dom.* -import kotlin.support.* +import kotlin.collections.* // Properties diff --git a/libraries/stdlib/src/kotlin/collections/AbstractIterator.kt b/libraries/stdlib/src/kotlin/collections/AbstractIterator.kt index 85bba16a894..8ff42375355 100644 --- a/libraries/stdlib/src/kotlin/collections/AbstractIterator.kt +++ b/libraries/stdlib/src/kotlin/collections/AbstractIterator.kt @@ -1,4 +1,4 @@ -package kotlin.support +package kotlin.collections import java.util.NoSuchElementException diff --git a/libraries/stdlib/src/kotlin/collections/Arrays.kt b/libraries/stdlib/src/kotlin/collections/Arrays.kt index e2bd6913b5a..bab3b2e3adc 100644 --- a/libraries/stdlib/src/kotlin/collections/Arrays.kt +++ b/libraries/stdlib/src/kotlin/collections/Arrays.kt @@ -2,7 +2,7 @@ @file:kotlin.jvm.JvmName("ArraysKt") -package kotlin +package kotlin.collections import java.util.* diff --git a/libraries/stdlib/src/kotlin/collections/ArraysJVM.kt b/libraries/stdlib/src/kotlin/collections/ArraysJVM.kt index 4c0e77735ff..c288a9af5d0 100644 --- a/libraries/stdlib/src/kotlin/collections/ArraysJVM.kt +++ b/libraries/stdlib/src/kotlin/collections/ArraysJVM.kt @@ -1,7 +1,7 @@ @file:kotlin.jvm.JvmMultifileClass @file:kotlin.jvm.JvmName("ArraysKt") -package kotlin +package kotlin.collections import java.io.ByteArrayInputStream import java.nio.charset.Charset diff --git a/libraries/stdlib/src/kotlin/ArraysUtilJVM.java b/libraries/stdlib/src/kotlin/collections/ArraysUtilJVM.java similarity index 96% rename from libraries/stdlib/src/kotlin/ArraysUtilJVM.java rename to libraries/stdlib/src/kotlin/collections/ArraysUtilJVM.java index 0ce62ae9871..1b828c63fc1 100644 --- a/libraries/stdlib/src/kotlin/ArraysUtilJVM.java +++ b/libraries/stdlib/src/kotlin/collections/ArraysUtilJVM.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package kotlin; +package kotlin.collections; import java.util.Arrays; import java.util.List; diff --git a/libraries/stdlib/src/kotlin/collections/Iterators.kt b/libraries/stdlib/src/kotlin/collections/Iterators.kt index b8e52134784..3ac8977e839 100644 --- a/libraries/stdlib/src/kotlin/collections/Iterators.kt +++ b/libraries/stdlib/src/kotlin/collections/Iterators.kt @@ -1,7 +1,7 @@ @file:kotlin.jvm.JvmMultifileClass @file:kotlin.jvm.JvmName("CollectionsKt") -package kotlin +package kotlin.collections import java.util.Enumeration diff --git a/libraries/stdlib/src/kotlin/collections/JUtil.kt b/libraries/stdlib/src/kotlin/collections/JUtil.kt index 1819294cb87..ee9c0599026 100644 --- a/libraries/stdlib/src/kotlin/collections/JUtil.kt +++ b/libraries/stdlib/src/kotlin/collections/JUtil.kt @@ -1,7 +1,7 @@ @file:kotlin.jvm.JvmMultifileClass @file:kotlin.jvm.JvmName("CollectionsKt") -package kotlin +package kotlin.collections import java.io.Serializable import java.util.* diff --git a/libraries/stdlib/src/kotlin/collections/MapWithDefault.kt b/libraries/stdlib/src/kotlin/collections/MapWithDefault.kt index 67a2d27ff9d..9eeda8c7a1a 100644 --- a/libraries/stdlib/src/kotlin/collections/MapWithDefault.kt +++ b/libraries/stdlib/src/kotlin/collections/MapWithDefault.kt @@ -1,7 +1,7 @@ @file:kotlin.jvm.JvmMultifileClass @file:kotlin.jvm.JvmName("MapsKt") -package kotlin +package kotlin.collections import java.util.* diff --git a/libraries/stdlib/src/kotlin/collections/Maps.kt b/libraries/stdlib/src/kotlin/collections/Maps.kt index 0f1c5c237a1..b3bf4e8df25 100644 --- a/libraries/stdlib/src/kotlin/collections/Maps.kt +++ b/libraries/stdlib/src/kotlin/collections/Maps.kt @@ -1,7 +1,7 @@ @file:kotlin.jvm.JvmMultifileClass @file:kotlin.jvm.JvmName("MapsKt") -package kotlin +package kotlin.collections import java.io.Serializable import java.util.* diff --git a/libraries/stdlib/src/kotlin/collections/MapsJVM.kt b/libraries/stdlib/src/kotlin/collections/MapsJVM.kt index e2b292c5ebd..a732c63fa2e 100644 --- a/libraries/stdlib/src/kotlin/collections/MapsJVM.kt +++ b/libraries/stdlib/src/kotlin/collections/MapsJVM.kt @@ -1,7 +1,7 @@ @file:kotlin.jvm.JvmMultifileClass @file:kotlin.jvm.JvmName("MapsKt") -package kotlin +package kotlin.collections import java.util.Comparator import java.util.LinkedHashMap diff --git a/libraries/stdlib/src/kotlin/collections/MutableCollections.kt b/libraries/stdlib/src/kotlin/collections/MutableCollections.kt index 395adea3622..8ceb4acc34f 100644 --- a/libraries/stdlib/src/kotlin/collections/MutableCollections.kt +++ b/libraries/stdlib/src/kotlin/collections/MutableCollections.kt @@ -1,7 +1,7 @@ @file:kotlin.jvm.JvmMultifileClass @file:kotlin.jvm.JvmName("CollectionsKt") -package kotlin +package kotlin.collections import java.util.* diff --git a/libraries/stdlib/src/kotlin/collections/ReversedViews.kt b/libraries/stdlib/src/kotlin/collections/ReversedViews.kt index 6c7646ddffb..8a3f6579fc2 100644 --- a/libraries/stdlib/src/kotlin/collections/ReversedViews.kt +++ b/libraries/stdlib/src/kotlin/collections/ReversedViews.kt @@ -16,7 +16,7 @@ @file:kotlin.jvm.JvmMultifileClass @file:kotlin.jvm.JvmName("CollectionsKt") -package kotlin +package kotlin.collections import java.util.AbstractList diff --git a/libraries/stdlib/src/kotlin/collections/Sequences.kt b/libraries/stdlib/src/kotlin/collections/Sequences.kt index 53117020ddd..ed96f193ec8 100644 --- a/libraries/stdlib/src/kotlin/collections/Sequences.kt +++ b/libraries/stdlib/src/kotlin/collections/Sequences.kt @@ -1,10 +1,9 @@ @file:kotlin.jvm.JvmMultifileClass @file:kotlin.jvm.JvmName("SequencesKt") -package kotlin +package kotlin.sequences import java.util.* -import kotlin.support.AbstractIterator diff --git a/libraries/stdlib/src/kotlin/collections/Sets.kt b/libraries/stdlib/src/kotlin/collections/Sets.kt index 89fa1a681cd..b27a0e262fe 100644 --- a/libraries/stdlib/src/kotlin/collections/Sets.kt +++ b/libraries/stdlib/src/kotlin/collections/Sets.kt @@ -1,7 +1,7 @@ @file:kotlin.jvm.JvmMultifileClass @file:kotlin.jvm.JvmName("SetsKt") -package kotlin +package kotlin.collections import java.io.Serializable import java.util.* diff --git a/libraries/stdlib/src/kotlin/text/Char.kt b/libraries/stdlib/src/kotlin/text/Char.kt index 7ca3b9f4362..99ae2cf938c 100644 --- a/libraries/stdlib/src/kotlin/text/Char.kt +++ b/libraries/stdlib/src/kotlin/text/Char.kt @@ -17,7 +17,7 @@ @file:kotlin.jvm.JvmMultifileClass @file:kotlin.jvm.JvmName("CharsKt") -package kotlin +package kotlin.text /** * Concatenates this Char and a String. diff --git a/libraries/stdlib/src/kotlin/text/CharJVM.kt b/libraries/stdlib/src/kotlin/text/CharJVM.kt index 24d2b8e57d7..6e2679a493c 100644 --- a/libraries/stdlib/src/kotlin/text/CharJVM.kt +++ b/libraries/stdlib/src/kotlin/text/CharJVM.kt @@ -17,7 +17,7 @@ @file:kotlin.jvm.JvmName("CharsKt") -package kotlin +package kotlin.text /** * Returns `true` if this character (Unicode code point) is defined in Unicode. diff --git a/libraries/stdlib/src/kotlin/text/Indent.kt b/libraries/stdlib/src/kotlin/text/Indent.kt index ba7626e3550..e70e70b3acc 100644 --- a/libraries/stdlib/src/kotlin/text/Indent.kt +++ b/libraries/stdlib/src/kotlin/text/Indent.kt @@ -1,7 +1,7 @@ @file:kotlin.jvm.JvmMultifileClass @file:kotlin.jvm.JvmName("StringsKt") -package kotlin +package kotlin.text /** * Trims leading whitespace characters followed by [marginPrefix] from every line of a source string and removes diff --git a/libraries/stdlib/src/kotlin/text/StringBuilder.kt b/libraries/stdlib/src/kotlin/text/StringBuilder.kt index 7831d6c31fc..05efe200ce8 100644 --- a/libraries/stdlib/src/kotlin/text/StringBuilder.kt +++ b/libraries/stdlib/src/kotlin/text/StringBuilder.kt @@ -1,7 +1,7 @@ @file:kotlin.jvm.JvmMultifileClass @file:kotlin.jvm.JvmName("StringsKt") -package kotlin +package kotlin.text /** * Builds newly created StringBuilder using provided body. diff --git a/libraries/stdlib/src/kotlin/text/StringBuilderJVM.kt b/libraries/stdlib/src/kotlin/text/StringBuilderJVM.kt index fcf07dca83e..b1c6dec4fd2 100644 --- a/libraries/stdlib/src/kotlin/text/StringBuilderJVM.kt +++ b/libraries/stdlib/src/kotlin/text/StringBuilderJVM.kt @@ -1,7 +1,7 @@ @file:kotlin.jvm.JvmMultifileClass @file:kotlin.jvm.JvmName("StringsKt") -package kotlin +package kotlin.text /** Line separator for current system. */ private val LINE_SEPARATOR: String by lazy { System.getProperty("line.separator")!! } diff --git a/libraries/stdlib/src/kotlin/text/Strings.kt b/libraries/stdlib/src/kotlin/text/Strings.kt index d123b8f6a36..00a514afa2d 100644 --- a/libraries/stdlib/src/kotlin/text/Strings.kt +++ b/libraries/stdlib/src/kotlin/text/Strings.kt @@ -2,7 +2,7 @@ @file:kotlin.jvm.JvmName("StringsKt") -package kotlin +package kotlin.text import java.util.NoSuchElementException import kotlin.text.MatchResult diff --git a/libraries/stdlib/src/kotlin/text/StringsDeprecated.kt b/libraries/stdlib/src/kotlin/text/StringsDeprecated.kt index 95be0ee6097..7a5450547ff 100644 --- a/libraries/stdlib/src/kotlin/text/StringsDeprecated.kt +++ b/libraries/stdlib/src/kotlin/text/StringsDeprecated.kt @@ -2,7 +2,7 @@ @file:kotlin.jvm.JvmName("StringsKt") -package kotlin +package kotlin.text import java.util.NoSuchElementException import kotlin.text.MatchResult diff --git a/libraries/stdlib/src/kotlin/text/StringsDeprecatedJVM.kt b/libraries/stdlib/src/kotlin/text/StringsDeprecatedJVM.kt index d14f9654851..e83c6259546 100644 --- a/libraries/stdlib/src/kotlin/text/StringsDeprecatedJVM.kt +++ b/libraries/stdlib/src/kotlin/text/StringsDeprecatedJVM.kt @@ -1,7 +1,7 @@ @file:kotlin.jvm.JvmMultifileClass @file:kotlin.jvm.JvmName("StringsKt") -package kotlin +package kotlin.text import java.io.StringReader import java.util.regex.Pattern diff --git a/libraries/stdlib/src/kotlin/text/StringsJVM.kt b/libraries/stdlib/src/kotlin/text/StringsJVM.kt index 36411e801fb..eff255edca6 100644 --- a/libraries/stdlib/src/kotlin/text/StringsJVM.kt +++ b/libraries/stdlib/src/kotlin/text/StringsJVM.kt @@ -1,7 +1,7 @@ @file:kotlin.jvm.JvmMultifileClass @file:kotlin.jvm.JvmName("StringsKt") -package kotlin +package kotlin.text import java.io.StringReader import java.util.regex.Pattern diff --git a/libraries/stdlib/src/kotlin/text/regex/RegexExtensions.kt b/libraries/stdlib/src/kotlin/text/regex/RegexExtensions.kt index 0308e87246a..d48b7965ec2 100644 --- a/libraries/stdlib/src/kotlin/text/regex/RegexExtensions.kt +++ b/libraries/stdlib/src/kotlin/text/regex/RegexExtensions.kt @@ -1,9 +1,7 @@ @file:kotlin.jvm.JvmMultifileClass @file:kotlin.jvm.JvmName("StringsKt") -package kotlin - -import kotlin.text.* +package kotlin.text /** * Converts the string into a regular expression [Regex] with the default options. diff --git a/libraries/stdlib/src/kotlin/util/Ranges.kt b/libraries/stdlib/src/kotlin/util/Ranges.kt index 0edcc26e7e2..082e37ec18c 100644 --- a/libraries/stdlib/src/kotlin/util/Ranges.kt +++ b/libraries/stdlib/src/kotlin/util/Ranges.kt @@ -1,6 +1,6 @@ @file:kotlin.jvm.JvmMultifileClass @file:kotlin.jvm.JvmName("RangesKt") -package kotlin +package kotlin.ranges /** * Represents a range of [Comparable] values. diff --git a/libraries/stdlib/test/collections/ReversedViewsJVMTest.kt b/libraries/stdlib/test/collections/ReversedViewsJVMTest.kt index b6f8fe01b79..e2986a3e316 100644 --- a/libraries/stdlib/test/collections/ReversedViewsJVMTest.kt +++ b/libraries/stdlib/test/collections/ReversedViewsJVMTest.kt @@ -16,7 +16,6 @@ package collections -import kotlin.asReversed import kotlin.test.assertEquals import org.junit.Test as test diff --git a/libraries/stdlib/test/collections/ReversedViewsTest.kt b/libraries/stdlib/test/collections/ReversedViewsTest.kt index f48e0860b8a..4da1dbb00a6 100644 --- a/libraries/stdlib/test/collections/ReversedViewsTest.kt +++ b/libraries/stdlib/test/collections/ReversedViewsTest.kt @@ -18,7 +18,6 @@ package collections import test.collections.behaviors.listBehavior import test.collections.compare -import kotlin.asReversed import kotlin.test.assertEquals import kotlin.test.assertFalse import kotlin.test.assertTrue