Fix line endings ruined after applying line filter

Line filtering causes output file have platform-specific line endings.
Apply another filter to fix them to LFs.
This commit is contained in:
Ilya Gorbunov
2022-06-30 02:50:31 +03:00
committed by Space
parent f422845b9c
commit 0546b0902c
3 changed files with 4 additions and 0 deletions
+2
View File
@@ -38,6 +38,7 @@ val prepareRangeSources by tasks.registering(Sync::class) {
from(kotlinRangesCommon) {
exclude("Ranges.kt")
filter { line -> line.takeUnless { "@OptIn" in it } }
filter(org.apache.tools.ant.filters.FixCrLfFilter::class, "eol" to org.apache.tools.ant.filters.FixCrLfFilter.CrLf.newInstance("lf"))
}
from(kotlinCollectionsCommon) {
include("PrimitiveIterators.kt")
@@ -45,6 +46,7 @@ val prepareRangeSources by tasks.registering(Sync::class) {
from(kotlinAnnotationsCommon) {
include("ExperimentalStdlibApi.kt")
filter { line -> line.takeUnless { "@RequiresOptIn" in it } }
filter(org.apache.tools.ant.filters.FixCrLfFilter::class, "eol" to org.apache.tools.ant.filters.FixCrLfFilter.CrLf.newInstance("lf"))
}
into(rangesCherryPicked)
+1
View File
@@ -670,6 +670,7 @@ configure([samplesZip, samplesTar]) {
filter {
it.startsWith('org.jetbrains.kotlin.native.home=') || it.startsWith('# Use custom Kotlin/Native home:') ? null : it
}
filter(org.apache.tools.ant.filters.FixCrLfFilter, "eol": org.apache.tools.ant.filters.FixCrLfFilter.CrLf.newInstance("lf"))
}
// Exclude build artifacts.
+1
View File
@@ -192,6 +192,7 @@ val relocateCoreSources by task<Copy> {
filter { line ->
line.replace("org.jetbrains.kotlin", "kotlin.reflect.jvm.internal.impl")
}
filter(org.apache.tools.ant.filters.FixCrLfFilter::class, "eol" to org.apache.tools.ant.filters.FixCrLfFilter.CrLf.newInstance("lf"))
outputs.cacheIf { true }
}