Prevent serializing OptIn-related annotations to builtins
Required for KT-52932: to avoid dealing with opt-ins when serializing experimental parts of builtins
This commit is contained in:
@@ -12,6 +12,7 @@ val kotlinReflectCommon = fileFrom(rootDir, "libraries/stdlib/src/kotlin/reflect
|
|||||||
val kotlinReflectJvm = fileFrom(rootDir, "libraries/stdlib/jvm/src/kotlin/reflect")
|
val kotlinReflectJvm = fileFrom(rootDir, "libraries/stdlib/jvm/src/kotlin/reflect")
|
||||||
val kotlinRangesCommon = fileFrom(rootDir, "libraries/stdlib/src/kotlin/ranges")
|
val kotlinRangesCommon = fileFrom(rootDir, "libraries/stdlib/src/kotlin/ranges")
|
||||||
val kotlinCollectionsCommon = fileFrom(rootDir, "libraries/stdlib/src/kotlin/collections")
|
val kotlinCollectionsCommon = fileFrom(rootDir, "libraries/stdlib/src/kotlin/collections")
|
||||||
|
val kotlinAnnotationsCommon = fileFrom(rootDir, "libraries/stdlib/src/kotlin/annotations")
|
||||||
val builtinsCherryPicked = fileFrom(buildDir, "src/reflect")
|
val builtinsCherryPicked = fileFrom(buildDir, "src/reflect")
|
||||||
val rangesCherryPicked = fileFrom(buildDir, "src/ranges")
|
val rangesCherryPicked = fileFrom(buildDir, "src/ranges")
|
||||||
val builtinsCherryPickedJvm = fileFrom(buildDir, "src-jvm/reflect")
|
val builtinsCherryPickedJvm = fileFrom(buildDir, "src-jvm/reflect")
|
||||||
@@ -36,10 +37,15 @@ val runtimeElementsJvm by configurations.creating {
|
|||||||
val prepareRangeSources by tasks.registering(Sync::class) {
|
val prepareRangeSources by tasks.registering(Sync::class) {
|
||||||
from(kotlinRangesCommon) {
|
from(kotlinRangesCommon) {
|
||||||
exclude("Ranges.kt")
|
exclude("Ranges.kt")
|
||||||
|
filter { line -> line.takeUnless { "@OptIn" in it } }
|
||||||
}
|
}
|
||||||
from(kotlinCollectionsCommon) {
|
from(kotlinCollectionsCommon) {
|
||||||
include("PrimitiveIterators.kt")
|
include("PrimitiveIterators.kt")
|
||||||
}
|
}
|
||||||
|
from(kotlinAnnotationsCommon) {
|
||||||
|
include("ExperimentalStdlibApi.kt")
|
||||||
|
filter { line -> line.takeUnless { "@RequiresOptIn" in it } }
|
||||||
|
}
|
||||||
|
|
||||||
into(rangesCherryPicked)
|
into(rangesCherryPicked)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user