[Gradle, JS] KT-36784 Move fromSrcPackageJson
#KT-32466 fixed #KT-36784 fixed #KT-36864 fixed
This commit is contained in:
-6
@@ -5,7 +5,6 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.gradle.targets.js.npm
|
package org.jetbrains.kotlin.gradle.targets.js.npm
|
||||||
|
|
||||||
import com.google.gson.Gson
|
|
||||||
import com.google.gson.GsonBuilder
|
import com.google.gson.GsonBuilder
|
||||||
import org.gradle.api.Project
|
import org.gradle.api.Project
|
||||||
import org.gradle.api.artifacts.ResolvedDependency
|
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
|
private val File.isCompatibleArchive
|
||||||
get() = isFile
|
get() = isFile
|
||||||
&& (extension == "jar"
|
&& (extension == "jar"
|
||||||
|
|||||||
+7
-1
@@ -5,6 +5,7 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.gradle.targets.js.npm
|
package org.jetbrains.kotlin.gradle.targets.js.npm
|
||||||
|
|
||||||
|
import com.google.gson.Gson
|
||||||
import com.google.gson.GsonBuilder
|
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
|
||||||
@@ -70,4 +71,9 @@ class PackageJson(
|
|||||||
gson.toJson(this, it)
|
gson.toJson(this, it)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun fromSrcPackageJson(packageJson: File?): PackageJson? =
|
||||||
|
packageJson?.reader()?.use {
|
||||||
|
Gson().fromJson(it, PackageJson::class.java)
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user