From b9a529d7d0a27ed5a1af246c3e1e3a3039a88498 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Thu, 12 Dec 2019 10:05:18 +0300 Subject: [PATCH] [Gradle, JS] Hack for GSON to get non-null values --- .../jetbrains/kotlin/gradle/targets/js/npm/PackageJson.kt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) 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 b72620f8aa9..97826bc24b0 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 @@ -9,6 +9,8 @@ import com.google.gson.GsonBuilder import org.jetbrains.kotlin.gradle.internal.ensureParentDirsCreated import java.io.File +// Gson set nulls reflective no matter on default values and non-null types +@Suppress("USELESS_ELVIS") class PackageJson( var name: String, var version: String @@ -29,24 +31,18 @@ class PackageJson( var workspaces: Collection? = null - // Gson set nulls reflective no matter on default values and non-null types - @Suppress("USELESS_ELVIS") val devDependencies = mutableMapOf() get() = field ?: mutableMapOf() - @Suppress("USELESS_ELVIS") val dependencies = mutableMapOf() get() = field ?: mutableMapOf() - @Suppress("USELESS_ELVIS") val peerDependencies = mutableMapOf() get() = field ?: mutableMapOf() - @Suppress("USELESS_ELVIS") val optionalDependencies = mutableMapOf() get() = field ?: mutableMapOf() - @Suppress("USELESS_ELVIS") val bundledDependencies = mutableListOf() get() = field ?: mutableListOf()