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

[Gradle, JS] KT-36784 Move fromSrcPackageJson

Browse Source 
#KT-32466 fixed
#KT-36784 fixed
#KT-36864 fixed
This commit is contained in:
Ilya Goncharov
2020-03-30 20:02:26 +03:00
parent 253b8587e4
commit f30875f79b
2 changed files with 7 additions and 7 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/GradleNodeModuleBuilder.kt
-6
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.gradle.targets.js.npm
import com.google.gson.Gson
import com.google.gson.GsonBuilder
import org.gradle.api.Project
import org.gradle.api.artifacts.ResolvedDependency
@@ -63,11 +62,6 @@ internal class GradleNodeModuleBuilder(
}
}
internal fun fromSrcPackageJson(packageJson: File?): PackageJson? =
packageJson?.reader()?.use {
Gson().fromJson(it, PackageJson::class.java)
}
private val File.isCompatibleArchive
get() = isFile
&& (extension == "jar"
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/PackageJson.kt
+7 -1
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.gradle.targets.js.npm
import com.google.gson.Gson
import com.google.gson.GsonBuilder
import org.jetbrains.kotlin.gradle.internal.ensureParentDirsCreated
import java.io.File
@@ -70,4 +71,9 @@ class PackageJson(
gson.toJson(this, it)
}
}
}
}
fun fromSrcPackageJson(packageJson: File?): PackageJson? =
packageJson?.reader()?.use {
Gson().fromJson(it, PackageJson::class.java)
}