From 8ac5ebac840c932cdd7b97626fd6b03d84f21162 Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Tue, 12 May 2020 18:16:05 +0300
Subject: [PATCH] [Gradle, JS] Separate interface for directory dependency with
 externals

KT-38331
---
 .../gradle/targets/js/npm/NpmDependencyExtension.kt      | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependencyExtension.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependencyExtension.kt
index d99720325f0..8ebf4aa705c 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependencyExtension.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependencyExtension.kt
@@ -21,19 +21,21 @@ interface BaseNpmDependencyExtension {
     operator fun invoke(name: String, version: String): NpmDependency
 }
 
-interface NpmDirectoryDependencyExtension {
+interface NpmDirectoryDependencyExtension : BaseNpmDependencyExtension {
     operator fun invoke(name: String, directory: File): NpmDependency
 
     operator fun invoke(directory: File): NpmDependency
 }
 
-interface NpmDependencyWithExternalsExtension {
+interface NpmDependencyWithExternalsExtension : BaseNpmDependencyExtension {
     operator fun invoke(
         name: String,
         version: String,
         generateKotlinExternals: Boolean
     ): NpmDependency
+}
 
+interface NpmDirectoryDependencyWithExternalsExtension : NpmDirectoryDependencyExtension {
     operator fun invoke(
         name: String,
         directory: File,
@@ -48,8 +50,9 @@ interface NpmDependencyWithExternalsExtension {
 
 interface NpmDependencyExtension :
     BaseNpmDependencyExtension,
+    NpmDependencyWithExternalsExtension,
     NpmDirectoryDependencyExtension,
-    NpmDependencyWithExternalsExtension
+    NpmDirectoryDependencyWithExternalsExtension
 
 interface DevNpmDependencyExtension :
     BaseNpmDependencyExtension,