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

[Gradle][Minor] KotlinJsIrSourceSetProcessor: Access runtimeDependencyFiles safely

Browse Source 
As it might happen, that the configure code could be triggered
too early, capturing the state of 'runtimeDependencyFiles' to early as well.

^KT-60937 Verification Pending
This commit is contained in:
Sebastian Sellmair
2023-08-04 15:53:18 +02:00
committed by Space Team
parent ba270fc7df
commit 8ce820d944
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/plugin/KotlinJsIrSourceSetProcessor.kt
+2 -2
View File
@@ -18,7 +18,7 @@ import org.jetbrains.kotlin.gradle.utils.filesProvider
internal class KotlinJsIrSourceSetProcessor( internal class KotlinJsIrSourceSetProcessor(
tasksProvider: KotlinTasksProvider, tasksProvider: KotlinTasksProvider,
kotlinCompilation: KotlinCompilationInfo kotlinCompilation: KotlinCompilationInfo,
) : KotlinSourceSetProcessor<Kotlin2JsCompile>( ) : KotlinSourceSetProcessor<Kotlin2JsCompile>(
tasksProvider, taskDescription = "Compiles the Kotlin sources in $kotlinCompilation to JavaScript.", tasksProvider, taskDescription = "Compiles the Kotlin sources in $kotlinCompilation to JavaScript.",
kotlinCompilation = kotlinCompilation kotlinCompilation = kotlinCompilation
@@ -47,7 +47,7 @@ internal class KotlinJsIrSourceSetProcessor(
val configAction = KotlinJsIrLinkConfig(binary) val configAction = KotlinJsIrLinkConfig(binary)
configAction.configureTask { configAction.configureTask {
it.description = taskDescription it.description = taskDescription
it.libraries.from(compilation.runtimeDependencyFiles) it.libraries.from(project.filesProvider { compilation.runtimeDependencyFiles })
} }
configAction.configureTask { task -> configAction.configureTask { task ->
task.modeProperty.set(binary.mode) task.modeProperty.set(binary.mode)