From ed96197d6bf4e141823675309e00482190a3dd43 Mon Sep 17 00:00:00 2001 From: AJ Alt Date: Wed, 26 Jun 2019 17:02:10 -0700 Subject: [PATCH] Always use LF line endings in generated stdlib code The code generation uses a mixture of literal `\n` characters and `appendln`. The latter insert `\r\n` on Windows by default, causing generated files to contain a mixture of line endings. This commit sets the `line.separator` system property for the generator to `\n` so that `appendln` will never insert `\r` characters. As an additional measure, `.gitattributes` files were added to checkout generated stdlib files always with LF line endings. --- libraries/stdlib/common/src/generated/.gitattributes | 1 + libraries/stdlib/js-ir/src/generated/.gitattributes | 1 + libraries/stdlib/js/src/generated/.gitattributes | 1 + libraries/stdlib/jvm/src/generated/.gitattributes | 1 + libraries/tools/kotlin-stdlib-gen/build.gradle | 1 + 5 files changed, 5 insertions(+) create mode 100644 libraries/stdlib/common/src/generated/.gitattributes create mode 100644 libraries/stdlib/js-ir/src/generated/.gitattributes create mode 100644 libraries/stdlib/js/src/generated/.gitattributes create mode 100644 libraries/stdlib/jvm/src/generated/.gitattributes diff --git a/libraries/stdlib/common/src/generated/.gitattributes b/libraries/stdlib/common/src/generated/.gitattributes new file mode 100644 index 00000000000..d0496f1a266 --- /dev/null +++ b/libraries/stdlib/common/src/generated/.gitattributes @@ -0,0 +1 @@ +*.kt eol=lf diff --git a/libraries/stdlib/js-ir/src/generated/.gitattributes b/libraries/stdlib/js-ir/src/generated/.gitattributes new file mode 100644 index 00000000000..d0496f1a266 --- /dev/null +++ b/libraries/stdlib/js-ir/src/generated/.gitattributes @@ -0,0 +1 @@ +*.kt eol=lf diff --git a/libraries/stdlib/js/src/generated/.gitattributes b/libraries/stdlib/js/src/generated/.gitattributes new file mode 100644 index 00000000000..d0496f1a266 --- /dev/null +++ b/libraries/stdlib/js/src/generated/.gitattributes @@ -0,0 +1 @@ +*.kt eol=lf diff --git a/libraries/stdlib/jvm/src/generated/.gitattributes b/libraries/stdlib/jvm/src/generated/.gitattributes new file mode 100644 index 00000000000..d0496f1a266 --- /dev/null +++ b/libraries/stdlib/jvm/src/generated/.gitattributes @@ -0,0 +1 @@ +*.kt eol=lf diff --git a/libraries/tools/kotlin-stdlib-gen/build.gradle b/libraries/tools/kotlin-stdlib-gen/build.gradle index 134833fb25a..d1f953ec885 100644 --- a/libraries/tools/kotlin-stdlib-gen/build.gradle +++ b/libraries/tools/kotlin-stdlib-gen/build.gradle @@ -33,4 +33,5 @@ task run(type: JavaExec) { main 'generators.GenerateStandardLibKt' classpath sourceSets.main.runtimeClasspath args = ["${rootDir}"] + systemProperty 'line.separator', '\n' } \ No newline at end of file