From f14d9679e072ec29e22c5aed380155b47a476292 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Fri, 7 Oct 2022 19:50:14 +0200 Subject: [PATCH] [Gradle, JS] No externalsDir --- .../jetbrains/kotlin/gradle/targets/js/npm/NpmProject.kt | 7 ------- .../js/npm/resolver/KotlinCompilationNpmResolver.kt | 7 ------- 2 files changed, 14 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmProject.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmProject.kt index 44f9fbd1408..2fdcb3a4647 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmProject.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmProject.kt @@ -70,13 +70,6 @@ open class NpmProject(@Transient val compilation: KotlinJsCompilation) : Seriali val main: String get() = "$DIST_FOLDER${File.separator}$name$extension" - val externalsDirRoot by lazy { - project.buildDir.resolve("externals").resolve(name) - } - - val externalsDir: File - get() = externalsDirRoot.resolve("src") - val publicPackageJsonTaskName: String get() = compilation.disambiguateName(PublicPackageJsonTask.NAME) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt index 09dc8b1c5d5..65753a222b6 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt @@ -180,13 +180,6 @@ internal class KotlinCompilationNpmResolver( // We don't have `kotlin-js-test-runner` in NPM yet all.dependencies.add(nodeJs_.versions.kotlinJsTestRunner.createDependency(project)) - project.dependencies.add( - all.name, - project.fileTree(npmProject.externalsDir).include { - it.file.isCompatibleArchive - } - ) - return all }