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

[Gradle] KotlinJsDce: Implement KotlinCompilerArgumentsProducer

Browse Source 
KTIJ-24976
This commit is contained in:
Sebastian Sellmair
2023-03-21 15:55:54 +01:00
committed by Space Team
parent d6e3b63069
commit e8d217a8d9
2 changed files with 16 additions and 23 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/plugin/KotlinCompilerArgumentsProducer.kt
+1 -1
View File
@@ -33,7 +33,7 @@ interface KotlinCompilerArgumentsProducer {
val default: CreateCompilerArgumentsContext = CreateCompilerArgumentsContext()
val lenient: CreateCompilerArgumentsContext = CreateCompilerArgumentsContext(isLenient = true)
inline fun <reified T : CommonCompilerArguments> CreateCompilerArgumentsContext.create(
inline fun <reified T : CommonToolArguments> CreateCompilerArgumentsContext.create(
noinline action: ContributeCompilerArgumentsContext<T>.() -> Unit
) = create(T::class, action)
}
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJsDce.kt
+15 -22
View File
@@ -27,11 +27,15 @@ 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.*
import org.jetbrains.kotlin.gradle.dsl.KotlinJsDce
import org.jetbrains.kotlin.gradle.dsl.KotlinJsDceCompilerToolOptionsDefault
import org.jetbrains.kotlin.gradle.logging.GradleKotlinLogger
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerArgumentsProducer
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerArgumentsProducer.CreateCompilerArgumentsContext
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerArgumentsProducer.CreateCompilerArgumentsContext.Companion.create
import org.jetbrains.kotlin.gradle.utils.absolutePathWithoutExtension
import org.jetbrains.kotlin.gradle.utils.fileExtensionCasePermutations
import org.jetbrains.kotlin.gradle.utils.newInstance
@@ -54,11 +58,13 @@ abstract class KotlinJsDce @Inject constructor(
override val toolOptions: KotlinJsDceCompilerToolOptions = objectFactory.newInstance<KotlinJsDceCompilerToolOptionsDefault>()
override fun createCompilerArgs(): K2JSDceArguments = K2JSDceArguments()
override fun setupCompilerArgs(args: K2JSDceArguments, defaultsOnly: Boolean, ignoreClasspathResolutionErrors: Boolean) {
KotlinJsDceCompilerToolOptionsHelper.fillCompilerArguments(toolOptions, args)
args.declarationsToKeep = keep.toTypedArray()
override fun createCompilerArguments(context: CreateCompilerArgumentsContext) = context.create<K2JSDceArguments> {
contribute(KotlinCompilerArgumentsProducer.ArgumentType.Primitive) { args ->
KotlinJsDceCompilerToolOptionsHelper.fillCompilerArguments(toolOptions, args)
args.declarationsToKeep = keep.toTypedArray()
args.outputDirectory = destinationDirectory.get().asFile.path
args.devModeOverwritingStrategy = DevModeOverwritingStrategies.ALL
}
}
// DCE can be broken in case of non-kotlin js files or modules
@@ -122,27 +128,14 @@ abstract class KotlinJsDce @Inject constructor(
.filter { !kotlinFilesOnly || isDceCandidate(it) }
.map { it.path }
val outputDirArgs = arrayOf("-output-dir", destinationDirectory.get().asFile.path)
@Suppress("DEPRECATION_ERROR")
val processedSerializedArgs = if (shouldPerformIncrementalCopy) {
var shouldAddStrategyAllArgument = true
val processedArgs = serializedCompilerArguments
.map { if (it == strategyOlderArg) strategyAllArg.also { shouldAddStrategyAllArgument = false } else it }
if (shouldAddStrategyAllArgument) processedArgs + strategyAllArg else processedArgs
} else {
serializedCompilerArguments
}
val argsArray = processedSerializedArgs.toTypedArray()
val log = GradleKotlinLogger(logger)
val allArgs = argsArray + outputDirArgs + inputFiles
val arguments = createCompilerArguments()
arguments.freeArgs += inputFiles
val exitCode = runToolInSeparateProcess(
allArgs,
ArgumentUtils.convertArgumentsToStringList(arguments).toTypedArray(),
K2JSDce::class.java.name,
defaultCompilerClasspath,
log,
GradleKotlinLogger(logger),
buildDir.get().asFile,
jvmArgs
)