From 4fb1e4614d3cc790225b662cf127a3630e28e22d Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Wed, 6 May 2020 19:24:13 +0300
Subject: [PATCH] [Gradle, JS] Remove deprecated npm dependency with org

#KT-38683 fixed
#KT-38994 fixed
---
 .../kotlin/gradle/plugin/KotlinNpmDependencyHandler.kt       | 5 -----
 .../gradle/plugin/mpp/DefaultKotlinDependencyHandler.kt      | 3 ---
 2 files changed, 8 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinNpmDependencyHandler.kt b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinNpmDependencyHandler.kt
index 77b271ed409..0ee0d525b06 100644
--- a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinNpmDependencyHandler.kt
+++ b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinNpmDependencyHandler.kt
@@ -17,11 +17,6 @@ interface KotlinNpmDependencyHandler {
 
     fun npm(directory: File): Dependency
 
-    @Deprecated(
-        message = "Use npm(name, version) instead. Name like in package.json"
-    )
-    fun npm(org: String? = null, packageName: String, version: String = "*"): Dependency
-
     fun devNpm(name: String, version: String): Dependency
 
     fun devNpm(name: String, directory: File): Dependency
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/DefaultKotlinDependencyHandler.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/DefaultKotlinDependencyHandler.kt
index 9107a3d9f7e..aee998c1b06 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/DefaultKotlinDependencyHandler.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/DefaultKotlinDependencyHandler.kt
@@ -113,9 +113,6 @@ class DefaultKotlinDependencyHandler(
             directory = directory
         )
 
-    override fun npm(org: String?, packageName: String, version: String) =
-        npm("${if (org != null) "@$org/" else ""}$packageName", version)
-
     override fun devNpm(name: String, version: String): NpmDependency =
         NpmDependency(
             project = project,