azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle, JS] Hack for GSON to get non-null values

Browse Source
This commit is contained in:
Ilya Goncharov
2019-12-12 10:05:18 +03:00
parent 7d98d33e3d
commit b9a529d7d0
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/PackageJson.kt
+2 -6
View File
@@ -9,6 +9,8 @@ import com.google.gson.GsonBuilder
import org.jetbrains.kotlin.gradle.internal.ensureParentDirsCreated import org.jetbrains.kotlin.gradle.internal.ensureParentDirsCreated
import java.io.File import java.io.File
// Gson set nulls reflective no matter on default values and non-null types
@Suppress("USELESS_ELVIS")
class PackageJson( class PackageJson(
var name: String, var name: String,
var version: String var version: String
@@ -29,24 +31,18 @@ class PackageJson(
var workspaces: Collection<String>? = null var workspaces: Collection<String>? = null
// Gson set nulls reflective no matter on default values and non-null types
@Suppress("USELESS_ELVIS")
val devDependencies = mutableMapOf<String, String>() val devDependencies = mutableMapOf<String, String>()
get() = field ?: mutableMapOf() get() = field ?: mutableMapOf()
@Suppress("USELESS_ELVIS")
val dependencies = mutableMapOf<String, String>() val dependencies = mutableMapOf<String, String>()
get() = field ?: mutableMapOf() get() = field ?: mutableMapOf()
@Suppress("USELESS_ELVIS")
val peerDependencies = mutableMapOf<String, String>() val peerDependencies = mutableMapOf<String, String>()
get() = field ?: mutableMapOf() get() = field ?: mutableMapOf()
@Suppress("USELESS_ELVIS")
val optionalDependencies = mutableMapOf<String, String>() val optionalDependencies = mutableMapOf<String, String>()
get() = field ?: mutableMapOf() get() = field ?: mutableMapOf()
@Suppress("USELESS_ELVIS")
val bundledDependencies = mutableListOf<String>() val bundledDependencies = mutableListOf<String>()
get() = field ?: mutableListOf() get() = field ?: mutableListOf()