azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Serialize jvm reflect into builtIns

Browse Source 
Basically this is revert of 427e34fe5a commit
This was done due to the KT-39728.
Also we do pick every file separately, because builtIn serializer
unable to filter expects
This commit is contained in:
Stanislav Erokhin
2020-07-21 15:17:12 +03:00
parent 67090e1afb
commit 0c094b1719
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/builtins/build.gradle.kts
+11 -4
View File
@@ -8,7 +8,8 @@ plugins {
val builtinsSrc = fileFrom(rootDir, "core", "builtins", "src") val builtinsSrc = fileFrom(rootDir, "core", "builtins", "src")
val builtinsNative = fileFrom(rootDir, "core", "builtins", "native") val builtinsNative = fileFrom(rootDir, "core", "builtins", "native")
val kotlinReflect = fileFrom(rootDir, "libraries/stdlib/src/kotlin/reflect") val kotlinReflectCommon = fileFrom(rootDir, "libraries/stdlib/src/kotlin/reflect/")
val kotlinReflectJvm = fileFrom(rootDir, "libraries/stdlib/jvm/src/kotlin/reflect")
val builtinsCherryPicked = fileFrom(buildDir, "src") val builtinsCherryPicked = fileFrom(buildDir, "src")
val runtimeElements by configurations.creating { val runtimeElements by configurations.creating {
@@ -20,9 +21,15 @@ val runtimeElements by configurations.creating {
} }
val prepareSources by tasks.registering(Sync::class) { val prepareSources by tasks.registering(Sync::class) {
from(kotlinReflect) { from(kotlinReflectJvm) {
exclude("typeOf.kt") exclude("TypesJVM.kt")
exclude("KClasses.kt") exclude("KClassesImpl.kt")
}
from(kotlinReflectCommon) {
include("KTypeProjection.kt")
include("KClassifier.kt")
include("KTypeParameter.kt")
include("KVariance.kt")
} }
into(builtinsCherryPicked) into(builtinsCherryPicked)
} }