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

[Gradle, JS] Extract JS presets container, no js in codegen since now

Browse Source
This commit is contained in:
Ilya Goncharov
2020-02-19 12:30:04 +03:00
parent fa335b5360
commit cc97138e9c
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-dsl-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/dsl/mppPresetFunctionsCodegen.kt
+5 -10
View File
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.generators.gradle.dsl
import groovy.lang.Closure import groovy.lang.Closure
import org.gradle.util.ConfigureUtil import org.gradle.util.ConfigureUtil
import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerTypeHolder
import org.jetbrains.kotlin.gradle.plugin.KotlinTargetsContainerWithPresets import org.jetbrains.kotlin.gradle.plugin.KotlinTargetsContainerWithPresets
import java.io.File import java.io.File
@@ -15,10 +14,7 @@ fun main() {
generateKotlinTargetContainerWithPresetFunctionsInterface() generateKotlinTargetContainerWithPresetFunctionsInterface()
} }
private val parentInterfaces = listOf( private val parentInterface = KotlinTargetsContainerWithPresets::class
KotlinTargetsContainerWithPresets::class,
KotlinJsCompilerTypeHolder::class
)
private val presetsProperty = KotlinTargetsContainerWithPresets::presets.name private val presetsProperty = KotlinTargetsContainerWithPresets::presets.name
@@ -28,16 +24,15 @@ private fun generateKotlinTargetContainerWithPresetFunctionsInterface() {
generatePresetFunctions(it, presetsProperty, "configureOrCreate") generatePresetFunctions(it, presetsProperty, "configureOrCreate")
} }
val parentInterfaceNames = val parentInterfaceName =
parentInterfaces.map { typeName(it.java.canonicalName) } typeName(parentInterface.java.canonicalName)
val className = val className =
typeName("org.jetbrains.kotlin.gradle.dsl.KotlinTargetContainerWithPresetFunctions") typeName("org.jetbrains.kotlin.gradle.dsl.KotlinTargetContainerWithPresetFunctions")
val imports = allPresetEntries val imports = allPresetEntries
.flatMap { it.typeNames() } .flatMap { it.typeNames() }
.plus(parentInterfaceNames) .plus(parentInterfaceName)
.plus(typeName(ConfigureUtil::class.java.canonicalName)) .plus(typeName(ConfigureUtil::class.java.canonicalName))
.plus(typeName(Closure::class.java.canonicalName)) .plus(typeName(Closure::class.java.canonicalName))
.filter { it.packageName() != className.packageName() } .filter { it.packageName() != className.packageName() }
@@ -51,7 +46,7 @@ private fun generateKotlinTargetContainerWithPresetFunctionsInterface() {
"package ${className.packageName()}", "package ${className.packageName()}",
imports, imports,
generatedCodeWarning, generatedCodeWarning,
"interface ${className.renderShort()} : ${parentInterfaceNames.joinToString { it.renderShort() }} {", "interface ${className.renderShort()} : ${parentInterfaceName.renderShort()} {",
functions.joinToString("\n\n") { it.indented(4) }, functions.joinToString("\n\n") { it.indented(4) },
"}" "}"
).joinToString("\n\n") ).joinToString("\n\n")
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinTargetContainerWithPresetFunctions.kt
+1 -4
View File
@@ -2,16 +2,13 @@ package org.jetbrains.kotlin.gradle.dsl
import groovy.lang.Closure import groovy.lang.Closure
import org.gradle.util.ConfigureUtil import org.gradle.util.ConfigureUtil
import org.jetbrains.kotlin.gradle.plugin.JsCompilerType
import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerTypeHolder
import org.jetbrains.kotlin.gradle.plugin.KotlinTargetPreset
import org.jetbrains.kotlin.gradle.plugin.KotlinTargetsContainerWithPresets import org.jetbrains.kotlin.gradle.plugin.KotlinTargetsContainerWithPresets
import org.jetbrains.kotlin.gradle.plugin.mpp.* import org.jetbrains.kotlin.gradle.plugin.mpp.*
import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
// DO NOT EDIT MANUALLY! Generated by org.jetbrains.kotlin.generators.gradle.dsl.MppPresetFunctionsCodegenKt // DO NOT EDIT MANUALLY! Generated by org.jetbrains.kotlin.generators.gradle.dsl.MppPresetFunctionsCodegenKt
interface KotlinTargetContainerWithPresetFunctions : KotlinTargetsContainerWithPresets, KotlinJsCompilerTypeHolder { interface KotlinTargetContainerWithPresetFunctions : KotlinTargetsContainerWithPresets {
fun jvm( fun jvm(
name: String = "jvm", name: String = "jvm",