azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle] Implement AddNpmDependencyExtensionProjectSetupAction

Browse Source 
KT-61634
This commit is contained in:
Sebastian Sellmair
2023-10-16 18:00:13 +02:00
committed by Space Team
parent ff6b883cb4
commit 13492d3316
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt
-3
View File
@@ -47,7 +47,6 @@ import org.jetbrains.kotlin.gradle.targets.js.KotlinJsPlugin
import org.jetbrains.kotlin.gradle.targets.js.KotlinWasmTargetAttribute
import org.jetbrains.kotlin.gradle.targets.js.nodejs.DefaultUnameExecutorVariantFactory
import org.jetbrains.kotlin.gradle.targets.js.nodejs.UnameExecutor
import org.jetbrains.kotlin.gradle.targets.js.npm.addNpmDependencyExtension
import org.jetbrains.kotlin.gradle.targets.metadata.isKotlinGranularMetadataEnabled
import org.jetbrains.kotlin.gradle.targets.native.internal.CInteropKlibLibraryElements
import org.jetbrains.kotlin.gradle.targets.native.internal.CInteropCommonizerArtifactTypeAttribute
@@ -265,8 +264,6 @@ abstract class KotlinBasePluginWrapper : DefaultKotlinBasePlugin() {
project.runKotlinProjectSetupActions()
project.addNpmDependencyExtension()
project.registerBuildKotlinToolingMetadataTask()
project.setupDiagnosticsChecksAndReporting()
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/registerKotlinPluginExtensions.kt
+2 -1
View File
@@ -26,13 +26,14 @@ import org.jetbrains.kotlin.gradle.plugin.diagnostics.checkers.NoKotlinTargetsDe
import org.jetbrains.kotlin.gradle.plugin.diagnostics.checkers.PreHmppDependenciesUsageChecker
import org.jetbrains.kotlin.gradle.plugin.diagnostics.checkers.UnusedSourceSetsChecker
import org.jetbrains.kotlin.gradle.plugin.diagnostics.checkers.WasmSourceSetsNotFoundChecker
import org.jetbrains.kotlin.gradle.targets.js.npm.AddNpmDependencyExtensionProjectSetupAction
/**
* Active Extensions (using the [KotlinGradlePluginExtensionPoint] infrastructure) will be registered here by the Kotlin Gradle Plugin.
*/
internal fun Project.registerKotlinPluginExtensions() {
KotlinProjectSetupAction.extensionPoint.apply {
register(project, AddNpmDependencyExtensionProjectSetupAction)
}
KotlinGradleProjectChecker.extensionPoint.apply {
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependencyExtension.kt
+2 -2
View File
@@ -10,6 +10,7 @@ import groovy.lang.GString
import org.gradle.api.Project
import org.gradle.api.plugins.ExtensionAware
import org.gradle.api.reflect.TypeOf
import org.jetbrains.kotlin.gradle.plugin.KotlinProjectSetupAction
import org.jetbrains.kotlin.gradle.plugin.warnNpmGenerateExternals
import org.jetbrains.kotlin.gradle.targets.js.npm.NpmDependency.Scope.*
import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName
@@ -63,9 +64,8 @@ interface DevNpmDependencyExtension :
interface PeerNpmDependencyExtension :
BaseNpmDependencyExtension
internal fun Project.addNpmDependencyExtension() {
internal val AddNpmDependencyExtensionProjectSetupAction = KotlinProjectSetupAction {
val extensions = (dependencies as ExtensionAware).extensions
values()
.forEach { scope ->
val type = when (scope) {