From b5b58f40d61941dc180dd56139756d63ea4c9992 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 3 Oct 2022 10:30:50 +0200 Subject: [PATCH] Workaround instability of Gradle builds caused by the default encoding The encoding setting from org.gradle.jvmargs is not applied (https://github.com/gradle/gradle/issues/22292) during the :kotlin-stdlib-js:compileJs, causing instability in kotlin.js.map (https://youtrack.jetbrains.com/issue/KT-50589) on machines where default encoding is not UTF-8. This reverts commit d7ef5efa6a7e1043aca7fa8ecad658f3c8150d8d. KTI-932 --- gradle.properties | 2 ++ libraries/stdlib/js/src/kotlin/text/char.kt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 07db5e27bf0..8ab3c48a623 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,7 @@ org.gradle.jvmargs=-Duser.country=US -Dfile.encoding=UTF-8 -Dorg.gradle.internal.publish.checksums.insecure=true kotlin.daemon.jvmargs=-Xmx3g +systemProp.file.encoding=UTF-8 +systemProp.user.country=US # Enable new incremental compiation kotlin.incremental.useClasspathSnapshot=true diff --git a/libraries/stdlib/js/src/kotlin/text/char.kt b/libraries/stdlib/js/src/kotlin/text/char.kt index 76b8ed68138..deec03b7d2d 100644 --- a/libraries/stdlib/js/src/kotlin/text/char.kt +++ b/libraries/stdlib/js/src/kotlin/text/char.kt @@ -71,7 +71,7 @@ public actual fun Char.uppercaseChar(): Char { * * This function supports one-to-many character mapping, thus the length of the returned string can be greater than one. * For example, `'\uFB00'.uppercase()` returns `"\u0046\u0046"`, - * where `'\uFB00'` is the LATIN SMALL LIGATURE FF character. + * where `'\uFB00'` is the LATIN SMALL LIGATURE FF character (`ff`). * If this character has no upper case mapping, the result of `toString()` of this char is returned. * * @sample samples.text.Chars.uppercase