diff --git a/core/builtins/build.gradle.kts b/core/builtins/build.gradle.kts index 5116ef4e3c6..82803e24812 100644 --- a/core/builtins/build.gradle.kts +++ b/core/builtins/build.gradle.kts @@ -8,10 +8,21 @@ plugins { val builtinsSrc = fileFrom(rootDir, "core", "builtins", "src") val builtinsNative = fileFrom(rootDir, "core", "builtins", "native") +val kotlinReflect = fileFrom(rootDir, "libraries/stdlib/src/kotlin/reflect") +val builtinsCherryPicked = fileFrom(buildDir, "src") + +val prepareSources by tasks.registering(Sync::class) { + from(kotlinReflect) { + exclude("typeOf.kt") + exclude("KClasses.kt") + } + into(builtinsCherryPicked) +} val serialize by tasks.registering(NoDebugJavaExec::class) { + dependsOn(prepareSources) val outDir = "$buildDir/$name" - val inDirs = arrayOf(builtinsSrc, builtinsNative) + val inDirs = arrayOf(builtinsSrc, builtinsNative, builtinsCherryPicked) inDirs.forEach { inputs.dir(it) } outputs.dir(outDir) diff --git a/core/builtins/src/kotlin/reflect/KAnnotatedElement.kt b/libraries/stdlib/jvm/src/kotlin/reflect/KAnnotatedElement.kt similarity index 100% rename from core/builtins/src/kotlin/reflect/KAnnotatedElement.kt rename to libraries/stdlib/jvm/src/kotlin/reflect/KAnnotatedElement.kt diff --git a/core/builtins/src/kotlin/reflect/KCallable.kt b/libraries/stdlib/jvm/src/kotlin/reflect/KCallable.kt similarity index 100% rename from core/builtins/src/kotlin/reflect/KCallable.kt rename to libraries/stdlib/jvm/src/kotlin/reflect/KCallable.kt diff --git a/core/builtins/src/kotlin/reflect/KClass.kt b/libraries/stdlib/jvm/src/kotlin/reflect/KClass.kt similarity index 100% rename from core/builtins/src/kotlin/reflect/KClass.kt rename to libraries/stdlib/jvm/src/kotlin/reflect/KClass.kt diff --git a/core/builtins/src/kotlin/reflect/KClassifier.kt b/libraries/stdlib/jvm/src/kotlin/reflect/KClassifier.kt similarity index 100% rename from core/builtins/src/kotlin/reflect/KClassifier.kt rename to libraries/stdlib/jvm/src/kotlin/reflect/KClassifier.kt diff --git a/core/builtins/src/kotlin/reflect/KDeclarationContainer.kt b/libraries/stdlib/jvm/src/kotlin/reflect/KDeclarationContainer.kt similarity index 100% rename from core/builtins/src/kotlin/reflect/KDeclarationContainer.kt rename to libraries/stdlib/jvm/src/kotlin/reflect/KDeclarationContainer.kt diff --git a/core/builtins/src/kotlin/reflect/KFunction.kt b/libraries/stdlib/jvm/src/kotlin/reflect/KFunction.kt similarity index 100% rename from core/builtins/src/kotlin/reflect/KFunction.kt rename to libraries/stdlib/jvm/src/kotlin/reflect/KFunction.kt diff --git a/core/builtins/src/kotlin/reflect/KParameter.kt b/libraries/stdlib/jvm/src/kotlin/reflect/KParameter.kt similarity index 100% rename from core/builtins/src/kotlin/reflect/KParameter.kt rename to libraries/stdlib/jvm/src/kotlin/reflect/KParameter.kt diff --git a/core/builtins/src/kotlin/reflect/KProperty.kt b/libraries/stdlib/jvm/src/kotlin/reflect/KProperty.kt similarity index 100% rename from core/builtins/src/kotlin/reflect/KProperty.kt rename to libraries/stdlib/jvm/src/kotlin/reflect/KProperty.kt diff --git a/core/builtins/src/kotlin/reflect/KType.kt b/libraries/stdlib/jvm/src/kotlin/reflect/KType.kt similarity index 100% rename from core/builtins/src/kotlin/reflect/KType.kt rename to libraries/stdlib/jvm/src/kotlin/reflect/KType.kt diff --git a/core/builtins/src/kotlin/reflect/KTypeParameter.kt b/libraries/stdlib/jvm/src/kotlin/reflect/KTypeParameter.kt similarity index 100% rename from core/builtins/src/kotlin/reflect/KTypeParameter.kt rename to libraries/stdlib/jvm/src/kotlin/reflect/KTypeParameter.kt diff --git a/core/builtins/src/kotlin/reflect/KVariance.kt b/libraries/stdlib/jvm/src/kotlin/reflect/KVariance.kt similarity index 100% rename from core/builtins/src/kotlin/reflect/KVariance.kt rename to libraries/stdlib/jvm/src/kotlin/reflect/KVariance.kt diff --git a/core/builtins/src/kotlin/reflect/KVisibility.kt b/libraries/stdlib/jvm/src/kotlin/reflect/KVisibility.kt similarity index 100% rename from core/builtins/src/kotlin/reflect/KVisibility.kt rename to libraries/stdlib/jvm/src/kotlin/reflect/KVisibility.kt