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

[Gradle, JS] Rename generateKotlinExternals on generateExternals

Browse Source
This commit is contained in:
Ilya Goncharov
2020-06-05 12:29:39 +03:00
parent 85840578ad
commit 6316949e36
5 changed files with 71 additions and 71 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
+12 -12
View File
@@ -60,7 +60,7 @@ interface KotlinDependencyHandler {
fun npm( fun npm(
name: String, name: String,
version: String, version: String,
generateKotlinExternals: Boolean generateExternals: Boolean
): Dependency ): Dependency
fun npm( fun npm(
@@ -69,13 +69,13 @@ interface KotlinDependencyHandler {
): Dependency = npm( ): Dependency = npm(
name = name, name = name,
version = version, version = version,
generateKotlinExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS generateExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS
) )
fun npm( fun npm(
name: String, name: String,
directory: File, directory: File,
generateKotlinExternals: Boolean generateExternals: Boolean
): Dependency ): Dependency
fun npm( fun npm(
@@ -84,19 +84,19 @@ interface KotlinDependencyHandler {
): Dependency = npm( ): Dependency = npm(
name = name, name = name,
directory = directory, directory = directory,
generateKotlinExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS generateExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS
) )
fun npm( fun npm(
directory: File, directory: File,
generateKotlinExternals: Boolean generateExternals: Boolean
): Dependency ): Dependency
fun npm( fun npm(
directory: File directory: File
): Dependency = npm( ): Dependency = npm(
directory = directory, directory = directory,
generateKotlinExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS generateExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS
) )
fun devNpm( fun devNpm(
@@ -116,7 +116,7 @@ interface KotlinDependencyHandler {
fun optionalNpm( fun optionalNpm(
name: String, name: String,
version: String, version: String,
generateKotlinExternals: Boolean generateExternals: Boolean
): Dependency ): Dependency
fun optionalNpm( fun optionalNpm(
@@ -125,13 +125,13 @@ interface KotlinDependencyHandler {
): Dependency = optionalNpm( ): Dependency = optionalNpm(
name = name, name = name,
version = version, version = version,
generateKotlinExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS generateExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS
) )
fun optionalNpm( fun optionalNpm(
name: String, name: String,
directory: File, directory: File,
generateKotlinExternals: Boolean generateExternals: Boolean
): Dependency ): Dependency
fun optionalNpm( fun optionalNpm(
@@ -140,19 +140,19 @@ interface KotlinDependencyHandler {
): Dependency = optionalNpm( ): Dependency = optionalNpm(
name = name, name = name,
directory = directory, directory = directory,
generateKotlinExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS generateExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS
) )
fun optionalNpm( fun optionalNpm(
directory: File, directory: File,
generateKotlinExternals: Boolean generateExternals: Boolean
): Dependency ): Dependency
fun optionalNpm( fun optionalNpm(
directory: File directory: File
): Dependency = optionalNpm( ): Dependency = optionalNpm(
directory = directory, directory = directory,
generateKotlinExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS generateExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS
) )
fun peerNpm( fun peerNpm(
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/DefaultKotlinDependencyHandler.kt
+15 -15
View File
@@ -94,35 +94,35 @@ class DefaultKotlinDependencyHandler(
override fun npm( override fun npm(
name: String, name: String,
version: String, version: String,
generateKotlinExternals: Boolean generateExternals: Boolean
): NpmDependency = ): NpmDependency =
NpmDependency( NpmDependency(
project = project, project = project,
name = name, name = name,
version = version, version = version,
generateKotlinExternals = generateKotlinExternals generateExternals = generateExternals
) )
override fun npm( override fun npm(
name: String, name: String,
directory: File, directory: File,
generateKotlinExternals: Boolean generateExternals: Boolean
): NpmDependency = ): NpmDependency =
directoryNpmDependency( directoryNpmDependency(
name = name, name = name,
directory = directory, directory = directory,
scope = NpmDependency.Scope.NORMAL, scope = NpmDependency.Scope.NORMAL,
generateKotlinExternals = generateKotlinExternals generateExternals = generateExternals
) )
override fun npm( override fun npm(
directory: File, directory: File,
generateKotlinExternals: Boolean generateExternals: Boolean
): NpmDependency = ): NpmDependency =
npm( npm(
name = moduleName(directory), name = moduleName(directory),
directory = directory, directory = directory,
generateKotlinExternals = generateKotlinExternals generateExternals = generateExternals
) )
override fun devNpm( override fun devNpm(
@@ -141,7 +141,7 @@ class DefaultKotlinDependencyHandler(
name = name, name = name,
directory = directory, directory = directory,
scope = NpmDependency.Scope.DEV, scope = NpmDependency.Scope.DEV,
generateKotlinExternals = false generateExternals = false
) )
override fun devNpm(directory: File): NpmDependency = override fun devNpm(directory: File): NpmDependency =
@@ -153,36 +153,36 @@ class DefaultKotlinDependencyHandler(
override fun optionalNpm( override fun optionalNpm(
name: String, name: String,
version: String, version: String,
generateKotlinExternals: Boolean generateExternals: Boolean
): NpmDependency = ): NpmDependency =
NpmDependency( NpmDependency(
project = project, project = project,
name = name, name = name,
version = version, version = version,
scope = NpmDependency.Scope.OPTIONAL, scope = NpmDependency.Scope.OPTIONAL,
generateKotlinExternals = generateKotlinExternals generateExternals = generateExternals
) )
override fun optionalNpm( override fun optionalNpm(
name: String, name: String,
directory: File, directory: File,
generateKotlinExternals: Boolean generateExternals: Boolean
): NpmDependency = ): NpmDependency =
directoryNpmDependency( directoryNpmDependency(
name, name,
directory, directory,
NpmDependency.Scope.OPTIONAL, NpmDependency.Scope.OPTIONAL,
generateKotlinExternals = generateKotlinExternals generateExternals = generateExternals
) )
override fun optionalNpm( override fun optionalNpm(
directory: File, directory: File,
generateKotlinExternals: Boolean generateExternals: Boolean
): NpmDependency = ): NpmDependency =
optionalNpm( optionalNpm(
name = moduleName(directory), name = moduleName(directory),
directory = directory, directory = directory,
generateKotlinExternals = generateKotlinExternals generateExternals = generateExternals
) )
override fun peerNpm( override fun peerNpm(
@@ -200,13 +200,13 @@ class DefaultKotlinDependencyHandler(
name: String, name: String,
directory: File, directory: File,
scope: NpmDependency.Scope, scope: NpmDependency.Scope,
generateKotlinExternals: Boolean generateExternals: Boolean
): NpmDependency = ): NpmDependency =
directoryNpmDependency( directoryNpmDependency(
project = project, project = project,
name = name, name = name,
directory = directory, directory = directory,
scope = scope, scope = scope,
generateKotlinExternals = generateKotlinExternals generateExternals = generateExternals
) )
} }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DtsResolver.kt
+1 -1
View File
@@ -21,7 +21,7 @@ class DtsResolver(val npmProject: NpmProject) {
fun getAllDts(externalNpmDependencies: Collection<NpmDependency>): List<Dts> { fun getAllDts(externalNpmDependencies: Collection<NpmDependency>): List<Dts> {
return externalNpmDependencies return externalNpmDependencies
.asSequence() .asSequence()
.filter { it.generateKotlinExternals } .filter { it.generateExternals }
.filter { it.scope == NORMAL || it.scope == OPTIONAL } .filter { it.scope == NORMAL || it.scope == OPTIONAL }
.mapNotNullTo(mutableSetOf()) { typeModules.resolve(it.key)?.let { file -> Dts(file.canonicalFile, it) } } .mapNotNullTo(mutableSetOf()) { typeModules.resolve(it.key)?.let { file -> Dts(file.canonicalFile, it) } }
.sortedBy { it.inputKey } .sortedBy { it.inputKey }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependency.kt
+3 -3
View File
@@ -25,7 +25,7 @@ data class NpmDependency(
private val name: String, private val name: String,
private val version: String, private val version: String,
val scope: Scope = Scope.NORMAL, val scope: Scope = Scope.NORMAL,
val generateKotlinExternals: Boolean = false val generateExternals: Boolean = false
) : SelfResolvingDependency, ) : SelfResolvingDependency,
SelfResolvingDependencyInternal, SelfResolvingDependencyInternal,
ResolvableDependency, ResolvableDependency,
@@ -117,7 +117,7 @@ internal fun directoryNpmDependency(
name: String, name: String,
directory: File, directory: File,
scope: NpmDependency.Scope, scope: NpmDependency.Scope,
generateKotlinExternals: Boolean generateExternals: Boolean
): NpmDependency { ): NpmDependency {
check(directory.isDirectory) { check(directory.isDirectory) {
"Dependency on local path should point on directory but $directory found" "Dependency on local path should point on directory but $directory found"
@@ -128,7 +128,7 @@ internal fun directoryNpmDependency(
name = name, name = name,
version = fileVersion(directory), version = fileVersion(directory),
scope = scope, scope = scope,
generateKotlinExternals = generateKotlinExternals generateExternals = generateExternals
) )
} }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependencyExtension.kt
+40 -40
View File
@@ -31,7 +31,7 @@ interface NpmDependencyWithExternalsExtension : BaseNpmDependencyExtension {
operator fun invoke( operator fun invoke(
name: String, name: String,
version: String, version: String,
generateKotlinExternals: Boolean generateExternals: Boolean
): NpmDependency ): NpmDependency
} }
@@ -39,12 +39,12 @@ interface NpmDirectoryDependencyWithExternalsExtension : NpmDirectoryDependencyE
operator fun invoke( operator fun invoke(
name: String, name: String,
directory: File, directory: File,
generateKotlinExternals: Boolean generateExternals: Boolean
): NpmDependency ): NpmDependency
operator fun invoke( operator fun invoke(
directory: File, directory: File,
generateKotlinExternals: Boolean generateExternals: Boolean
): NpmDependency ): NpmDependency
} }
@@ -106,13 +106,13 @@ private fun scopePrefix(scope: NpmDependency.Scope): String {
private abstract class NpmDependencyExtensionDelegate( private abstract class NpmDependencyExtensionDelegate(
protected val project: Project, protected val project: Project,
protected val scope: NpmDependency.Scope, protected val scope: NpmDependency.Scope,
protected val _defaultGenerateKotlinExternals: Boolean? protected val _defaultGenerateExternals: Boolean?
) : NpmDependencyExtension, ) : NpmDependencyExtension,
DevNpmDependencyExtension, DevNpmDependencyExtension,
PeerNpmDependencyExtension, PeerNpmDependencyExtension,
Closure<NpmDependency>(project.dependencies) { Closure<NpmDependency>(project.dependencies) {
protected val defaultGenerateKotlinExternals: Boolean protected val defaultGenerateExternals: Boolean
get() = _defaultGenerateKotlinExternals ?: false get() = _defaultGenerateExternals ?: false
override fun invoke(name: String): NpmDependency = override fun invoke(name: String): NpmDependency =
onlyNameNpmDependency(name) onlyNameNpmDependency(name)
@@ -120,44 +120,44 @@ private abstract class NpmDependencyExtensionDelegate(
override operator fun invoke( override operator fun invoke(
name: String, name: String,
version: String, version: String,
generateKotlinExternals: Boolean generateExternals: Boolean
): NpmDependency = ): NpmDependency =
NpmDependency( NpmDependency(
project = project, project = project,
name = name, name = name,
version = version, version = version,
scope = scope, scope = scope,
generateKotlinExternals = generateKotlinExternals generateExternals = generateExternals
) )
override fun invoke(name: String, version: String): NpmDependency = override fun invoke(name: String, version: String): NpmDependency =
invoke( invoke(
name = name, name = name,
version = version, version = version,
generateKotlinExternals = defaultGenerateKotlinExternals generateExternals = defaultGenerateExternals
) )
override fun invoke(name: String, directory: File): NpmDependency = override fun invoke(name: String, directory: File): NpmDependency =
invoke( invoke(
name = name, name = name,
directory = directory, directory = directory,
generateKotlinExternals = defaultGenerateKotlinExternals generateExternals = defaultGenerateExternals
) )
override fun invoke(directory: File): NpmDependency = override fun invoke(directory: File): NpmDependency =
invoke( invoke(
directory = directory, directory = directory,
generateKotlinExternals = defaultGenerateKotlinExternals generateExternals = defaultGenerateExternals
) )
override operator fun invoke( override operator fun invoke(
directory: File, directory: File,
generateKotlinExternals: Boolean generateExternals: Boolean
): NpmDependency = ): NpmDependency =
invoke( invoke(
name = moduleName(directory), name = moduleName(directory),
directory = directory, directory = directory,
generateKotlinExternals = generateKotlinExternals generateExternals = generateExternals
) )
override fun call(vararg args: Any?): NpmDependency { override fun call(vararg args: Any?): NpmDependency {
@@ -177,7 +177,7 @@ private abstract class NpmDependencyExtensionDelegate(
private fun withName(name: String, vararg args: Any?): NpmDependency { private fun withName(name: String, vararg args: Any?): NpmDependency {
val arg1 = if (args.size > 1) args[1] else null val arg1 = if (args.size > 1) args[1] else null
val generateKotlinExternals = generateKotlinExternalsIfPossible(*args) val generateExternals = generateExternalsIfPossible(*args)
return when (arg1) { return when (arg1) {
null -> invoke( null -> invoke(
@@ -186,12 +186,12 @@ private abstract class NpmDependencyExtensionDelegate(
is String -> invoke( is String -> invoke(
name = name, name = name,
version = arg1, version = arg1,
generateKotlinExternals = generateKotlinExternals generateExternals = generateExternals
) )
else -> processNamedNonStringSecondArgument( else -> processNamedNonStringSecondArgument(
name, name,
arg1, arg1,
generateKotlinExternals, generateExternals,
*args *args
) )
} }
@@ -200,7 +200,7 @@ private abstract class NpmDependencyExtensionDelegate(
protected abstract fun processNamedNonStringSecondArgument( protected abstract fun processNamedNonStringSecondArgument(
name: String, name: String,
arg: Any?, arg: Any?,
generateKotlinExternals: Boolean, generateExternals: Boolean,
vararg args: Any? vararg args: Any?
): NpmDependency ): NpmDependency
@@ -218,27 +218,27 @@ private abstract class NpmDependencyExtensionDelegate(
return listOf("${scopePrefix(scope)}('name', 'version')" to "name:version") return listOf("${scopePrefix(scope)}('name', 'version')" to "name:version")
} }
protected fun generateKotlinExternalsIfPossible(vararg args: Any?): Boolean { protected fun generateExternalsIfPossible(vararg args: Any?): Boolean {
val arg2 = (if (args.size > 2) args[2] else null) as? Boolean val arg2 = (if (args.size > 2) args[2] else null) as? Boolean
if (arg2 != null && _defaultGenerateKotlinExternals == null) { if (arg2 != null && _defaultGenerateExternals == null) {
npmDeclarationException(args) npmDeclarationException(args)
} }
return arg2 ?: defaultGenerateKotlinExternals return arg2 ?: defaultGenerateExternals
} }
} }
private class DefaultNpmDependencyExtension( private class DefaultNpmDependencyExtension(
project: Project, project: Project,
scope: NpmDependency.Scope, scope: NpmDependency.Scope,
defaultGenerateKotlinExternals: Boolean? defaultGenerateExternals: Boolean?
) : Closure<NpmDependency>(project.dependencies), ) : Closure<NpmDependency>(project.dependencies),
NpmDependencyExtension { NpmDependencyExtension {
private val delegate = defaultNpmDependencyDelegate( private val delegate = defaultNpmDependencyDelegate(
project, project,
scope, scope,
defaultGenerateKotlinExternals defaultGenerateExternals
) )
override fun invoke(name: String): NpmDependency = override fun invoke(name: String): NpmDependency =
@@ -253,14 +253,14 @@ private class DefaultNpmDependencyExtension(
override fun invoke(directory: File): NpmDependency = override fun invoke(directory: File): NpmDependency =
delegate.invoke(directory) delegate.invoke(directory)
override fun invoke(name: String, version: String, generateKotlinExternals: Boolean): NpmDependency = override fun invoke(name: String, version: String, generateExternals: Boolean): NpmDependency =
delegate.invoke(name, version, generateKotlinExternals) delegate.invoke(name, version, generateExternals)
override fun invoke(name: String, directory: File, generateKotlinExternals: Boolean): NpmDependency = override fun invoke(name: String, directory: File, generateExternals: Boolean): NpmDependency =
delegate.invoke(name, directory, generateKotlinExternals) delegate.invoke(name, directory, generateExternals)
override fun invoke(directory: File, generateKotlinExternals: Boolean): NpmDependency = override fun invoke(directory: File, generateExternals: Boolean): NpmDependency =
delegate.invoke(directory, generateKotlinExternals) delegate.invoke(directory, generateExternals)
override fun call(vararg args: Any?): NpmDependency = override fun call(vararg args: Any?): NpmDependency =
delegate.call(*args) delegate.call(*args)
@@ -295,33 +295,33 @@ private class DefaultDevNpmDependencyExtension(
private fun defaultNpmDependencyDelegate( private fun defaultNpmDependencyDelegate(
project: Project, project: Project,
scope: NpmDependency.Scope, scope: NpmDependency.Scope,
defaultGenerateKotlinExternals: Boolean? defaultGenerateExternals: Boolean?
): NpmDependencyExtensionDelegate { ): NpmDependencyExtensionDelegate {
return object : NpmDependencyExtensionDelegate( return object : NpmDependencyExtensionDelegate(
project, project,
scope, scope,
defaultGenerateKotlinExternals defaultGenerateExternals
) { ) {
override operator fun invoke( override operator fun invoke(
name: String, name: String,
directory: File, directory: File,
generateKotlinExternals: Boolean generateExternals: Boolean
): NpmDependency = ): NpmDependency =
directoryNpmDependency( directoryNpmDependency(
project = project, project = project,
name = name, name = name,
directory = directory, directory = directory,
scope = scope, scope = scope,
generateKotlinExternals = generateKotlinExternals generateExternals = generateExternals
) )
override fun processNonStringFirstArgument(arg: Any?, vararg args: Any?): NpmDependency { override fun processNonStringFirstArgument(arg: Any?, vararg args: Any?): NpmDependency {
val generateKotlinExternals = generateKotlinExternalsIfPossible(args) val generateExternals = generateExternalsIfPossible(args)
return when (arg) { return when (arg) {
is File -> invoke( is File -> invoke(
directory = arg, directory = arg,
generateKotlinExternals = generateKotlinExternals generateExternals = generateExternals
) )
else -> npmDeclarationException(args) else -> npmDeclarationException(args)
} }
@@ -330,14 +330,14 @@ private fun defaultNpmDependencyDelegate(
override fun processNamedNonStringSecondArgument( override fun processNamedNonStringSecondArgument(
name: String, name: String,
arg: Any?, arg: Any?,
generateKotlinExternals: Boolean, generateExternals: Boolean,
vararg args: Any? vararg args: Any?
): NpmDependency { ): NpmDependency {
return when (arg) { return when (arg) {
is File -> invoke( is File -> invoke(
name = name, name = name,
directory = arg, directory = arg,
generateKotlinExternals = generateKotlinExternals generateExternals = generateExternals
) )
else -> npmDeclarationException(args) else -> npmDeclarationException(args)
} }
@@ -349,13 +349,13 @@ private fun defaultNpmDependencyDelegate(
"${scopePrefix(scope)}('name', File)" to "name:File" "${scopePrefix(scope)}('name', File)" to "name:File"
) )
if (_defaultGenerateKotlinExternals == null) { if (_defaultGenerateExternals == null) {
return result return result
} }
return result return result
.map { (first, second) -> .map { (first, second) ->
val value = first.replace(")", ", generateKotlinExternals = $defaultGenerateKotlinExternals)") val value = first.replace(")", ", generateExternals = $defaultGenerateExternals)")
value to second value to second
} }
} }
@@ -374,7 +374,7 @@ private class DefaultPeerNpmDependencyExtension(
override fun invoke( override fun invoke(
name: String, name: String,
directory: File, directory: File,
generateKotlinExternals: Boolean generateExternals: Boolean
): NpmDependency = ): NpmDependency =
npmDeclarationException(arrayOf(name, directory)) npmDeclarationException(arrayOf(name, directory))
@@ -384,7 +384,7 @@ private class DefaultPeerNpmDependencyExtension(
override fun processNamedNonStringSecondArgument( override fun processNamedNonStringSecondArgument(
name: String, name: String,
arg: Any?, arg: Any?,
generateKotlinExternals: Boolean, generateExternals: Boolean,
vararg args: Any? vararg args: Any?
): NpmDependency = ): NpmDependency =
npmDeclarationException(args) npmDeclarationException(args)