[Gradle, JS] Use default generate externals from property
This commit is contained in:
+60
-4
@@ -11,6 +11,7 @@ import org.gradle.api.artifacts.ExternalModuleDependency
|
|||||||
import org.gradle.api.artifacts.ProjectDependency
|
import org.gradle.api.artifacts.ProjectDependency
|
||||||
import org.jetbrains.kotlin.gradle.plugin.HasKotlinDependencies
|
import org.jetbrains.kotlin.gradle.plugin.HasKotlinDependencies
|
||||||
import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler
|
import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler
|
||||||
|
import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider
|
||||||
import org.jetbrains.kotlin.gradle.targets.js.npm.NpmDependency
|
import org.jetbrains.kotlin.gradle.targets.js.npm.NpmDependency
|
||||||
import org.jetbrains.kotlin.gradle.targets.js.npm.directoryNpmDependency
|
import org.jetbrains.kotlin.gradle.targets.js.npm.directoryNpmDependency
|
||||||
import org.jetbrains.kotlin.gradle.targets.js.npm.moduleName
|
import org.jetbrains.kotlin.gradle.targets.js.npm.moduleName
|
||||||
@@ -103,6 +104,16 @@ class DefaultKotlinDependencyHandler(
|
|||||||
generateExternals = generateExternals
|
generateExternals = generateExternals
|
||||||
)
|
)
|
||||||
|
|
||||||
|
override fun npm(
|
||||||
|
name: String,
|
||||||
|
version: String
|
||||||
|
): NpmDependency =
|
||||||
|
npm(
|
||||||
|
name = name,
|
||||||
|
version = version,
|
||||||
|
generateExternals = defaultGenerateExternals()
|
||||||
|
)
|
||||||
|
|
||||||
override fun npm(
|
override fun npm(
|
||||||
name: String,
|
name: String,
|
||||||
directory: File,
|
directory: File,
|
||||||
@@ -115,6 +126,16 @@ class DefaultKotlinDependencyHandler(
|
|||||||
generateExternals = generateExternals
|
generateExternals = generateExternals
|
||||||
)
|
)
|
||||||
|
|
||||||
|
override fun npm(
|
||||||
|
name: String,
|
||||||
|
directory: File
|
||||||
|
): NpmDependency =
|
||||||
|
npm(
|
||||||
|
name = name,
|
||||||
|
directory = directory,
|
||||||
|
generateExternals = defaultGenerateExternals()
|
||||||
|
)
|
||||||
|
|
||||||
override fun npm(
|
override fun npm(
|
||||||
directory: File,
|
directory: File,
|
||||||
generateExternals: Boolean
|
generateExternals: Boolean
|
||||||
@@ -125,6 +146,12 @@ class DefaultKotlinDependencyHandler(
|
|||||||
generateExternals = generateExternals
|
generateExternals = generateExternals
|
||||||
)
|
)
|
||||||
|
|
||||||
|
override fun npm(directory: File): NpmDependency =
|
||||||
|
npm(
|
||||||
|
directory = directory,
|
||||||
|
generateExternals = defaultGenerateExternals()
|
||||||
|
)
|
||||||
|
|
||||||
override fun devNpm(
|
override fun devNpm(
|
||||||
name: String,
|
name: String,
|
||||||
version: String
|
version: String
|
||||||
@@ -136,7 +163,10 @@ class DefaultKotlinDependencyHandler(
|
|||||||
scope = NpmDependency.Scope.DEV
|
scope = NpmDependency.Scope.DEV
|
||||||
)
|
)
|
||||||
|
|
||||||
override fun devNpm(name: String, directory: File): NpmDependency =
|
override fun devNpm(
|
||||||
|
name: String,
|
||||||
|
directory: File
|
||||||
|
): NpmDependency =
|
||||||
directoryNpmDependency(
|
directoryNpmDependency(
|
||||||
name = name,
|
name = name,
|
||||||
directory = directory,
|
directory = directory,
|
||||||
@@ -163,18 +193,35 @@ class DefaultKotlinDependencyHandler(
|
|||||||
generateExternals = generateExternals
|
generateExternals = generateExternals
|
||||||
)
|
)
|
||||||
|
|
||||||
|
override fun optionalNpm(
|
||||||
|
name: String,
|
||||||
|
version: String
|
||||||
|
): NpmDependency =
|
||||||
|
optionalNpm(
|
||||||
|
name,
|
||||||
|
version,
|
||||||
|
defaultGenerateExternals()
|
||||||
|
)
|
||||||
|
|
||||||
override fun optionalNpm(
|
override fun optionalNpm(
|
||||||
name: String,
|
name: String,
|
||||||
directory: File,
|
directory: File,
|
||||||
generateExternals: Boolean
|
generateExternals: Boolean
|
||||||
): NpmDependency =
|
): NpmDependency =
|
||||||
directoryNpmDependency(
|
directoryNpmDependency(
|
||||||
name,
|
name = name,
|
||||||
directory,
|
directory = directory,
|
||||||
NpmDependency.Scope.OPTIONAL,
|
scope = NpmDependency.Scope.OPTIONAL,
|
||||||
generateExternals = generateExternals
|
generateExternals = generateExternals
|
||||||
)
|
)
|
||||||
|
|
||||||
|
override fun optionalNpm(name: String, directory: File): NpmDependency =
|
||||||
|
optionalNpm(
|
||||||
|
name = name,
|
||||||
|
directory = directory,
|
||||||
|
generateExternals = defaultGenerateExternals()
|
||||||
|
)
|
||||||
|
|
||||||
override fun optionalNpm(
|
override fun optionalNpm(
|
||||||
directory: File,
|
directory: File,
|
||||||
generateExternals: Boolean
|
generateExternals: Boolean
|
||||||
@@ -185,6 +232,12 @@ class DefaultKotlinDependencyHandler(
|
|||||||
generateExternals = generateExternals
|
generateExternals = generateExternals
|
||||||
)
|
)
|
||||||
|
|
||||||
|
override fun optionalNpm(directory: File): NpmDependency =
|
||||||
|
optionalNpm(
|
||||||
|
directory = directory,
|
||||||
|
generateExternals = defaultGenerateExternals()
|
||||||
|
)
|
||||||
|
|
||||||
override fun peerNpm(
|
override fun peerNpm(
|
||||||
name: String,
|
name: String,
|
||||||
version: String
|
version: String
|
||||||
@@ -196,6 +249,9 @@ class DefaultKotlinDependencyHandler(
|
|||||||
scope = NpmDependency.Scope.PEER
|
scope = NpmDependency.Scope.PEER
|
||||||
)
|
)
|
||||||
|
|
||||||
|
private fun defaultGenerateExternals() =
|
||||||
|
PropertiesProvider(project).jsGenerateExternals
|
||||||
|
|
||||||
private fun directoryNpmDependency(
|
private fun directoryNpmDependency(
|
||||||
name: String,
|
name: String,
|
||||||
directory: File,
|
directory: File,
|
||||||
|
|||||||
Reference in New Issue
Block a user