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

[Gradle, JS] Hardcode legacy DCE tool main class

Browse Source 
It allows getting rid of the dependency on `:compiler:cli-js`
#KT-61449 In Progress
This commit is contained in:
Alexander.Likhachev
2023-08-14 13:37:12 +02:00
committed by Space Team
parent 52ac237015
commit d9a6bed012
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJsDce.kt
+2 -2
View File
@@ -26,7 +26,6 @@ import org.gradle.work.InputChanges
import org.gradle.work.NormalizeLineEndings import org.gradle.work.NormalizeLineEndings
import org.jetbrains.kotlin.cli.common.arguments.DevModeOverwritingStrategies import org.jetbrains.kotlin.cli.common.arguments.DevModeOverwritingStrategies
import org.jetbrains.kotlin.cli.common.arguments.K2JSDceArguments 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.ArgumentUtils
import org.jetbrains.kotlin.compilerRunner.runToolInSeparateProcess import org.jetbrains.kotlin.compilerRunner.runToolInSeparateProcess
import org.jetbrains.kotlin.gradle.dsl.* import org.jetbrains.kotlin.gradle.dsl.*
@@ -131,7 +130,7 @@ abstract class KotlinJsDce @Inject constructor(
val exitCode = runToolInSeparateProcess( val exitCode = runToolInSeparateProcess(
ArgumentUtils.convertArgumentsToStringList(arguments).toTypedArray(), ArgumentUtils.convertArgumentsToStringList(arguments).toTypedArray(),
K2JSDce::class.java.name, dceToolMainClassName,
defaultCompilerClasspath, defaultCompilerClasspath,
GradleKotlinLogger(logger), GradleKotlinLogger(logger),
buildDir.get().asFile, buildDir.get().asFile,
@@ -155,6 +154,7 @@ abstract class KotlinJsDce @Inject constructor(
companion object { companion object {
const val strategyAllArg = "-Xdev-mode-overwriting-strategy=${DevModeOverwritingStrategies.ALL}" const val strategyAllArg = "-Xdev-mode-overwriting-strategy=${DevModeOverwritingStrategies.ALL}"
const val strategyOlderArg = "-Xdev-mode-overwriting-strategy=${DevModeOverwritingStrategies.OLDER}" const val strategyOlderArg = "-Xdev-mode-overwriting-strategy=${DevModeOverwritingStrategies.OLDER}"
const val dceToolMainClassName = "org.jetbrains.kotlin.cli.js.dce.K2JSDce"
} }
@Suppress("DeprecatedCallableAddReplaceWith") @Suppress("DeprecatedCallableAddReplaceWith")