From 3a6cdc83cff9a28d128d11f8e444fa999c91d559 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Tue, 7 Nov 2023 08:48:50 +0000 Subject: [PATCH] [Gradle, JS] Use KotlinJsIrCompilation with deprecated KotlinJsCompilation ^KT-41382 fixed --- .../kotlinDomApiDependencyManagement.kt | 4 +-- .../plugin/KotlinJsIrSourceSetProcessor.kt | 4 +-- .../gradle/plugin/SubpluginEnvironment.kt | 3 ++- .../plugin/mpp/applyUserDefinedAttributes.kt | 5 ++-- .../KotlinCompilationProcessorSideEffect.kt | 4 +-- .../gradle/targets/js/KotlinJsCompilation.kt | 4 +-- .../targets/js/KotlinJsPlatformTestRun.kt | 14 +++++----- .../gradle/targets/js/KotlinJsTargetPreset.kt | 3 ++- .../targets/js/binaryen/BinaryenExec.kt | 4 +-- .../kotlin/gradle/targets/js/d8/D8Exec.kt | 4 +-- .../targets/js/dsl/KotlinJsTargetDsl.kt | 6 ++--- .../kotlin/gradle/targets/js/ir/JsBinaries.kt | 8 +++--- .../gradle/targets/js/ir/KotlinBrowserJsIr.kt | 5 ++-- .../targets/js/ir/KotlinJsBinaryContainer.kt | 26 +++++++++++-------- .../targets/js/ir/KotlinJsIrCompilation.kt | 7 +++-- .../js/ir/KotlinJsIrCompilationFactory.kt | 9 +++---- .../targets/js/ir/KotlinJsIrSubTarget.kt | 11 ++++---- .../targets/js/ir/KotlinJsIrSubTargetBase.kt | 7 +++-- .../gradle/targets/js/ir/KotlinJsIrTarget.kt | 4 +-- .../js/ir/KotlinJsIrTargetConfigurator.kt | 3 +-- .../targets/js/ir/KotlinJsIrTargetPreset.kt | 9 +++---- .../targets/js/ir/KotlinWasmTargetPreset.kt | 5 ++-- .../gradle/targets/js/nodejs/NodeJsExec.kt | 6 ++--- .../gradle/targets/js/npm/NpmProject.kt | 10 ++++--- .../targets/js/npm/RequiresNpmDependencies.kt | 4 +-- .../resolver/KotlinCompilationNpmResolver.kt | 6 ++--- .../npm/resolver/KotlinProjectNpmResolver.kt | 8 +++--- .../js/npm/resolver/KotlinRootNpmResolver.kt | 6 ++--- .../js/npm/tasks/KotlinPackageJsonTask.kt | 4 +-- .../gradle/targets/js/testing/KotlinJsTest.kt | 7 ++--- .../gradle/targets/js/testing/KotlinWasmD8.kt | 4 +-- .../targets/js/testing/KotlinWasmNode.kt | 4 +-- .../targets/js/testing/karma/KotlinKarma.kt | 4 +-- .../targets/js/testing/mocha/KotlinMocha.kt | 5 ++-- .../js/typescript/TypeScriptValidationTask.kt | 4 +-- .../targets/js/webpack/KotlinWebpack.kt | 4 +-- .../configuration/Kotlin2JsCompileConfig.kt | 3 +-- .../configuration/KotlinJsIrLinkConfig.kt | 3 +-- 38 files changed, 114 insertions(+), 117 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/kotlinDomApiDependencyManagement.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/kotlinDomApiDependencyManagement.kt index 253f2fb41c5..d14464d8aab 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/kotlinDomApiDependencyManagement.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/kotlinDomApiDependencyManagement.kt @@ -14,9 +14,9 @@ import org.jetbrains.kotlin.gradle.dsl.* import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType 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.plugin.sources.KotlinDependencyScope import org.jetbrains.kotlin.gradle.plugin.sources.sourceSetDependencyConfigurationByScope +import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrCompilation import org.jetbrains.kotlin.gradle.targets.js.npm.SemVer import org.jetbrains.kotlin.gradle.utils.forAllTargets @@ -45,7 +45,7 @@ private fun KotlinTarget.addKotlinDomApiDependency( ) { compilations.configureEach { compilation -> if (compilation.platformType != KotlinPlatformType.js) return@configureEach - if (compilation !is KotlinJsCompilation) return@configureEach + if (compilation !is KotlinJsIrCompilation) return@configureEach compilation.allKotlinSourceSets.forEach { kotlinSourceSet -> val scopeConfiguration = configurations diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinJsIrSourceSetProcessor.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinJsIrSourceSetProcessor.kt index 93cfd4f1ba1..6d60e43499e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinJsIrSourceSetProcessor.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinJsIrSourceSetProcessor.kt @@ -9,8 +9,8 @@ import org.gradle.api.Project import org.gradle.api.tasks.TaskProvider import org.jetbrains.kotlin.gradle.dsl.KotlinJsCompilerOptions import org.jetbrains.kotlin.gradle.dsl.KotlinJsCompilerOptionsHelper -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.targets.js.ir.JsIrBinary +import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrCompilation import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTarget import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile @@ -43,7 +43,7 @@ internal class KotlinJsIrSourceSetProcessor( it.dependsOn(kotlinTask) } - val compilation = compilationInfo.tcs.compilation as KotlinJsCompilation + val compilation = compilationInfo.tcs.compilation as KotlinJsIrCompilation compilation.binaries .withType(JsIrBinary::class.java) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/SubpluginEnvironment.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/SubpluginEnvironment.kt index c60f5d97e24..15f9fcfa20f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/SubpluginEnvironment.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/SubpluginEnvironment.kt @@ -7,6 +7,7 @@ import org.jetbrains.kotlin.gradle.internal.kaptGenerateStubsTaskName import org.jetbrains.kotlin.gradle.logging.kotlinDebug import org.jetbrains.kotlin.gradle.plugin.mpp.* import org.jetbrains.kotlin.gradle.targets.js.ir.JsIrBinary +import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrCompilation import org.jetbrains.kotlin.gradle.tasks.* import org.jetbrains.kotlin.gradle.utils.whenKaptEnabled @@ -64,7 +65,7 @@ class SubpluginEnvironment( kotlinCompilation.compileTaskProvider.configure(configureKotlinTask) project.configurePluginOptionsForKapt(kotlinCompilation, configureKotlinTask) - if (kotlinCompilation is KotlinJsCompilation) { + if (kotlinCompilation is KotlinJsIrCompilation) { kotlinCompilation.binaries.all { if (it is JsIrBinary) { it.linkTask.configure(configureKotlinTask) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/applyUserDefinedAttributes.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/applyUserDefinedAttributes.kt index 0adf9da513c..b1772c23890 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/applyUserDefinedAttributes.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/applyUserDefinedAttributes.kt @@ -10,10 +10,9 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation import org.jetbrains.kotlin.gradle.plugin.KotlinPluginLifecycle.Stage.AfterEvaluateBuildscript import org.jetbrains.kotlin.gradle.plugin.KotlinProjectSetupCoroutine import org.jetbrains.kotlin.gradle.plugin.await -import org.jetbrains.kotlin.gradle.plugin.launchInStage +import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrCompilation import org.jetbrains.kotlin.gradle.utils.copyAttributes import org.jetbrains.kotlin.gradle.utils.forAllTargets -import org.jetbrains.kotlin.gradle.utils.targets /** @@ -66,7 +65,7 @@ private val KotlinCompilation<*>.allOwnedConfigurationsNames androidVariant.compileConfiguration.name, androidVariant.runtimeConfiguration.name ) - is KotlinJsCompilation -> listOfNotNull(npmAggregatedConfigurationName, publicPackageJsonConfigurationName) + is KotlinJsIrCompilation -> listOfNotNull(npmAggregatedConfigurationName, publicPackageJsonConfigurationName) else -> emptyList() } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationProcessorSideEffect.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationProcessorSideEffect.kt index 4d205029d26..59cf5316003 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationProcessorSideEffect.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationProcessorSideEffect.kt @@ -10,15 +10,15 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinCommonSourceSetProcessor import org.jetbrains.kotlin.gradle.plugin.KotlinCompilationInfo import org.jetbrains.kotlin.gradle.plugin.KotlinJsIrSourceSetProcessor import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinCommonCompilation -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJvmCompilation +import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrCompilation import org.jetbrains.kotlin.gradle.tasks.KotlinTasksProvider internal val KotlinCompilationProcessorSideEffect = KotlinCompilationSideEffect { compilation -> val processor = when (compilation) { is KotlinCommonCompilation -> KotlinCommonSourceSetProcessor(KotlinCompilationInfo(compilation), KotlinTasksProvider()) is KotlinJvmCompilation -> Kotlin2JvmSourceSetProcessor(KotlinTasksProvider(), KotlinCompilationInfo(compilation)) - is KotlinJsCompilation -> KotlinJsIrSourceSetProcessor(KotlinTasksProvider(), KotlinCompilationInfo(compilation)) + is KotlinJsIrCompilation -> KotlinJsIrSourceSetProcessor(KotlinTasksProvider(), KotlinCompilationInfo(compilation)) else -> null } processor?.run() diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsCompilation.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsCompilation.kt index 1288cf3af83..0bf72f47d16 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsCompilation.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsCompilation.kt @@ -14,7 +14,7 @@ import org.gradle.api.attributes.AttributeContainer import org.gradle.api.tasks.TaskProvider import org.jetbrains.kotlin.gradle.dsl.KotlinJsCompilerOptions import org.jetbrains.kotlin.gradle.dsl.KotlinJsOptions -import org.jetbrains.kotlin.gradle.plugin.* +import org.jetbrains.kotlin.gradle.plugin.HasCompilerOptions import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.KotlinCompilationImpl import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsSubTargetContainerDsl import org.jetbrains.kotlin.gradle.targets.js.ir.JsBinary @@ -98,4 +98,4 @@ open class KotlinJsCompilation @Inject internal constructor( project.configure(this, handler) } } -} +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsPlatformTestRun.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsPlatformTestRun.kt index e0803639a0d..1bbc51c34f6 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsPlatformTestRun.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsPlatformTestRun.kt @@ -11,10 +11,10 @@ import org.jetbrains.kotlin.gradle.plugin.CompilationExecutionSource import org.jetbrains.kotlin.gradle.plugin.CompilationExecutionSourceSupport import org.jetbrains.kotlin.gradle.plugin.KotlinTarget import org.jetbrains.kotlin.gradle.plugin.KotlinTargetTestRun -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsSubTargetContainerDsl import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsSubTargetDsl import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinWasmSubTargetContainerDsl +import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrCompilation import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest import org.jetbrains.kotlin.gradle.testing.KotlinReportAggregatingTestRun import org.jetbrains.kotlin.gradle.testing.KotlinTaskTestRun @@ -22,12 +22,12 @@ import org.jetbrains.kotlin.gradle.testing.requireCompilationOfTarget import javax.inject.Inject import kotlin.properties.Delegates -class JsCompilationExecutionSource(override val compilation: KotlinJsCompilation) : - CompilationExecutionSource +class JsCompilationExecutionSource(override val compilation: KotlinJsIrCompilation) : + CompilationExecutionSource open class KotlinJsPlatformTestRun(testRunName: String, target: KotlinTarget) : KotlinTaskTestRun(testRunName, target), - CompilationExecutionSourceSupport { + CompilationExecutionSourceSupport { private var _executionSource: JsCompilationExecutionSource by Delegates.notNull() @@ -38,7 +38,7 @@ open class KotlinJsPlatformTestRun(testRunName: String, target: KotlinTarget) : _executionSource = value } - override fun setExecutionSourceFrom(compilation: KotlinJsCompilation) { + override fun setExecutionSourceFrom(compilation: KotlinJsIrCompilation) { requireCompilationOfTarget(compilation, target) executionSource = JsCompilationExecutionSource(compilation) @@ -57,9 +57,9 @@ abstract class KotlinJsReportAggregatingTestRun @Inject constructor( override val target: KotlinJsSubTargetContainerDsl ) : KotlinReportAggregatingTestRun(testRunName), KotlinTargetTestRun, - CompilationExecutionSourceSupport { + CompilationExecutionSourceSupport { - override fun setExecutionSourceFrom(compilation: KotlinJsCompilation) = configureAllExecutions { + override fun setExecutionSourceFrom(compilation: KotlinJsIrCompilation) = configureAllExecutions { setExecutionSourceFrom(compilation) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetPreset.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetPreset.kt index 69bbb62d861..cacb34b88b3 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetPreset.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetPreset.kt @@ -9,11 +9,12 @@ package org.jetbrains.kotlin.gradle.plugin.mpp import org.gradle.api.Project +import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrCompilation @Deprecated("The Kotlin/JS legacy target is deprecated and its support completely discontinued", level = DeprecationLevel.WARNING) abstract class KotlinJsTargetPreset( project: Project -) : KotlinOnlyTargetPreset, KotlinJsCompilation>( +) : KotlinOnlyTargetPreset, KotlinJsIrCompilation>( project ) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/binaryen/BinaryenExec.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/binaryen/BinaryenExec.kt index b8218b2e6e6..37b8e6e4e37 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/binaryen/BinaryenExec.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/binaryen/BinaryenExec.kt @@ -10,7 +10,7 @@ import org.gradle.api.file.RegularFileProperty import org.gradle.api.tasks.* import org.gradle.work.DisableCachingByDefault import org.gradle.work.NormalizeLineEndings -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation +import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrCompilation import org.jetbrains.kotlin.gradle.tasks.registerTask import org.jetbrains.kotlin.gradle.utils.newFileProperty import javax.inject.Inject @@ -89,7 +89,7 @@ constructor() : AbstractExecTask(BinaryenExec::class.java) { companion object { fun create( - compilation: KotlinJsCompilation, + compilation: KotlinJsIrCompilation, name: String, configuration: BinaryenExec.() -> Unit = {} ): TaskProvider { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/d8/D8Exec.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/d8/D8Exec.kt index 88a0d497733..a98e3692c77 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/d8/D8Exec.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/d8/D8Exec.kt @@ -10,8 +10,8 @@ import org.gradle.api.tasks.* import org.gradle.work.DisableCachingByDefault import org.gradle.work.NormalizeLineEndings import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.targets.js.addWasmExperimentalArguments +import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrCompilation import org.jetbrains.kotlin.gradle.tasks.registerTask import org.jetbrains.kotlin.gradle.utils.newFileProperty @@ -53,7 +53,7 @@ open class D8Exec : AbstractExecTask(D8Exec::class.java) { companion object { fun create( - compilation: KotlinJsCompilation, + compilation: KotlinJsIrCompilation, name: String, configuration: D8Exec.() -> Unit = {} ): TaskProvider { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/dsl/KotlinJsTargetDsl.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/dsl/KotlinJsTargetDsl.kt index 3b31e5b2174..f80356a15cf 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/dsl/KotlinJsTargetDsl.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/dsl/KotlinJsTargetDsl.kt @@ -8,14 +8,12 @@ package org.jetbrains.kotlin.gradle.targets.js.dsl import org.gradle.api.Action import org.gradle.api.GradleException import org.gradle.api.NamedDomainObjectContainer -import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi -import org.jetbrains.kotlin.gradle.dsl.KotlinJsCompilerOptions import org.jetbrains.kotlin.gradle.dsl.KotlinJsDce import org.jetbrains.kotlin.gradle.plugin.KotlinTarget -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.targets.js.KotlinJsPlatformTestRun import org.jetbrains.kotlin.gradle.targets.js.KotlinJsReportAggregatingTestRun import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsBinaryContainer +import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrCompilation import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsExec import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpack @@ -65,7 +63,7 @@ interface KotlinJsTargetDsl : KotlinTarget, KotlinTargetWithNodeJsDsl { val testRuns: NamedDomainObjectContainer // Need to compatibility when users use KotlinJsCompilation specific in build script - override val compilations: NamedDomainObjectContainer + override val compilations: NamedDomainObjectContainer } interface KotlinTargetWithNodeJsDsl { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/JsBinaries.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/JsBinaries.kt index 69f12cb97a2..fd11db7fb7e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/JsBinaries.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/JsBinaries.kt @@ -28,7 +28,7 @@ interface JsBinary { } sealed class JsIrBinary( - final override val compilation: KotlinJsCompilation, + final override val compilation: KotlinJsIrCompilation, final override val name: String, override val mode: KotlinJsBinaryMode ) : JsBinary { @@ -85,7 +85,7 @@ sealed class JsIrBinary( } open class Executable( - compilation: KotlinJsCompilation, + compilation: KotlinJsIrCompilation, name: String, mode: KotlinJsBinaryMode ) : JsIrBinary( @@ -109,7 +109,7 @@ open class Executable( } open class ExecutableWasm( - compilation: KotlinJsCompilation, + compilation: KotlinJsIrCompilation, name: String, mode: KotlinJsBinaryMode ) : Executable( @@ -129,7 +129,7 @@ open class ExecutableWasm( } class Library( - compilation: KotlinJsCompilation, + compilation: KotlinJsIrCompilation, name: String, mode: KotlinJsBinaryMode ) : JsIrBinary( diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt index e8a47bc09d3..7b76f5eb2e4 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt @@ -15,7 +15,6 @@ import org.gradle.language.base.plugins.LifecycleBasePlugin import org.jetbrains.kotlin.gradle.dsl.JsModuleKind import org.jetbrains.kotlin.gradle.dsl.KotlinJsDce import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.utils.archivesName import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalDceDsl import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsBinaryMode @@ -105,7 +104,7 @@ abstract class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) : } override fun configureRun( - compilation: KotlinJsCompilation + compilation: KotlinJsIrCompilation ) { val commonRunTask = registerSubTargetTask(disambiguateCamelCased(RUN_TASK_NAME)) {} @@ -172,7 +171,7 @@ abstract class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) : } override fun configureBuild( - compilation: KotlinJsCompilation + compilation: KotlinJsIrCompilation ) { val project = compilation.target.project diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsBinaryContainer.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsBinaryContainer.kt index 56d1e7b46a0..a4320c683f7 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsBinaryContainer.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsBinaryContainer.kt @@ -14,7 +14,6 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinTargetWithBinaries import org.jetbrains.kotlin.gradle.plugin.mpp.isMain -import org.jetbrains.kotlin.gradle.targets.js.binaryen.BinaryenExec import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsBinaryMode import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsBinaryMode.DEVELOPMENT import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsBinaryMode.PRODUCTION @@ -25,7 +24,7 @@ import javax.inject.Inject open class KotlinJsBinaryContainer @Inject constructor( - val target: KotlinTargetWithBinaries, + val target: KotlinTargetWithBinaries, backingContainer: DomainObjectSet, ) : DomainObjectSet by backingContainer { val project: Project @@ -33,10 +32,15 @@ constructor( private val binaryNames = mutableSetOf() - private val defaultCompilation: KotlinJsCompilation + private val defaultCompilation: KotlinJsIrCompilation get() = target.compilations.getByName(KotlinCompilation.MAIN_COMPILATION_NAME) - // For Groovy DSL + fun executable( + compilation: KotlinJsIrCompilation, + ): List { + return executable(compilation as KotlinJsCompilation) + } + @JvmOverloads fun executable( compilation: KotlinJsCompilation = defaultCompilation, @@ -54,13 +58,13 @@ constructor( (this as KotlinJsIrSubTarget).produceExecutable() } - return compilation.binaries.executableIrInternal(compilation) + return compilation.binaries.executableIrInternal(compilation as KotlinJsIrCompilation) } throw GradleException("Target should be KotlinJsIrTarget, but found $target") } - internal fun executableIrInternal(compilation: KotlinJsCompilation): List = createBinaries( + internal fun executableIrInternal(compilation: KotlinJsIrCompilation): List = createBinaries( compilation = compilation, jsBinaryType = KotlinJsBinaryType.EXECUTABLE, create = { compilation, name, mode -> @@ -75,7 +79,7 @@ constructor( // For Groovy DSL @JvmOverloads fun library( - compilation: KotlinJsCompilation = defaultCompilation, + compilation: KotlinJsIrCompilation = defaultCompilation, ): List { if (target is KotlinJsIrTarget) { target.whenBrowserConfigured { @@ -112,10 +116,10 @@ constructor( .matching { it.mode == mode } private fun createBinaries( - compilation: KotlinJsCompilation, + compilation: KotlinJsIrCompilation, modes: Collection = listOf(PRODUCTION, DEVELOPMENT), jsBinaryType: KotlinJsBinaryType, - create: (compilation: KotlinJsCompilation, name: String, mode: KotlinJsBinaryMode) -> T, + create: (compilation: KotlinJsIrCompilation, name: String, mode: KotlinJsBinaryMode) -> T, ) = modes.map { createBinary( @@ -127,10 +131,10 @@ constructor( } private fun createBinary( - compilation: KotlinJsCompilation, + compilation: KotlinJsIrCompilation, mode: KotlinJsBinaryMode, jsBinaryType: KotlinJsBinaryType, - create: (compilation: KotlinJsCompilation, name: String, mode: KotlinJsBinaryMode) -> T, + create: (compilation: KotlinJsIrCompilation, name: String, mode: KotlinJsBinaryMode) -> T, ): JsBinary { val name = generateBinaryName( compilation, diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrCompilation.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrCompilation.kt index d943cc5abdc..328d101c829 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrCompilation.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrCompilation.kt @@ -6,6 +6,9 @@ package org.jetbrains.kotlin.gradle.targets.js.ir import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation +import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.KotlinCompilationImpl +import javax.inject.Inject -@Deprecated("Use KotlinJsCompilation instead") -typealias KotlinJsIrCompilation = KotlinJsCompilation \ No newline at end of file +open class KotlinJsIrCompilation @Inject internal constructor( + compilation: KotlinCompilationImpl, +) : KotlinJsCompilation(compilation) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrCompilationFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrCompilationFactory.kt index 2916e93bdb0..c5e04e900ff 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrCompilationFactory.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrCompilationFactory.kt @@ -7,7 +7,6 @@ package org.jetbrains.kotlin.gradle.targets.js.ir import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinCompilationFactory -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.DefaultKotlinCompilationFriendPathsResolver import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.DefaultKotlinCompilationPreConfigure import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.* @@ -19,9 +18,9 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.KotlinJsCo class KotlinJsIrCompilationFactory internal constructor( override val target: KotlinJsIrTarget, -) : KotlinCompilationFactory { - override val itemClass: Class - get() = KotlinJsCompilation::class.java +) : KotlinCompilationFactory { + override val itemClass: Class + get() = KotlinJsIrCompilation::class.java private val compilationImplFactory: KotlinCompilationImplFactory = KotlinCompilationImplFactory( compilerOptionsFactory = KotlinJsCompilerOptionsFactory, @@ -39,7 +38,7 @@ class KotlinJsIrCompilationFactory internal constructor( }, ) - override fun create(name: String): KotlinJsCompilation = target.project.objects.newInstance( + override fun create(name: String): KotlinJsIrCompilation = target.project.objects.newInstance( itemClass, compilationImplFactory.create(target, name) ) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt index b510838dcb9..5268b0a287f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt @@ -15,7 +15,6 @@ import org.gradle.language.base.plugins.LifecycleBasePlugin import org.jetbrains.kotlin.gradle.plugin.AbstractKotlinTargetConfigurator import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation import org.jetbrains.kotlin.gradle.plugin.KotlinTargetWithTests -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.plugin.mpp.isMain import org.jetbrains.kotlin.gradle.utils.whenEvaluated import org.jetbrains.kotlin.gradle.targets.js.KotlinJsPlatformTestRun @@ -104,7 +103,7 @@ abstract class KotlinJsIrSubTarget( } } - private fun configureTestsRun(testRun: KotlinJsPlatformTestRun, compilation: KotlinJsCompilation) { + private fun configureTestsRun(testRun: KotlinJsPlatformTestRun, compilation: KotlinJsIrCompilation) { fun KotlinJsPlatformTestRun.subtargetTestTaskName(): String = disambiguateCamelCased( lowerCamelCaseName( name.takeIf { it != KotlinTargetWithTests.DEFAULT_TEST_RUN_NAME }, @@ -193,14 +192,14 @@ abstract class KotlinJsIrSubTarget( } } - private fun configureMain(compilation: KotlinJsCompilation) { + private fun configureMain(compilation: KotlinJsIrCompilation) { configureRun(compilation) configureBuild(compilation) } - protected abstract fun configureRun(compilation: KotlinJsCompilation) + protected abstract fun configureRun(compilation: KotlinJsIrCompilation) - protected abstract fun configureBuild(compilation: KotlinJsCompilation) + protected abstract fun configureBuild(compilation: KotlinJsIrCompilation) private fun configureLibrary() { target.compilations.all { compilation -> @@ -210,7 +209,7 @@ abstract class KotlinJsIrSubTarget( } } - protected open fun configureLibrary(compilation: KotlinJsCompilation) { + protected open fun configureLibrary(compilation: KotlinJsIrCompilation) { val project = compilation.target.project val assembleTaskProvider = project.tasks.named(LifecycleBasePlugin.ASSEMBLE_TASK_NAME) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTargetBase.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTargetBase.kt index e52ab6d7a46..6c5f0b8820c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTargetBase.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTargetBase.kt @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.gradle.targets.js.ir import org.gradle.language.base.plugins.LifecycleBasePlugin -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsBinaryMode import org.jetbrains.kotlin.gradle.tasks.dependsOn import org.jetbrains.kotlin.util.capitalizeDecapitalize.toLowerCaseAsciiOnly @@ -16,7 +15,7 @@ abstract class KotlinJsIrSubTargetBase(target: KotlinJsIrTarget, classifier: Str protected val runTaskName = disambiguateCamelCased("run") - override fun configureRun(compilation: KotlinJsCompilation) { + override fun configureRun(compilation: KotlinJsIrCompilation) { compilation.binaries .withType(JsIrBinary::class.java) .matching { it is Executable } @@ -41,7 +40,7 @@ abstract class KotlinJsIrSubTargetBase(target: KotlinJsIrTarget, classifier: Str protected abstract fun locateOrRegisterRunTask(binary: JsIrBinary, name: String) - override fun configureBuild(compilation: KotlinJsCompilation) { + override fun configureBuild(compilation: KotlinJsIrCompilation) { compilation.binaries .getIrBinaries(KotlinJsBinaryMode.PRODUCTION) .matching { it is Executable } @@ -50,7 +49,7 @@ abstract class KotlinJsIrSubTargetBase(target: KotlinJsIrTarget, classifier: Str } } - override fun configureLibrary(compilation: KotlinJsCompilation) { + override fun configureLibrary(compilation: KotlinJsIrCompilation) { super.configureLibrary(compilation) compilation.binaries diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt index 5af6b1107f0..e700ca7e444 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt @@ -46,7 +46,7 @@ constructor( project: Project, platformType: KotlinPlatformType, ) : - KotlinTargetWithBinaries(project, platformType), + KotlinTargetWithBinaries(project, platformType), KotlinTargetWithTests, KotlinJsTargetDsl, KotlinWasmJsTargetDsl, @@ -127,7 +127,7 @@ constructor( ) override val binaries: KotlinJsBinaryContainer - get() = compilations.withType(KotlinJsCompilation::class.java) + get() = compilations.withType(KotlinJsIrCompilation::class.java) .named(MAIN_COMPILATION_NAME) .map { it.binaries } .get() diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt index 6789a223c43..06cd6b4940f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt @@ -10,10 +10,9 @@ import org.jetbrains.kotlin.gradle.dsl.JsSourceMapEmbedMode import org.jetbrains.kotlin.gradle.dsl.KotlinJsCompilerOptions import org.jetbrains.kotlin.gradle.plugin.KotlinOnlyTargetConfigurator import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation open class KotlinJsIrTargetConfigurator : - KotlinOnlyTargetConfigurator(true) { + KotlinOnlyTargetConfigurator(true) { override val runtimeIncludesCompilationOutputs: Boolean = false diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetPreset.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetPreset.kt index cc8d656cdb6..bfdd703cc41 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetPreset.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetPreset.kt @@ -11,7 +11,6 @@ import org.jetbrains.kotlin.gradle.plugin.AbstractKotlinTargetConfigurator import org.jetbrains.kotlin.gradle.plugin.KotlinOnlyTargetConfigurator import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinCompilationFactory -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinOnlyTarget import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinOnlyTargetPreset import org.jetbrains.kotlin.gradle.plugin.statistics.KotlinBuildStatsService @@ -21,7 +20,7 @@ import org.jetbrains.kotlin.statistics.metrics.StringMetrics @DeprecatedTargetPresetApi open class KotlinJsIrTargetPreset( project: Project, -) : KotlinOnlyTargetPreset( +) : KotlinOnlyTargetPreset( project ) { open val isMpp: Boolean @@ -54,7 +53,7 @@ open class KotlinJsIrTargetPreset( //TODO[Ilya Goncharov] remove public morozov public override fun createCompilationFactory( forTarget: KotlinJsIrTarget, - ): KotlinCompilationFactory = + ): KotlinCompilationFactory = KotlinJsIrCompilationFactory(forTarget) companion object { @@ -72,10 +71,10 @@ class KotlinJsIrSingleTargetPreset( get() = false // In a Kotlin/JS single-platform project, we don't need any disambiguation suffixes or prefixes in the names: - override fun provideTargetDisambiguationClassifier(target: KotlinOnlyTarget): String? { + override fun provideTargetDisambiguationClassifier(target: KotlinOnlyTarget): String? { return null } - override fun createKotlinTargetConfigurator(): KotlinOnlyTargetConfigurator = + override fun createKotlinTargetConfigurator(): KotlinOnlyTargetConfigurator = KotlinJsIrTargetConfigurator() } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinWasmTargetPreset.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinWasmTargetPreset.kt index f18123e06e5..4c41724a42a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinWasmTargetPreset.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinWasmTargetPreset.kt @@ -9,7 +9,6 @@ import org.gradle.api.Project import org.jetbrains.kotlin.gradle.DeprecatedTargetPresetApi import org.jetbrains.kotlin.gradle.plugin.* import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinCompilationFactory -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinOnlyTargetPreset import org.jetbrains.kotlin.gradle.targets.js.KotlinWasmTargetType import org.jetbrains.kotlin.util.capitalizeDecapitalize.capitalizeAsciiOnly @@ -19,7 +18,7 @@ import org.jetbrains.kotlin.util.capitalizeDecapitalize.toLowerCaseAsciiOnly class KotlinWasmTargetPreset( project: Project, private val targetType: KotlinWasmTargetType -) : KotlinOnlyTargetPreset(project) { +) : KotlinOnlyTargetPreset(project) { override val platformType: KotlinPlatformType = KotlinPlatformType.wasm override fun instantiateTarget(name: String): KotlinJsIrTarget { @@ -41,7 +40,7 @@ class KotlinWasmTargetPreset( public override fun createCompilationFactory( forTarget: KotlinJsIrTarget - ): KotlinCompilationFactory = + ): KotlinCompilationFactory = KotlinJsIrCompilationFactory(forTarget) companion object { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt index 41de8a75885..935de2d165c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt @@ -10,10 +10,10 @@ import org.gradle.api.tasks.* import org.gradle.work.DisableCachingByDefault import org.gradle.work.NormalizeLineEndings import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.targets.js.KotlinWasmTargetType import org.jetbrains.kotlin.gradle.targets.js.RequiredKotlinJsDependency import org.jetbrains.kotlin.gradle.targets.js.addWasmExperimentalArguments +import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrCompilation import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTarget import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin.Companion.kotlinNodeJsExtension import org.jetbrains.kotlin.gradle.targets.js.npm.RequiresNpmDependencies @@ -28,7 +28,7 @@ open class NodeJsExec constructor( @Internal @Transient - override val compilation: KotlinJsCompilation, + override val compilation: KotlinJsIrCompilation, ) : AbstractExecTask(NodeJsExec::class.java), RequiresNpmDependencies { @Transient @get:Internal @@ -91,7 +91,7 @@ constructor( companion object { fun create( - compilation: KotlinJsCompilation, + compilation: KotlinJsIrCompilation, name: String, configuration: NodeJsExec.() -> Unit = {} ): TaskProvider { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmProject.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmProject.kt index c6d3bc26960..1622a3f95f0 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmProject.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmProject.kt @@ -13,23 +13,27 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.plugin.mpp.disambiguateName import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsTargetDsl -import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin +import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrCompilation import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin.Companion.kotlinNodeJsExtension import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinPackageJsonTask import org.jetbrains.kotlin.util.capitalizeDecapitalize.toLowerCaseAsciiOnly import java.io.File import java.io.Serializable -val KotlinJsCompilation.npmProject: NpmProject +val KotlinJsIrCompilation.npmProject: NpmProject get() = NpmProject(this) +@Deprecated("Use npmProject for KotlinJsIrCompilation") +val KotlinJsCompilation.npmProject: NpmProject + get() = NpmProject(this as KotlinJsIrCompilation) + /** * Basic info for [NpmProject] created from [compilation]. * This class contains only basic info. * * More info can be obtained from [KotlinCompilationNpmResolution], which is available after project resolution (after [KotlinNpmInstallTask] execution). */ -open class NpmProject(@Transient val compilation: KotlinJsCompilation) : Serializable { +open class NpmProject(@Transient val compilation: KotlinJsIrCompilation) : Serializable { val compilationName = compilation.disambiguatedName private val extension by lazy { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/RequiresNpmDependencies.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/RequiresNpmDependencies.kt index 45d0a100302..85469eb9a32 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/RequiresNpmDependencies.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/RequiresNpmDependencies.kt @@ -6,11 +6,11 @@ package org.jetbrains.kotlin.gradle.targets.js.npm import org.gradle.api.tasks.Internal -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.targets.js.RequiredKotlinJsDependency +import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrCompilation interface RequiresNpmDependencies { - val compilation: KotlinJsCompilation + val compilation: KotlinJsIrCompilation val requiredNpmDependencies: Set @Internal diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt index eda88c2ee7d..253dfcbee1e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt @@ -19,13 +19,13 @@ import org.gradle.api.tasks.bundling.Zip import org.jetbrains.kotlin.gradle.dsl.JsModuleKind import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation import org.jetbrains.kotlin.gradle.plugin.categoryByName -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages import org.jetbrains.kotlin.gradle.plugin.mpp.isMain import org.jetbrains.kotlin.gradle.plugin.sources.KotlinDependencyScope import org.jetbrains.kotlin.gradle.plugin.sources.compilationDependencyConfigurationByScope import org.jetbrains.kotlin.gradle.plugin.sources.sourceSetDependencyConfigurationByScope import org.jetbrains.kotlin.gradle.plugin.usesPlatformOf +import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrCompilation import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTarget import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin.Companion.kotlinNodeJsExtension import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin.Companion.kotlinNpmResolutionManager @@ -42,7 +42,7 @@ import java.io.Serializable */ class KotlinCompilationNpmResolver( val projectResolver: KotlinProjectNpmResolver, - val compilation: KotlinJsCompilation, + val compilation: KotlinJsIrCompilation, ) : Serializable { var rootResolver = projectResolver.resolver @@ -204,7 +204,7 @@ class KotlinCompilationNpmResolver( //TODO: rewrite when we get general way to have inter compilation dependencies if (compilation.name == KotlinCompilation.TEST_COMPILATION_NAME) { - val main = compilation.target.compilations.findByName(KotlinCompilation.MAIN_COMPILATION_NAME) as KotlinJsCompilation + val main = compilation.target.compilations.findByName(KotlinCompilation.MAIN_COMPILATION_NAME) as KotlinJsIrCompilation internalDependencies.add( InternalDependency( projectResolver.projectPath, diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinProjectNpmResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinProjectNpmResolver.kt index 4af636bd6e6..aa7b27218a3 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinProjectNpmResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinProjectNpmResolver.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinSingleTargetExtension import org.jetbrains.kotlin.gradle.dsl.kotlinExtensionOrNull import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType import org.jetbrains.kotlin.gradle.plugin.KotlinTarget -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation +import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrCompilation import org.jetbrains.kotlin.gradle.targets.js.npm.KotlinNpmResolutionManager import org.jetbrains.kotlin.gradle.targets.js.npm.resolved.KotlinProjectNpmResolution import java.io.Serializable @@ -30,7 +30,7 @@ class KotlinProjectNpmResolver( private val byCompilation = mutableMapOf() - operator fun get(compilation: KotlinJsCompilation): KotlinCompilationNpmResolver { + operator fun get(compilation: KotlinJsIrCompilation): KotlinCompilationNpmResolver { return byCompilation[compilation.disambiguatedName] ?: error("$compilation was not registered in $this") } @@ -67,7 +67,7 @@ class KotlinProjectNpmResolver( target.platformType == KotlinPlatformType.wasm ) { target.compilations.all { compilation -> - if (compilation is KotlinJsCompilation) { + if (compilation is KotlinJsIrCompilation) { // compilation may be KotlinWithJavaTarget for old Kotlin2JsPlugin addCompilation(compilation) } @@ -76,7 +76,7 @@ class KotlinProjectNpmResolver( } @Synchronized - private fun addCompilation(compilation: KotlinJsCompilation) { + private fun addCompilation(compilation: KotlinJsIrCompilation) { check(resolution == null) { resolver.alreadyResolvedMessage("add compilation $compilation") } byCompilation[compilation.disambiguatedName] = diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinRootNpmResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinRootNpmResolver.kt index f8f066fe047..dd89ad75f74 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinRootNpmResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinRootNpmResolver.kt @@ -7,10 +7,10 @@ package org.jetbrains.kotlin.gradle.targets.js.npm.resolver import org.gradle.api.Project import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.plugin.mpp.isMain import org.jetbrains.kotlin.gradle.targets.js.KotlinWasmTargetType import org.jetbrains.kotlin.gradle.targets.js.NpmVersions +import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrCompilation import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTarget import org.jetbrains.kotlin.gradle.targets.js.nodejs.TasksRequirements import org.jetbrains.kotlin.gradle.targets.js.npm.resolved.KotlinRootNpmResolution @@ -43,7 +43,7 @@ class KotlinRootNpmResolver internal constructor( internal operator fun get(projectPath: String) = projectResolvers[projectPath] ?: error("$projectPath is not configured for JS usage") - val compilations: Collection + val compilations: Collection get() = projectResolvers.values.flatMap { it.compilationResolvers.map { it.compilation } } internal fun findDependentResolver(src: Project, target: Project): List? { @@ -67,7 +67,7 @@ class KotlinRootNpmResolver internal constructor( check(mainCompilations.size <= maxMainCompilationsCount) { errorMessage } for (npmResolver in mainCompilations) { when (val compilation = npmResolver.compilation) { - is KotlinJsCompilation -> { + is KotlinJsIrCompilation -> { if (compilation.platformType == KotlinPlatformType.wasm) { val jsTarget = compilation.target as KotlinJsIrTarget if (jsTarget.wasmTargetType == KotlinWasmTargetType.JS) { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt index 98f88464405..3990b435883 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt @@ -14,7 +14,7 @@ import org.gradle.api.provider.Provider import org.gradle.api.tasks.* import org.gradle.work.DisableCachingByDefault import org.gradle.work.NormalizeLineEndings -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation +import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrCompilation import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin.Companion.kotlinNodeJsExtension @@ -123,7 +123,7 @@ abstract class KotlinPackageJsonTask : } companion object { - fun create(compilation: KotlinJsCompilation): TaskProvider { + fun create(compilation: KotlinJsIrCompilation): TaskProvider { val target = compilation.target val project = target.project val npmProject = compilation.npmProject diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinJsTest.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinJsTest.kt index eec73c9a663..80821570474 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinJsTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinJsTest.kt @@ -14,15 +14,12 @@ import org.gradle.process.internal.DefaultProcessForkOptions import org.gradle.work.DisableCachingByDefault import org.gradle.work.NormalizeLineEndings import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecutionSpec -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.targets.js.RequiredKotlinJsDependency +import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrCompilation import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin.Companion.kotlinNodeJsExtension import org.jetbrains.kotlin.gradle.targets.js.npm.RequiresNpmDependencies -import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject import org.jetbrains.kotlin.gradle.targets.js.testing.karma.KotlinKarma import org.jetbrains.kotlin.gradle.targets.js.testing.mocha.KotlinMocha -import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpack -import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig import org.jetbrains.kotlin.gradle.tasks.KotlinTest import org.jetbrains.kotlin.gradle.utils.getValue import org.jetbrains.kotlin.gradle.utils.newFileProperty @@ -34,7 +31,7 @@ abstract class KotlinJsTest constructor( @Transient @Internal - override var compilation: KotlinJsCompilation + override var compilation: KotlinJsIrCompilation ) : KotlinTest(), RequiresNpmDependencies { @Transient diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinWasmD8.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinWasmD8.kt index 31048c440da..30342c70028 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinWasmD8.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinWasmD8.kt @@ -10,11 +10,11 @@ import org.gradle.process.ProcessForkOptions import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesClientSettings import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecutionSpec import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecutor -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.targets.js.RequiredKotlinJsDependency import org.jetbrains.kotlin.gradle.targets.js.addWasmExperimentalArguments import org.jetbrains.kotlin.gradle.targets.js.d8.D8RootPlugin import org.jetbrains.kotlin.gradle.targets.js.internal.parseNodeJsStackTraceAsJvm +import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrCompilation import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject import org.jetbrains.kotlin.gradle.targets.js.writeWasmUnitTestRunner import org.jetbrains.kotlin.gradle.utils.doNotTrackStateCompat @@ -24,7 +24,7 @@ import java.nio.file.Path internal class KotlinWasmD8(private val kotlinJsTest: KotlinJsTest) : KotlinJsTestFramework { override val settingsState: String = "KotlinWasmD8" @Transient - override val compilation: KotlinJsCompilation = kotlinJsTest.compilation + override val compilation: KotlinJsIrCompilation = kotlinJsTest.compilation @Transient private val project: Project = compilation.target.project diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinWasmNode.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinWasmNode.kt index c0ea0380c6e..33233bfc2dd 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinWasmNode.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinWasmNode.kt @@ -10,11 +10,11 @@ import org.gradle.process.ProcessForkOptions import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesClientSettings import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecutionSpec import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecutor -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.targets.js.KotlinWasmTargetType import org.jetbrains.kotlin.gradle.targets.js.RequiredKotlinJsDependency import org.jetbrains.kotlin.gradle.targets.js.addWasmExperimentalArguments import org.jetbrains.kotlin.gradle.targets.js.internal.parseNodeJsStackTraceAsJvm +import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrCompilation import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTarget import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject import org.jetbrains.kotlin.gradle.targets.js.writeWasmUnitTestRunner @@ -25,7 +25,7 @@ import java.nio.file.Path internal class KotlinWasmNode(private val kotlinJsTest: KotlinJsTest) : KotlinJsTestFramework { override val settingsState: String = "KotlinWasmNode" @Transient - override val compilation: KotlinJsCompilation = kotlinJsTest.compilation + override val compilation: KotlinJsIrCompilation = kotlinJsTest.compilation private val isTeamCity = compilation.target.project.providers.gradleProperty(TCServiceMessagesTestExecutor.TC_PROJECT_PROPERTY) @Transient diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt index ee40932e334..aaa897c6c7f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt @@ -23,12 +23,12 @@ import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecuto import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider.Companion.kotlinPropertiesProvider import org.jetbrains.kotlin.gradle.plugin.internal.MppTestReportHelper -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.targets.js.NpmPackageVersion import org.jetbrains.kotlin.gradle.targets.js.RequiredKotlinJsDependency import org.jetbrains.kotlin.gradle.targets.js.appendConfigsFromDir import org.jetbrains.kotlin.gradle.targets.js.dsl.WebpackRulesDsl.Companion.webpackRulesContainer import org.jetbrains.kotlin.gradle.targets.js.internal.parseNodeJsStackTraceAsJvm +import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrCompilation import org.jetbrains.kotlin.gradle.targets.js.jsQuoted import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin.Companion.kotlinNodeJsExtension import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject @@ -44,7 +44,7 @@ import java.io.File import java.nio.file.Path class KotlinKarma( - @Transient override val compilation: KotlinJsCompilation, + @Transient override val compilation: KotlinJsIrCompilation, private val services: () -> ServiceRegistry, private val basePath: String, ) : KotlinJsTestFramework { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt index 5eb28adfedc..05c0ee0f00a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt @@ -11,10 +11,9 @@ import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesClientSetti import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecutionSpec import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecutor import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.targets.js.RequiredKotlinJsDependency import org.jetbrains.kotlin.gradle.targets.js.internal.parseNodeJsStackTraceAsJvm -import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin +import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrCompilation import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin.Companion.kotlinNodeJsExtension import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest @@ -23,7 +22,7 @@ import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinTestRunnerCliArgs import org.jetbrains.kotlin.gradle.utils.getValue import java.nio.file.Path -class KotlinMocha(@Transient override val compilation: KotlinJsCompilation, private val basePath: String) : +class KotlinMocha(@Transient override val compilation: KotlinJsIrCompilation, private val basePath: String) : KotlinJsTestFramework { @Transient private val project: Project = compilation.target.project diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/typescript/TypeScriptValidationTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/typescript/TypeScriptValidationTask.kt index 05c68e33eb6..0e57a8ed313 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/typescript/TypeScriptValidationTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/typescript/TypeScriptValidationTask.kt @@ -12,9 +12,9 @@ import org.gradle.api.tasks.* import org.gradle.work.DisableCachingByDefault import org.gradle.work.NormalizeLineEndings import org.jetbrains.kotlin.gradle.internal.execWithProgress -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.targets.js.RequiredKotlinJsDependency import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinIrJsGeneratedTSValidationStrategy +import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrCompilation import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin.Companion.kotlinNodeJsExtension import org.jetbrains.kotlin.gradle.targets.js.npm.RequiresNpmDependencies import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject @@ -26,7 +26,7 @@ abstract class TypeScriptValidationTask constructor( @Internal @Transient - override val compilation: KotlinJsCompilation + override val compilation: KotlinJsIrCompilation ) : DefaultTask(), RequiresNpmDependencies { private val npmProject = compilation.npmProject diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt index 4da91ed06f0..e0162e63da9 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt @@ -24,13 +24,13 @@ import org.gradle.process.internal.ExecHandleFactory import org.gradle.work.NormalizeLineEndings import org.jetbrains.kotlin.build.report.metrics.* import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.utils.archivesName import org.jetbrains.kotlin.gradle.report.UsesBuildMetricsService import org.jetbrains.kotlin.gradle.targets.js.RequiredKotlinJsDependency import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinWebpackRulesContainer import org.jetbrains.kotlin.gradle.targets.js.dsl.WebpackRulesDsl import org.jetbrains.kotlin.gradle.targets.js.dsl.WebpackRulesDsl.Companion.webpackRulesContainer +import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrCompilation import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin.Companion.kotlinNodeJsExtension import org.jetbrains.kotlin.gradle.targets.js.npm.RequiresNpmDependencies import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject @@ -48,7 +48,7 @@ abstract class KotlinWebpack constructor( @Internal @Transient - override val compilation: KotlinJsCompilation, + override val compilation: KotlinJsIrCompilation, private val objects: ObjectFactory ) : DefaultTask(), RequiresNpmDependencies, WebpackRulesDsl, UsesBuildMetricsService { @Transient diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/Kotlin2JsCompileConfig.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/Kotlin2JsCompileConfig.kt index ee9899fbf90..992a0d19dcf 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/Kotlin2JsCompileConfig.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/Kotlin2JsCompileConfig.kt @@ -9,7 +9,6 @@ import org.jetbrains.kotlin.compilerRunner.GradleCompilerRunner import org.jetbrains.kotlin.gradle.incremental.IncrementalModuleInfoBuildService import org.jetbrains.kotlin.gradle.plugin.KotlinCompilationInfo import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinWithJavaTarget import org.jetbrains.kotlin.gradle.plugin.tcs import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget @@ -129,7 +128,7 @@ internal open class BaseKotlin2JsCompileConfig( if (compilation.platformType == KotlinPlatformType.wasm) { add(WASM_BACKEND) - val wasmTargetType = ((compilation.origin as KotlinJsCompilation).target as KotlinJsIrTarget).wasmTargetType!! + val wasmTargetType = ((compilation.origin as KotlinJsIrCompilation).target as KotlinJsIrTarget).wasmTargetType!! val targetValue = if (wasmTargetType == KotlinWasmTargetType.WASI) "wasm-wasi" else "wasm-js" add("$WASM_TARGET=$targetValue") } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KotlinJsIrLinkConfig.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KotlinJsIrLinkConfig.kt index 8ece82b3d5e..1f5b3743203 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KotlinJsIrLinkConfig.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KotlinJsIrLinkConfig.kt @@ -8,7 +8,6 @@ package org.jetbrains.kotlin.gradle.tasks.configuration import org.gradle.api.InvalidUserDataException import org.jetbrains.kotlin.gradle.plugin.KotlinCompilationInfo import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.targets.js.KotlinWasmTargetType import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsBinaryMode import org.jetbrains.kotlin.gradle.targets.js.ir.* @@ -100,7 +99,7 @@ internal open class KotlinJsIrLinkConfig( if (compilation.platformType == KotlinPlatformType.wasm) { add(WASM_BACKEND) - val wasmTargetType = ((compilation.origin as KotlinJsCompilation).target as KotlinJsIrTarget).wasmTargetType!! + val wasmTargetType = ((compilation.origin as KotlinJsIrCompilation).target as KotlinJsIrTarget).wasmTargetType!! val targetValue = if (wasmTargetType == KotlinWasmTargetType.WASI) "wasm-wasi" else "wasm-js" add("$WASM_TARGET=$targetValue") }