From f30875f79bac9c24cf6142b49a2d626cfb6331c1 Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Mon, 30 Mar 2020 20:02:26 +0300
Subject: [PATCH] [Gradle, JS] KT-36784 Move fromSrcPackageJson

#KT-32466 fixed
#KT-36784 fixed
#KT-36864 fixed
---
 .../gradle/targets/js/npm/GradleNodeModuleBuilder.kt      | 6 ------
 .../jetbrains/kotlin/gradle/targets/js/npm/PackageJson.kt | 8 +++++++-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/GradleNodeModuleBuilder.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/GradleNodeModuleBuilder.kt
index bb925b86482..4b69ed6543d 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/GradleNodeModuleBuilder.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/GradleNodeModuleBuilder.kt
@@ -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"
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 97826bc24b0..af750da91d8 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
@@ -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)
         }
     }
-}
\ No newline at end of file
+}
+
+fun fromSrcPackageJson(packageJson: File?): PackageJson? =
+    packageJson?.reader()?.use {
+        Gson().fromJson(it, PackageJson::class.java)
+    }
\ No newline at end of file