From 31e7dd5fcc544f724d96788ba1049872b69c45a8 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Tue, 29 Sep 2020 13:52:46 +0300 Subject: [PATCH] [Gradle, JS] Fix escaped characters in package.json ^KT-40202 fixed --- .../kotlin/gradle/targets/js/npm/AbstractNodeModulesCache.kt | 1 + .../org/jetbrains/kotlin/gradle/targets/js/npm/PackageJson.kt | 1 + 2 files changed, 2 insertions(+) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/AbstractNodeModulesCache.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/AbstractNodeModulesCache.kt index d84e8e92901..9f5c685a3d8 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/AbstractNodeModulesCache.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/AbstractNodeModulesCache.kt @@ -60,6 +60,7 @@ fun makeNodeModule( val gson = GsonBuilder() .setPrettyPrinting() + .disableHtmlEscaping() .create() files(dir) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/PackageJson.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/PackageJson.kt index 5042d601e6a..bcd641620aa 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/PackageJson.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/PackageJson.kt @@ -81,6 +81,7 @@ class PackageJson( fun saveTo(packageJsonFile: File) { val gson = GsonBuilder() .setPrettyPrinting() + .disableHtmlEscaping() .addSerializationExclusionStrategy( object : ExclusionStrategy { override fun shouldSkipField(f: FieldAttributes?): Boolean =