Move generated code between packages.

libraries/stdlib/src/generated/_Arrays.kt

@@ -1,7 +1,7 @@
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("ArraysKt")
 
-package kotlin
+package kotlin.collections
 
 //
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt

libraries/stdlib/src/generated/_Collections.kt

@@ -1,7 +1,7 @@
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("CollectionsKt")
 
-package kotlin
+package kotlin.collections
 
 //
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt

libraries/stdlib/src/generated/_Maps.kt

@@ -1,7 +1,7 @@
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("MapsKt")
 
-package kotlin
+package kotlin.collections
 
 //
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt

libraries/stdlib/src/generated/_Ranges.kt

@@ -1,7 +1,7 @@
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("RangesKt")
 
-package kotlin
+package kotlin.ranges
 
 //
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt

libraries/stdlib/src/generated/_Sequences.kt

@@ -1,7 +1,7 @@
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("SequencesKt")
 
-package kotlin
+package kotlin.sequences
 
 //
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt

libraries/stdlib/src/generated/_Sets.kt

@@ -1,7 +1,7 @@
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("SetsKt")
 
-package kotlin
+package kotlin.collections
 
 //
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt

libraries/stdlib/src/generated/_Strings.kt

@@ -1,7 +1,7 @@
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("StringsKt")
 
-package kotlin
+package kotlin.text
 
 //
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt

libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt

@@ -55,7 +55,7 @@ fun List<ConcreteFunction>.writeTo(outDir: File, sourceFile: SourceFile) {
             its.append("@file:kotlin.jvm.JvmMultifileClass\n")
         }
         its.append("@file:kotlin.jvm.JvmName(\"${sourceFile.jvmClassName}\")\n\n")
-        its.append("package kotlin\n\n")
+        its.append("package ${sourceFile.packageName ?: "kotlin"}\n\n")
         its.append("$COMMON_AUTOGENERATED_WARNING\n\n")
         its.append("import java.util.*\n\n")
         its.append("import java.util.Collections // TODO: it's temporary while we have java.util.Collections in js\n\n")

libraries/tools/kotlin-stdlib-gen/src/templates/engine/SourceFile.kt

@@ -1,14 +1,14 @@
 package templates
 
-enum class SourceFile(jvmClassName: String? = null, val multifile: Boolean = true) {
+enum class SourceFile(jvmClassName: String? = null, val multifile: Boolean = true, val packageName: String? = null) {
 
-    Arrays(),
-    Collections(),
-    Sets(),
-    Maps(),
-    Sequences(),
-    Ranges(),
-    Strings(),
+    Arrays(packageName = "kotlin.collections"),
+    Collections(packageName = "kotlin.collections"),
+    Sets(packageName = "kotlin.collections"),
+    Maps(packageName = "kotlin.collections"),
+    Sequences(packageName = "kotlin.sequences"),
+    Ranges(packageName = "kotlin.ranges"),
+    Strings(packageName = "kotlin.text"),
     Misc(),
     ;