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

[Gradle, JS] Move npm declarations to KotlinDependencyHandler

Browse Source 
KT-38331
This commit is contained in:
Ilya Goncharov
2020-05-18 14:04:20 +03:00
parent 85fa1859b3
commit c6e23ffa3b
3 changed files with 116 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/HasKotlinDependencies.kt
+108 -1
View File
@@ -10,8 +10,9 @@ import org.gradle.api.artifacts.Dependency
import org.gradle.api.artifacts.ExternalModuleDependency import org.gradle.api.artifacts.ExternalModuleDependency
import org.gradle.api.artifacts.ProjectDependency import org.gradle.api.artifacts.ProjectDependency
import org.gradle.util.ConfigureUtil import org.gradle.util.ConfigureUtil
import java.io.File
interface KotlinDependencyHandler : KotlinNpmDependencyHandler { interface KotlinDependencyHandler {
fun api(dependencyNotation: Any): Dependency? fun api(dependencyNotation: Any): Dependency?
fun api(dependencyNotation: String, configure: ExternalModuleDependency.() -> Unit): ExternalModuleDependency fun api(dependencyNotation: String, configure: ExternalModuleDependency.() -> Unit): ExternalModuleDependency
fun <T : Dependency> api(dependency: T, configure: T.() -> Unit): T fun <T : Dependency> api(dependency: T, configure: T.() -> Unit): T
@@ -52,6 +53,112 @@ interface KotlinDependencyHandler : KotlinNpmDependencyHandler {
project(listOf("path", "configuration").zip(listOfNotNull(path, configuration)).toMap()) project(listOf("path", "configuration").zip(listOfNotNull(path, configuration)).toMap())
fun project(notation: Map<String, Any?>): ProjectDependency fun project(notation: Map<String, Any?>): ProjectDependency
@Deprecated("Declaring NPM dependency without version is forbidden")
fun npm(name: String): Dependency
fun npm(
name: String,
version: String,
generateKotlinExternals: Boolean
): Dependency
fun npm(
name: String,
version: String
): Dependency = npm(
name = name,
version = version,
generateKotlinExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS
)
fun npm(
name: String,
directory: File,
generateKotlinExternals: Boolean
): Dependency
fun npm(
name: String,
directory: File
): Dependency = npm(
name = name,
directory = directory,
generateKotlinExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS
)
fun npm(
directory: File,
generateKotlinExternals: Boolean
): Dependency
fun npm(
directory: File
): Dependency = npm(
directory = directory,
generateKotlinExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS
)
fun devNpm(
name: String,
version: String
): Dependency
fun devNpm(
name: String,
directory: File
): Dependency
fun devNpm(
directory: File
): Dependency
fun optionalNpm(
name: String,
version: String,
generateKotlinExternals: Boolean
): Dependency
fun optionalNpm(
name: String,
version: String
): Dependency = optionalNpm(
name = name,
version = version,
generateKotlinExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS
)
fun optionalNpm(
name: String,
directory: File,
generateKotlinExternals: Boolean
): Dependency
fun optionalNpm(
name: String,
directory: File
): Dependency = optionalNpm(
name = name,
directory = directory,
generateKotlinExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS
)
fun optionalNpm(
directory: File,
generateKotlinExternals: Boolean
): Dependency
fun optionalNpm(
directory: File
): Dependency = optionalNpm(
directory = directory,
generateKotlinExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS
)
fun peerNpm(
name: String,
version: String
): Dependency
} }
interface HasKotlinDependencies { interface HasKotlinDependencies {
libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinNpmDependencyHandler.kt
-119
View File
@@ -1,119 +0,0 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.gradle.plugin
import org.gradle.api.artifacts.Dependency
import java.io.File
interface KotlinNpmDependencyHandler {
@Deprecated("Declaring NPM dependency without version is forbidden")
fun npm(name: String): Dependency
fun npm(
name: String,
version: String,
generateKotlinExternals: Boolean
): Dependency
fun npm(
name: String,
version: String
): Dependency = npm(
name = name,
version = version,
generateKotlinExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS
)
fun npm(
name: String,
directory: File,
generateKotlinExternals: Boolean
): Dependency
fun npm(
name: String,
directory: File
): Dependency = npm(
name = name,
directory = directory,
generateKotlinExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS
)
fun npm(
directory: File,
generateKotlinExternals: Boolean
): Dependency
fun npm(
directory: File
): Dependency = npm(
directory = directory,
generateKotlinExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS
)
fun devNpm(
name: String,
version: String
): Dependency
fun devNpm(
name: String,
directory: File
): Dependency
fun devNpm(
directory: File
): Dependency
fun optionalNpm(
name: String,
version: String,
generateKotlinExternals: Boolean
): Dependency
fun optionalNpm(
name: String,
version: String
): Dependency = optionalNpm(
name = name,
version = version,
generateKotlinExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS
)
fun optionalNpm(
name: String,
directory: File,
generateKotlinExternals: Boolean
): Dependency
fun optionalNpm(
name: String,
directory: File
): Dependency = optionalNpm(
name = name,
directory = directory,
generateKotlinExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS
)
fun optionalNpm(
directory: File,
generateKotlinExternals: Boolean
): Dependency
fun optionalNpm(
directory: File
): Dependency = optionalNpm(
directory = directory,
generateKotlinExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS
)
fun peerNpm(
name: String,
version: String
): Dependency
}
const val DEFAULT_GENERATE_KOTLIN_EXTERNALS = true
libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/NpmConstants.kt
+8
View File
@@ -0,0 +1,8 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.gradle.plugin
const val DEFAULT_GENERATE_KOTLIN_EXTERNALS = true