Build standard library for JVM from a single source set

Add explicit imports for kotlin.* and kotlin.text.* to prevent typealiases
conflicting with their aliased types from default imports.

js/js.libraries/src/core/generated/_ArraysJs.kt

@@ -11,6 +11,8 @@ package kotlin.collections
 import kotlin.js.*
 import primitiveArrayConcat
 import withType
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**

js/js.libraries/src/core/generated/_CollectionsJs.kt

@@ -9,6 +9,8 @@ package kotlin.collections
 //
 
 import kotlin.js.*
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**

js/js.libraries/src/core/generated/_ComparisonsJs.kt

@@ -9,6 +9,8 @@ package kotlin.comparisons
 //
 
 import kotlin.js.*
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**

js/js.libraries/src/core/generated/_MapsJs.kt

@@ -9,6 +9,8 @@ package kotlin.collections
 //
 
 import kotlin.js.*
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**

js/js.libraries/src/core/generated/_RangesJs.kt

@@ -9,6 +9,8 @@ package kotlin.ranges
 //
 
 import kotlin.js.*
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**

js/js.libraries/src/core/generated/_SequencesJs.kt

@@ -9,6 +9,8 @@ package kotlin.sequences
 //
 
 import kotlin.js.*
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 import kotlin.coroutines.experimental.*
 

js/js.libraries/src/core/generated/_SetsJs.kt

@@ -9,6 +9,8 @@ package kotlin.collections
 //
 
 import kotlin.js.*
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**

js/js.libraries/src/core/generated/_StringsJs.kt

@@ -9,6 +9,8 @@ package kotlin.text
 //
 
 import kotlin.js.*
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**

libraries/stdlib/build.gradle

@@ -28,6 +28,8 @@ sourceSets {
     }
     main {
         java {
+            srcDir "${rootDir}/core/builtins/src"
+            srcDir "jvm/runtime"
             srcDir 'src'
         }
     }
@@ -69,7 +71,6 @@ task originalStdlibJar(type: Jar) {
 jar {
     manifestAttributes(manifest, project, 'Main', true)
     from("${rootDir}/dist/builtins")
-    from sourceSets.builtins.output
     from sourceSets.experimental.output
     // TODO: enable as soon as this doesn't cause D8/DX to crash
     // from sourceSets.java9.output
@@ -81,7 +82,6 @@ task distJar(type: Jar) {
     manifestAttributes(manifest, project, 'Main', true)
     from("${rootDir}/dist/builtins")
     from sourceSets.annotations.output
-    from sourceSets.builtins.output
     from sourceSets.main.output
     from sourceSets.experimental.output
     // TODO: enable as soon as this doesn't cause D8/DX to crash
@@ -96,7 +96,6 @@ task builtinsJar(type: Jar) {
 
 sourcesJar {
     from "${rootDir}/core/builtins/native"
-    from sourceSets.builtins.kotlin
 }
 
 artifacts {
@@ -141,6 +140,7 @@ compileBuiltinsKotlin {
     }
 }
 compileKotlin {
+    dependsOn ":core:builtins:serialize"
     dependsOn(":prepare:build.version:writeStdlibVersion")
     kotlinOptions {
         freeCompilerArgs = [
@@ -149,6 +149,7 @@ compileKotlin {
                 "-Xmultifile-parts-inherit",
                 "-Xnormalize-constructor-calls=enable",
                 "-Xdump-declarations-to=${buildDir}/stdlib-declarations.json",
+                "-cp", "${rootDir}/dist/builtins",
                 "-module-name", project.name
         ]
     }
@@ -168,6 +169,6 @@ compileExperimentalKotlin {
     }
 }
 
-compileJava9Sources(project, 'kotlin.stdlib', [sourceSets.builtins.output, sourceSets.main.output])
+compileJava9Sources(project, 'kotlin.stdlib')
 
 kotlin.experimental.coroutines 'enable'

libraries/stdlib/common/src/generated/_Arrays.kt

@@ -8,6 +8,8 @@ package kotlin.collections
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**

libraries/stdlib/common/src/generated/_Collections.kt

@@ -8,6 +8,8 @@ package kotlin.collections
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**

libraries/stdlib/common/src/generated/_Comparisons.kt

@@ -8,6 +8,8 @@ package kotlin.comparisons
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**

libraries/stdlib/common/src/generated/_Maps.kt

@@ -8,6 +8,8 @@ package kotlin.collections
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**

libraries/stdlib/common/src/generated/_Ranges.kt

@@ -8,6 +8,8 @@ package kotlin.ranges
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**

libraries/stdlib/common/src/generated/_Sequences.kt

@@ -8,6 +8,8 @@ package kotlin.sequences
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 import kotlin.coroutines.experimental.*
 

libraries/stdlib/common/src/generated/_Sets.kt

@@ -8,6 +8,8 @@ package kotlin.collections
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**

libraries/stdlib/common/src/generated/_Strings.kt

@@ -8,6 +8,8 @@ package kotlin.text
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**

libraries/stdlib/src/generated/_Arrays.kt

@@ -9,6 +9,8 @@ package kotlin.collections
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**

libraries/stdlib/src/generated/_Collections.kt

@@ -9,6 +9,8 @@ package kotlin.collections
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**

libraries/stdlib/src/generated/_Comparisons.kt

@@ -9,6 +9,8 @@ package kotlin.comparisons
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**

libraries/stdlib/src/generated/_Maps.kt

@@ -9,6 +9,8 @@ package kotlin.collections
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**

libraries/stdlib/src/generated/_Ranges.kt

@@ -9,6 +9,8 @@ package kotlin.ranges
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**

libraries/stdlib/src/generated/_Sequences.kt

@@ -9,6 +9,8 @@ package kotlin.sequences
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 import kotlin.coroutines.experimental.*
 

libraries/stdlib/src/generated/_Sets.kt

@@ -9,6 +9,8 @@ package kotlin.collections
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**

libraries/stdlib/src/generated/_Strings.kt

@@ -9,6 +9,8 @@ package kotlin.text
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
 
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**

libraries/stdlib/src/kotlin/collections/AbstractList.kt

@@ -20,6 +20,8 @@
 
 package kotlin.collections
 
+import kotlin.*
+
 /**
  * Provides a skeletal implementation of the read-only [List] interface.
  *

libraries/stdlib/src/kotlin/collections/Collections.kt

@@ -19,6 +19,7 @@
 
 package kotlin.collections
 
+import kotlin.*
 import kotlin.comparisons.compareValues
 
 internal object EmptyIterator : ListIterator<Nothing> {

libraries/stdlib/src/kotlin/collections/ReversedViews.kt

@@ -18,6 +18,8 @@
 
 package kotlin.collections
 
+import kotlin.*
+
 
 private open class ReversedListReadOnly<out T>(private val delegate: List<T>) : AbstractList<T>() {
     override val size: Int get() = delegate.size

libraries/stdlib/src/kotlin/collections/Sequences.kt

@@ -3,6 +3,8 @@
 
 package kotlin.sequences
 
+import kotlin.*
+
 /**
  * Given an [iterator] function constructs a [Sequence] that returns values through the [Iterator]
  * provided by that function.

libraries/stdlib/src/kotlin/collections/SlidingWindow.kt

@@ -16,6 +16,7 @@
 
 package kotlin.collections
 
+import kotlin.*
 import kotlin.coroutines.experimental.buildIterator
 
 internal fun checkWindowSizeStep(size: Int, step: Int) {

libraries/stdlib/src/kotlin/coroutines/experimental/SafeContinuationJvm.kt

@@ -17,6 +17,7 @@
 package kotlin.coroutines.experimental
 
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater
+import kotlin.*
 import kotlin.coroutines.experimental.intrinsics.COROUTINE_SUSPENDED
 
 @PublishedApi

libraries/stdlib/src/kotlin/coroutines/experimental/SequenceBuilder.kt

@@ -18,6 +18,7 @@
 @file:kotlin.jvm.JvmName("SequenceBuilderKt")
 package kotlin.coroutines.experimental
 
+import kotlin.*
 import kotlin.coroutines.experimental.intrinsics.*
 
 /**

libraries/stdlib/src/kotlin/internal/PlatformImplementations.kt

@@ -1,7 +1,7 @@
 @file:JvmVersion
 package kotlin.internal
 
-import java.io.Closeable
+import kotlin.*
 import java.util.regex.MatchResult
 
 internal open class PlatformImplementations {

libraries/stdlib/src/kotlin/io/Console.kt

@@ -3,6 +3,7 @@
 
 package kotlin.io
 
+import kotlin.text.*
 import java.io.InputStream
 import java.nio.Buffer
 import java.nio.ByteBuffer

libraries/stdlib/src/kotlin/io/Exceptions.kt

@@ -1,6 +1,7 @@
 @file:JvmVersion
 package kotlin.io
 
+import kotlin.text.*
 import java.io.File
 import java.io.IOException
 

libraries/stdlib/src/kotlin/io/files/FilePathComponents.kt

@@ -4,7 +4,7 @@
 package kotlin.io
 
 import java.io.File
-import kotlin.text.Regex
+import kotlin.*
 
 /**
  * Estimation of a root name by a given file name.

libraries/stdlib/src/kotlin/io/files/FileTreeWalk.kt

@@ -3,6 +3,7 @@
 @file:JvmName("FilesKt")
 package kotlin.io
 
+import kotlin.*
 import java.io.File
 import java.io.IOException
 import java.util.Stack

libraries/stdlib/src/kotlin/io/files/Utils.kt

@@ -5,6 +5,8 @@ package kotlin.io
 
 import java.io.*
 import java.util.*
+import kotlin.*
+import kotlin.text.*
 import kotlin.comparisons.*
 
 /**

libraries/stdlib/src/kotlin/jvm/internal/unsafe/monitor.kt

@@ -17,6 +17,8 @@
 @file:JvmVersion
 package kotlin.jvm.internal.unsafe
 
+import kotlin.*
+
 private fun monitorEnter(@Suppress("UNUSED_PARAMETER") monitor: Any): Unit = throw UnsupportedOperationException("This function can only be used privately")
 
 private fun monitorExit(@Suppress("UNUSED_PARAMETER") monitor: Any): Unit = throw UnsupportedOperationException("This function can only be used privately")

libraries/stdlib/src/kotlin/properties/Delegates.kt

@@ -1,5 +1,6 @@
 package kotlin.properties
 
+import kotlin.*
 import kotlin.reflect.KProperty
 
 /**

libraries/stdlib/src/kotlin/ranges/Ranges.kt

@@ -2,6 +2,8 @@
 @file:kotlin.jvm.JvmName("RangesKt")
 package kotlin.ranges
 
+import kotlin.*
+
 /**
  * Represents a range of floating point numbers.
  * Extends [ClosedRange] interface providing custom operation [lessThanOrEquals] for comparing values of range domain type.

libraries/stdlib/src/kotlin/system/Process.kt

@@ -2,6 +2,8 @@
 @file:kotlin.jvm.JvmVersion
 package kotlin.system
 
+import kotlin.*
+
 /**
  * Terminates the currently running Java Virtual Machine. The
  * argument serves as a status code; by convention, a nonzero status

libraries/stdlib/src/kotlin/text/CharCategory.kt

@@ -1,6 +1,8 @@
 @file:JvmVersion
 package kotlin.text
 
+import kotlin.*
+
 /**
  * Represents the character general category in the Unicode specification.
  */

libraries/stdlib/src/kotlin/text/CharDirectionality.kt

@@ -1,6 +1,8 @@
 @file:JvmVersion
 package kotlin.text
 
+import kotlin.*
+
 /**
  * Represents the Unicode directionality of a character.
  * Character directionality is used to calculate the

libraries/stdlib/src/kotlin/text/CharJVM.kt

@@ -20,6 +20,8 @@
 
 package kotlin.text
 
+import kotlin.*
+
 /**
  * Returns `true` if this character (Unicode code point) is defined in Unicode.
  */

libraries/stdlib/src/kotlin/text/Strings.kt

@@ -20,6 +20,7 @@
 
 package kotlin.text
 
+import kotlin.*
 import kotlin.comparisons.*
 import kotlin.internal.contracts.*
 

libraries/stdlib/src/kotlin/util/MathJVM.kt

@@ -19,6 +19,7 @@
 
 package kotlin.math
 
+import kotlin.*
 import kotlin.internal.InlineOnly
 import java.lang.Math as nativeMath
 

libraries/tools/kotlin-stdlib-gen/src/templates/dsl/Writers.kt

@@ -85,6 +85,8 @@ fun List<MemberBuilder>.writeTo(file: File, platformSource: PlatformSourceFile)
                 writer.appendln("import withType")
             }
         }
+        writer.appendln("import kotlin.*")
+        writer.appendln("import kotlin.text.*")
         writer.appendln("import kotlin.comparisons.*")
 
         if (sourceFile == SourceFile.Sequences) {