From d9a6bed012f972ffb76e49524c40223049c062a0 Mon Sep 17 00:00:00 2001 From: "Alexander.Likhachev" Date: Mon, 14 Aug 2023 13:37:12 +0200 Subject: [PATCH] [Gradle, JS] Hardcode legacy DCE tool main class It allows getting rid of the dependency on `:compiler:cli-js` #KT-61449 In Progress --- .../kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJsDce.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJsDce.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJsDce.kt index 93ed28ec392..49096c63506 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJsDce.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJsDce.kt @@ -26,7 +26,6 @@ import org.gradle.work.InputChanges import org.gradle.work.NormalizeLineEndings import org.jetbrains.kotlin.cli.common.arguments.DevModeOverwritingStrategies import org.jetbrains.kotlin.cli.common.arguments.K2JSDceArguments -import org.jetbrains.kotlin.cli.js.dce.K2JSDce import org.jetbrains.kotlin.compilerRunner.ArgumentUtils import org.jetbrains.kotlin.compilerRunner.runToolInSeparateProcess import org.jetbrains.kotlin.gradle.dsl.* @@ -131,7 +130,7 @@ abstract class KotlinJsDce @Inject constructor( val exitCode = runToolInSeparateProcess( ArgumentUtils.convertArgumentsToStringList(arguments).toTypedArray(), - K2JSDce::class.java.name, + dceToolMainClassName, defaultCompilerClasspath, GradleKotlinLogger(logger), buildDir.get().asFile, @@ -155,6 +154,7 @@ abstract class KotlinJsDce @Inject constructor( companion object { const val strategyAllArg = "-Xdev-mode-overwriting-strategy=${DevModeOverwritingStrategies.ALL}" const val strategyOlderArg = "-Xdev-mode-overwriting-strategy=${DevModeOverwritingStrategies.OLDER}" + const val dceToolMainClassName = "org.jetbrains.kotlin.cli.js.dce.K2JSDce" } @Suppress("DeprecatedCallableAddReplaceWith")