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

[Gradle, JS] Add compatible operators for npm dependencies

Browse Source
This commit is contained in:
Ilya Goncharov
2019-11-22 09:44:42 +03:00
parent 26cd392a9a
commit 028c73d959
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsPlugin.kt
+13 -8
View File
@@ -17,14 +17,10 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsSingleTargetPreset
import org.jetbrains.kotlin.gradle.targets.js.npm.NpmDependency
import org.jetbrains.kotlin.gradle.utils.checkGradleCompatibility
interface Npm : (String) -> NpmDependency
interface Npm {
operator fun invoke(packageName: String, version: String = "*"): NpmDependency
fun Npm(lambda: (name: String) -> NpmDependency): Npm {
return object : Npm {
override fun invoke(name: String): NpmDependency {
return lambda(name)
}
}
operator fun invoke(org: String, packageName: String, version: String = "*"): NpmDependency
}
open class KotlinJsPlugin(
@@ -39,7 +35,16 @@ open class KotlinJsPlugin(
checkGradleCompatibility()
val npm = Npm { name: String -> NpmDependency(project, null, name, "*") }
val npm = object : Npm {
override fun invoke(packageName: String, version: String): NpmDependency {
return NpmDependency(project, null, packageName, version)
}
override fun invoke(org: String, packageName: String, version: String): NpmDependency {
return NpmDependency(project, org, packageName, version)
}
}
(project.dependencies as ExtensionAware)
.extensions