From 6793fb285e67a9652644b3758a905dae2c2f8991 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Fri, 31 Jan 2020 12:41:30 +0300 Subject: [PATCH] [Gradle, JS] Prepare for review --- .../kotlin/generators/gradle/dsl/presetEntries.kt | 2 +- .../gradle/targets/js/KotlinJsTargetConfigurator.kt | 4 ++-- .../kotlin/gradle/targets/js/KotlinJsTargetPreset.kt | 9 +++------ .../kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt | 4 +--- .../kotlin/gradle/targets/js/ir/KotlinJsIrCompilation.kt | 4 ---- .../kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt | 1 + .../gradle/targets/js/testing/mocha/KotlinMocha.kt | 1 - 7 files changed, 8 insertions(+), 17 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-dsl-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/dsl/presetEntries.kt b/libraries/tools/kotlin-gradle-plugin-dsl-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/dsl/presetEntries.kt index 6d0f5555e00..b1876e9e7be 100644 --- a/libraries/tools/kotlin-gradle-plugin-dsl-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/dsl/presetEntries.kt +++ b/libraries/tools/kotlin-gradle-plugin-dsl-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/dsl/presetEntries.kt @@ -43,7 +43,7 @@ internal val jvmPresetEntry = KotlinPresetEntry( internal val jsPresetEntry = KotlinPresetEntry( "js", - // need for commonization KotlinJsTargetPreset and KotlinJsIrTargetPreser + // need for commonization KotlinJsTargetPreset and KotlinJsIrTargetPreset typeName("org.jetbrains.kotlin.gradle.plugin.KotlinTargetPreset", "org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsTargetDsl"), typeName("org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsTargetDsl") ) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetConfigurator.kt index eba0adda329..79ecb4bb760 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetConfigurator.kt @@ -7,8 +7,8 @@ package org.jetbrains.kotlin.gradle.targets.js import org.gradle.language.base.plugins.LifecycleBasePlugin import org.jetbrains.kotlin.gradle.dsl.kotlinExtension +import org.jetbrains.kotlin.gradle.plugin.* import org.jetbrains.kotlin.gradle.plugin.Kotlin2JsSourceSetProcessor -import org.jetbrains.kotlin.gradle.plugin.KotlinOnlyTargetConfigurator import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetProcessor import org.jetbrains.kotlin.gradle.plugin.KotlinTargetWithTestsConfigurator import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.gradle.testing.internal.kotlinTestRegistry import org.jetbrains.kotlin.gradle.testing.testTaskName import java.util.concurrent.Callable -open class KotlinJsTargetConfigurator(kotlinPluginVersion: String, val irConfigurator: KotlinJsIrTargetConfigurator?) : +open class KotlinJsTargetConfigurator(kotlinPluginVersion: String) : KotlinOnlyTargetConfigurator(true, true, kotlinPluginVersion), KotlinTargetWithTestsConfigurator { diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetPreset.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetPreset.kt index 56d3c02f5cc..c695db61ae6 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetPreset.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetPreset.kt @@ -49,15 +49,13 @@ open class KotlinJsTargetPreset( } override fun createKotlinTargetConfigurator() = KotlinJsTargetConfigurator( - kotlinPluginVersion, - irPreset?.let { KotlinJsIrTargetConfigurator(kotlinPluginVersion) } + kotlinPluginVersion ) override fun getName(): String = PRESET_NAME override fun createCompilationFactory(forTarget: KotlinOnlyTarget): KotlinJsCompilationFactory { - forTarget as KotlinJsTarget - return KotlinJsCompilationFactory(project, forTarget, irPreset?.let { forTarget.irTarget }) + return KotlinJsCompilationFactory(project, forTarget, irPreset?.let { (forTarget as KotlinJsTarget).irTarget }) } companion object { @@ -80,8 +78,7 @@ class KotlinJsSingleTargetPreset( irPreset?.let { LEGACY_DISAMBIGUATION_CLASSIFIER } override fun createKotlinTargetConfigurator() = KotlinJsTargetConfigurator( - kotlinPluginVersion, - irPreset?.let { KotlinJsIrTargetConfigurator(kotlinPluginVersion) } + kotlinPluginVersion ) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt index 5ff7c4151f9..db330e498fb 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt @@ -23,8 +23,6 @@ import org.jetbrains.kotlin.gradle.tasks.registerTask import org.slf4j.LoggerFactory import javax.inject.Inject -private val log = LoggerFactory.getLogger("org.jetbrains.kotlin.gradle.targets.js.ir") - open class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) : KotlinJsIrSubTarget(target, "browser"), KotlinJsBrowserDsl { @@ -59,7 +57,7 @@ open class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) : @ExperimentalDceDsl override fun dceTask(body: KotlinJsDce.() -> Unit) { - log.warn("dceTask configuration is useless with IR compiler. Use @JsExport on declarations instead.") + project.logger.warn("dceTask configuration is useless with IR compiler. Use @JsExport on declarations instead.") } override fun configureMain(compilation: KotlinJsIrCompilation) { 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 56e1b096ffb..b1346c42c20 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 @@ -42,9 +42,5 @@ class KotlinJsIrCompilation( override fun addSourcesToCompileTask(sourceSet: KotlinSourceSet, addAsCommonSources: Lazy) { super.addSourcesToCompileTask(sourceSet, addAsCommonSources) allSources.add(sourceSet.kotlin) - - listOf(productionLinkTask, developmentLinkTask).forEach { - it.sourceFilesExtensions(sourceSet.customSourceFilesExtensions) - } } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt index dbcb6f8220d..6c284178e32 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt @@ -21,6 +21,7 @@ open class KotlinJsIrLink : Kotlin2JsCompile() { @Input lateinit var type: KotlinJsIrType + // Not check sources, only klib module @Internal override fun getSource(): FileTree = super.getSource() diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt index ca7bf8a53be..86a54323a20 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt @@ -63,7 +63,6 @@ class KotlinMocha(override val compilation: KotlinJsCompilation) : exclude = task.excludePatterns ) - val mocha = npmProject.require("mocha/bin/mocha") val file = task.nodeModulesToLoad