From b1768d805f9f6f1b805b7bb1bce0e566cee9b69c Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Fri, 9 Oct 2020 12:19:01 +0300 Subject: [PATCH] [Gradle, JS] Rename dukatMode to externalsOutputFormat ^KT-42339 fixed --- .../kotlin/gradle/DukatIntegrationIT.kt | 14 +++++------ .../kotlin/gradle/plugin/KotlinProperties.kt | 8 +++---- .../gradle/targets/js/KotlinJsCompilation.kt | 8 +++---- .../dukat/DukatCompilationResolverPlugin.kt | 24 +++++++++---------- .../gradle/targets/js/dukat/DukatExecutor.kt | 6 ++--- .../gradle/targets/js/dukat/DukatRunner.kt | 4 ++-- .../gradle/targets/js/dukat/DukatTask.kt | 6 ++--- ...{DukatMode.kt => ExternalsOutputFormat.kt} | 6 ++--- .../targets/js/dukat/IntegratedDukatTask.kt | 2 +- .../targets/js/ir/KotlinJsIrCompilation.kt | 6 ++--- 10 files changed, 42 insertions(+), 42 deletions(-) rename libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/{DukatMode.kt => ExternalsOutputFormat.kt} (67%) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/DukatIntegrationIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/DukatIntegrationIT.kt index 995ed973093..c35164c2ca9 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/DukatIntegrationIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/DukatIntegrationIT.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.gradle -import org.jetbrains.kotlin.gradle.targets.js.dukat.DukatMode +import org.jetbrains.kotlin.gradle.targets.js.dukat.ExternalsOutputFormat import org.jetbrains.kotlin.gradle.util.modify import org.junit.Test import kotlin.test.assertTrue @@ -103,7 +103,7 @@ class DukatIntegrationIT : BaseGradleIT() { project.setupWorkingDir() project.gradleBuildScript().modify(::transformBuildScriptWithPluginsDsl) project.gradleProperties().modify { - "${DukatMode.dukatModeProperty}=${DukatMode.SOURCE}" + "${ExternalsOutputFormat.externalsOutputFormatProperty}=${ExternalsOutputFormat.SOURCE}" } val externalSrcs = "build/externals/$projectName/src" @@ -158,7 +158,7 @@ class DukatIntegrationIT : BaseGradleIT() { project.setupWorkingDir() project.gradleBuildScript().modify(::transformBuildScriptWithPluginsDsl) project.gradleProperties().modify { - "${DukatMode.dukatModeProperty}=${DukatMode.SOURCE}" + "${ExternalsOutputFormat.externalsOutputFormatProperty}=${ExternalsOutputFormat.SOURCE}" } val externalSrcs = "build/externals/$projectName/src" @@ -233,7 +233,7 @@ class DukatIntegrationIT : BaseGradleIT() { project.gradleProperties().modify { """ kotlin.js.generate.externals=true - ${DukatMode.dukatModeProperty}=${DukatMode.SOURCE} + ${ExternalsOutputFormat.externalsOutputFormatProperty}=${ExternalsOutputFormat.SOURCE} """.trimIndent() } @@ -262,7 +262,7 @@ class DukatIntegrationIT : BaseGradleIT() { project.setupWorkingDir() project.gradleBuildScript().modify(::transformBuildScriptWithPluginsDsl) project.gradleProperties().modify { - "${DukatMode.dukatModeProperty}=${DukatMode.SOURCE}" + "${ExternalsOutputFormat.externalsOutputFormatProperty}=${ExternalsOutputFormat.SOURCE}" } val externalSrcs = "build/externals/both-jsIr/src" @@ -346,7 +346,7 @@ class DukatIntegrationIT : BaseGradleIT() { project.gradleBuildScript().modify(::transformBuildScriptWithPluginsDsl) project.gradleProperties().modify { """ - ${DukatMode.dukatModeProperty}=${DukatMode.BINARY} + ${ExternalsOutputFormat.externalsOutputFormatProperty}=${ExternalsOutputFormat.BINARY} """.trimIndent() } @@ -376,7 +376,7 @@ class DukatIntegrationIT : BaseGradleIT() { project.gradleBuildScript().modify(::transformBuildScriptWithPluginsDsl) project.gradleProperties().modify { """ - ${DukatMode.dukatModeProperty}=${DukatMode.SOURCE} + ${ExternalsOutputFormat.externalsOutputFormatProperty}=${ExternalsOutputFormat.SOURCE} """.trimIndent() } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt index 9b952e28cea..b92f271dd41 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt @@ -13,8 +13,8 @@ import org.jetbrains.kotlin.gradle.plugin.Kotlin2JsPlugin.Companion.NOWARN_2JS_F import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType.Companion.jsCompilerProperty import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMultiplatformPlugin import org.jetbrains.kotlin.gradle.plugin.statistics.KotlinBuildStatsService -import org.jetbrains.kotlin.gradle.targets.js.dukat.DukatMode -import org.jetbrains.kotlin.gradle.targets.js.dukat.DukatMode.Companion.dukatModeProperty +import org.jetbrains.kotlin.gradle.targets.js.dukat.ExternalsOutputFormat +import org.jetbrains.kotlin.gradle.targets.js.dukat.ExternalsOutputFormat.Companion.externalsOutputFormatProperty import org.jetbrains.kotlin.gradle.targets.native.DisabledNativeTargetsReporter import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile import org.jetbrains.kotlin.gradle.tasks.CacheBuilder @@ -221,8 +221,8 @@ internal class PropertiesProvider private constructor(private val project: Proje /** * Default mode of generating of Dukat */ - val dukatMode: DukatMode? - get() = property(dukatModeProperty)?.let { DukatMode.byArgumentOrNull(it) } + val externalsOutputFormat: ExternalsOutputFormat? + get() = property(externalsOutputFormatProperty)?.let { ExternalsOutputFormat.byArgumentOrNull(it) } /** * Use Kotlin/JS backend compiler type diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsCompilation.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsCompilation.kt index be53d715b2c..f29cfb3578d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsCompilation.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsCompilation.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinTarget import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsSubTargetContainerDsl -import org.jetbrains.kotlin.gradle.targets.js.dukat.DukatMode +import org.jetbrains.kotlin.gradle.targets.js.dukat.ExternalsOutputFormat import org.jetbrains.kotlin.gradle.targets.js.ir.JsBinary import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsBinaryContainer import org.jetbrains.kotlin.gradle.targets.js.npm.PackageJson @@ -34,10 +34,10 @@ open class KotlinJsCompilation( private val kotlinProperties = PropertiesProvider(target.project) - internal val dukatMode: DukatMode - get() = kotlinProperties.dukatMode ?: defaultDukatMode + internal val externalsOutputFormat: ExternalsOutputFormat + get() = kotlinProperties.externalsOutputFormat ?: defaultExternalsOutputFormat - internal open val defaultDukatMode: DukatMode = DukatMode.BINARY + internal open val defaultExternalsOutputFormat: ExternalsOutputFormat = ExternalsOutputFormat.BINARY override val kotlinOptions: KotlinJsOptions = KotlinJsOptionsImpl() diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatCompilationResolverPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatCompilationResolverPlugin.kt index e1233619785..9b82bd3dd3e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatCompilationResolverPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatCompilationResolverPlugin.kt @@ -29,9 +29,9 @@ internal class DukatCompilationResolverPlugin( val separateTaskName = npmProject.compilation.disambiguateName("generateExternals") init { - val dukatMode = compilation.dukatMode + val externalsOutputFormat = compilation.externalsOutputFormat - gradleModelPostProcess(dukatMode, npmProject) + gradleModelPostProcess(externalsOutputFormat, npmProject) val integratedTask = project.registerTask( integratedTaskName, @@ -39,19 +39,19 @@ internal class DukatCompilationResolverPlugin( ) { it.group = DUKAT_TASK_GROUP it.description = "Integrated generation Kotlin/JS external declarations for .d.ts files in ${compilation}" - it.dukatMode = dukatMode + it.externalsOutputFormat = externalsOutputFormat it.dependsOn(nodeJs.npmInstallTaskProvider, npmProject.packageJsonTask) } val target = compilation.target - if (target is KotlinJsIrTarget || target is KotlinJsTarget && dukatMode != DukatMode.SOURCE) { + if (target is KotlinJsIrTarget || target is KotlinJsTarget && externalsOutputFormat != ExternalsOutputFormat.SOURCE) { compilation.compileKotlinTaskProvider.dependsOn(integratedTask) } if (target is KotlinJsIrTarget && target.legacyTarget != null) { target.legacyTarget?.compilations?.named(compilation.name) { - if (it.dukatMode == DukatMode.SOURCE) { + if (it.externalsOutputFormat == ExternalsOutputFormat.SOURCE) { it.compileKotlinTaskProvider.dependsOn(integratedTask) } } @@ -86,15 +86,15 @@ internal class DukatCompilationResolverPlugin( val externalNpmDependencies = resolution[project][compilation].externalNpmDependencies val target = compilation.target - val dukatMode = compilation.dukatMode - if (target is KotlinJsTarget && dukatMode == DukatMode.SOURCE) { + val externalsOutputFormat = compilation.externalsOutputFormat + if (target is KotlinJsTarget && externalsOutputFormat == ExternalsOutputFormat.SOURCE) { return } DukatExecutor( nodeJs, DtsResolver(npmProject).getAllDts(externalNpmDependencies), - dukatMode, + externalsOutputFormat, npmProject, packageJsonIsUpdated, operation = compilation.name + " > " + DukatExecutor.OPERATION, @@ -108,14 +108,14 @@ internal class DukatCompilationResolverPlugin( } internal fun gradleModelPostProcess( - dukatMode: DukatMode, + externalsOutputFormat: ExternalsOutputFormat, npmProject: NpmProject ) { val compilation = npmProject.compilation val project = npmProject.project - when (dukatMode) { - DukatMode.SOURCE -> compilation.defaultSourceSet.kotlin.srcDir(npmProject.externalsDir) - DukatMode.BINARY -> { + when (externalsOutputFormat) { + ExternalsOutputFormat.SOURCE -> compilation.defaultSourceSet.kotlin.srcDir(npmProject.externalsDir) + ExternalsOutputFormat.BINARY -> { npmProject.externalsDir .listFiles() ?.filter { it.isCompatibleArchive } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatExecutor.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatExecutor.kt index 41c0da157e5..32ac555e611 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatExecutor.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatExecutor.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.gradle.targets.js.npm.NpmProject class DukatExecutor( val nodeJs: NodeJsRootExtension, val typeDefinitions: List, - val dukatMode: DukatMode, + val externalsOutputFormat: ExternalsOutputFormat, val npmProject: NpmProject, val packageJsonIsUpdated: Boolean, val operation: String = OPERATION, @@ -50,7 +50,7 @@ class DukatExecutor( DukatRunner( npmProject.compilation, typeDefinitions.map { it.file }, - dukatMode, + externalsOutputFormat, npmProject.externalsDir, operation = operation ).execute() @@ -60,6 +60,6 @@ class DukatExecutor( versionFile.writeText(version) - gradleModelPostProcess(dukatMode, npmProject) + gradleModelPostProcess(externalsOutputFormat, npmProject) } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatRunner.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatRunner.kt index e7303ec95cf..1aadba36a46 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatRunner.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatRunner.kt @@ -13,7 +13,7 @@ import java.io.File class DukatRunner( val compilation: KotlinJsCompilation, val dTsFiles: Collection, - val dukatMode: DukatMode, + val externalsOutputFormat: ExternalsOutputFormat, val destDir: File, val qualifiedPackageName: String? = null, val jsInteropJvmEngine: String? = null, @@ -23,7 +23,7 @@ class DukatRunner( compilation.target.project.execWithProgress(operation) { exec -> val args = mutableListOf() - if (dukatMode == DukatMode.BINARY) { + if (externalsOutputFormat == ExternalsOutputFormat.BINARY) { args.add("--descriptors-jar") } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatTask.kt index 71ed9804b85..77e4b8c9e34 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatTask.kt @@ -29,10 +29,10 @@ abstract class DukatTask( get() = setOf(nodeJs.versions.dukat) /** - * [DukatMode] what to generate, sources or binaries + * [ExternalsOutputFormat] what to generate, sources or binaries */ @Input - var dukatMode: DukatMode = DukatMode.SOURCE + var externalsOutputFormat: ExternalsOutputFormat = ExternalsOutputFormat.SOURCE @get:Internal val dts by lazy { @@ -87,7 +87,7 @@ abstract class DukatTask( DukatRunner( compilation, dTsFiles, - dukatMode, + externalsOutputFormat, destinationDir, qualifiedPackageName, null, diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatMode.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/ExternalsOutputFormat.kt similarity index 67% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatMode.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/ExternalsOutputFormat.kt index e823370e896..e5d8035ed84 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatMode.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/ExternalsOutputFormat.kt @@ -5,14 +5,14 @@ package org.jetbrains.kotlin.gradle.targets.js.dukat -enum class DukatMode { +enum class ExternalsOutputFormat { SOURCE, BINARY; companion object { - fun byArgumentOrNull(argument: String): DukatMode? = + fun byArgumentOrNull(argument: String): ExternalsOutputFormat? = values().firstOrNull { it.name.equals(argument, ignoreCase = true) } - const val dukatModeProperty = "dukat.mode" + const val externalsOutputFormatProperty = "kotlin.js.externals.output.format" } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/IntegratedDukatTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/IntegratedDukatTask.kt index a4f2896f019..9d87935ff70 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/IntegratedDukatTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/IntegratedDukatTask.kt @@ -28,7 +28,7 @@ constructor( DukatExecutor( nodeJs, dts, - dukatMode, + externalsOutputFormat, compilation.npmProject, true, compareInputs = false diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrCompilation.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrCompilation.kt index ae143b8b08a..768f4b77f4d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrCompilation.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrCompilation.kt @@ -9,7 +9,7 @@ import org.gradle.api.file.SourceDirectorySet import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.KotlinTarget import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation -import org.jetbrains.kotlin.gradle.targets.js.dukat.DukatMode +import org.jetbrains.kotlin.gradle.targets.js.dukat.ExternalsOutputFormat import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName class KotlinJsIrCompilation( @@ -17,8 +17,8 @@ class KotlinJsIrCompilation( name: String ) : KotlinJsCompilation(target, name) { - override val defaultDukatMode: DukatMode - get() = DukatMode.SOURCE + override val defaultExternalsOutputFormat: ExternalsOutputFormat + get() = ExternalsOutputFormat.SOURCE internal val allSources: MutableSet = mutableSetOf()