Switch reflect to compiled core classes

compiler/build.gradle.kts

@@ -20,7 +20,6 @@ val testDistProjects = listOf(
         "", // for root project
         ":prepare:mock-runtime-for-test",
         ":kotlin-compiler",
-        ":kotlin-runtime",
         ":kotlin-script-runtime",
         ":kotlin-stdlib",
         ":kotlin-stdlib-jre7",

compiler/compiler.pro

@@ -52,6 +52,7 @@ messages/**)
 -dontwarn org.w3c.dom.ElementTraversal
 -dontwarn javaslang.match.annotation.Unapply
 -dontwarn javaslang.match.annotation.Patterns
+-dontwarn javaslang.*
 -dontwarn com.google.errorprone.**
 -dontwarn com.google.j2objc.**
 -dontwarn javax.crypto.**

compiler/frontend.script/build.gradle.kts

@@ -6,6 +6,7 @@ jvmTarget = "1.6"
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))
+    compile(projectDist(":kotlin-stdlib"))
     compile(projectDist(":kotlin-reflect"))
     compile(preloadedDeps("kotlinx-coroutines-core"))
 }

compiler/tests-java8/build.gradle.kts

@@ -18,7 +18,6 @@ dependencies {
     // deps below are test runtime deps, but made test compile to split compilation and running to reduce mem req
     testCompile(projectDist(":kotlin-stdlib"))
     testCompile(projectDist(":kotlin-script-runtime"))
-    testCompile(projectDist(":kotlin-runtime"))
     testCompile(projectDist(":kotlin-reflect"))
     testCompile(projectTests(":compiler"))
     testRuntime(projectDist(":kotlin-preloader"))

core/build.gradle.kts

@@ -5,6 +5,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 apply { plugin("kotlin") }
 
 jvmTarget = "1.6"
+javaHome = rootProject.extra["JDK_16"] as String
 
 dependencies {
     compile(projectDist(":kotlin-stdlib"))
@@ -26,6 +27,8 @@ sourceSets {
 
 tasks.withType<JavaCompile> {
     dependsOn(protobufLiteTask)
+    sourceCompatibility = "1.6"
+    targetCompatibility = "1.6"
 }
 
 tasks.withType<KotlinCompile> {

core/util.runtime/build.gradle.kts

@@ -5,6 +5,7 @@ apply {
 }
 
 jvmTarget = "1.6"
+javaHome = rootProject.extra["JDK_16"] as String
 
 dependencies {
     compile(projectDist(":kotlin-stdlib"))
@@ -15,3 +16,7 @@ sourceSets {
     "test" {}
 }
 
+tasks.withType<JavaCompile> {
+    sourceCompatibility = "1.6"
+    targetCompatibility = "1.6"
+}

js/js.tests/build.gradle.kts

@@ -25,7 +25,6 @@ val testDistProjects = listOf(
         "", // for root project
         ":prepare:mock-runtime-for-test",
         ":kotlin-compiler",
-        ":kotlin-runtime",
         ":kotlin-script-runtime",
         ":kotlin-stdlib",
         ":kotlin-stdlib-js",

libraries/tools/binary-compatibility-validator/build.gradle

@@ -15,7 +15,7 @@ dependencies {
     testArtifacts project(':kotlin-stdlib-jre8')
     testArtifacts project(':kotlin-reflect')
     // legacy
-    testArtifacts project(':kotlin-runtime')
+//    testArtifacts project(':kotlin-runtime')
     testArtifacts files(project(':kotlin-stdlib').tasks.originalStdlibJar)
 }
 

libraries/tools/kotlin-reflect/build.gradle

@@ -27,12 +27,6 @@ sourceSets {
     main {
         java {
             srcDir annotationsSrc
-            srcDir "${core}/descriptor.loader.java/src"
-            srcDir "${core}/descriptors/src"
-            srcDir "${core}/descriptors.runtime/src"
-            srcDir "${core}/deserialization/src"
-            srcDir "${core}/util.runtime/src"
-
             srcDir "${core}/reflection.jvm/src"
         }
     }
@@ -40,13 +34,15 @@ sourceSets {
 
 configurations {
     proguardDeps
-    shadows
+    shadows { transitive = false }
     compileOnly.extendsFrom(shadows)
     mainJar
 }
 
 dependencies {
     proguardDeps project(':kotlin-stdlib')
+    shadows project(':core:util.runtime')
+    shadows project(':core')
     shadows 'javax.inject:javax.inject:1'
     shadows project(path: ':custom-dependencies:protobuf-lite', configuration: 'default')
 

prepare/mock-runtime-for-test/build.gradle.kts

@@ -7,21 +7,21 @@ jvmTarget = "1.6"
 javaHome = rootProject.extra["JDK_16"] as String
 
 dependencies {
-    compile(projectDist(":kotlin-stdlib"))
+//    compile(projectDist(":kotlin-stdlib"))
 }
 
 sourceSets {
     "main" {
-        java.apply {
+//        java.apply {
-            srcDir(File(rootDir, "core", "runtime.jvm", "src"))
+//            srcDir(File(rootDir, "core", "runtime.jvm", "src"))
-                    .include("kotlin/TypeAliases.kt",
+//                    .include("kotlin/TypeAliases.kt",
-                             "kotlin/text/TypeAliases.kt")
+//                             "kotlin/text/TypeAliases.kt")
-            srcDir(File(rootDir, "libraries", "stdlib", "src"))
+//            srcDir(File(rootDir, "libraries", "stdlib", "src"))
-                    .include("kotlin/collections/TypeAliases.kt",
+//                    .include("kotlin/collections/TypeAliases.kt",
-                             "kotlin/jvm/JvmVersion.kt",
+//                             "kotlin/jvm/JvmVersion.kt",
-                             "kotlin/util/Standard.kt",
+//                             "kotlin/util/Standard.kt",
-                             "kotlin/internal/Annotations.kt")
+//                             "kotlin/internal/Annotations.kt")
-        }
+//        }
     }
     "test" {}
 }
@@ -35,6 +35,18 @@ tasks.withType<JavaCompile> {
 val jar = runtimeJar {
     dependsOn(":core:builtins:serialize")
     from(fileTree("${rootProject.extra["distDir"]}/builtins")) { include("kotlin/**") }
+    dependsOn(":kotlin-stdlib:classes")
+    project(":kotlin-stdlib").let { p ->
+        p.pluginManager.withPlugin("java") {
+            from(p.the<JavaPluginConvention>().sourceSets.getByName("main").output) {
+                include("kotlin/**/TypeAliases*.class",
+                        "kotlin/jvm/JvmVersion.class",
+                        "kotlin/StandardKt*.class",
+                        "kotlin/NotImplementedError*.class",
+                        "kotlin/internal/*.class")
+            }
+        }
+    }
 }
 
 val distDir: String by rootProject.extra

settings.gradle

@@ -80,7 +80,7 @@ include ":kotlin-build-common",
         ":plugins:kapt3",
         ":plugins:plugins-tests",
         ":kotlin-script-runtime",
-        ":kotlin-runtime",
+//        ":kotlin-runtime",
         ":kotlin-test:kotlin-test-common",
         ":kotlin-test:kotlin-test-jvm",
         ":kotlin-test:kotlin-test-junit",
@@ -124,7 +124,7 @@ include ":kotlin-build-common",
 
 rootProject.name = "kotlin"
 
-project(':kotlin-runtime').projectDir = "$rootDir/libraries/tools/runtime" as File
+//project(':kotlin-runtime').projectDir = "$rootDir/libraries/tools/runtime" as File
 project(':kotlin-script-runtime').projectDir = "$rootDir/libraries/tools/script-runtime" as File
 project(':kotlin-test:kotlin-test-common').projectDir = "$rootDir/libraries/kotlin.test/common" as File
 project(':kotlin-test:kotlin-test-jvm').projectDir = "$rootDir/libraries/kotlin.test/jvm" as File