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

[Gradle] CInteropConfigurations: Support lazy configuration

Browse Source 
Using 'whenEvaluated' (aka 'afterEvaluate') is not supported
when using lazy APIs (like register). In order to safely
copy user configuration in both use-cases,
'launchInStage(AfterFinaliseDsl)' is used as this will be safe
either way.

^KT-58838 Verification Pending
This commit is contained in:
Sebastian Sellmair
2023-05-24 11:54:08 +02:00
committed by Space Team
parent dafe24a3a9
commit 3b1a7c3ac1
1 changed files with 5 additions and 4 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/targets/native/internal/CInteropConfigurations.kt
+5 -4
View File
@@ -10,20 +10,21 @@ import org.gradle.api.artifacts.Configuration
import org.gradle.api.attributes.* import org.gradle.api.attributes.*
import org.gradle.api.tasks.TaskProvider import org.gradle.api.tasks.TaskProvider
import org.jetbrains.kotlin.gradle.plugin.KotlinNativeTargetConfigurator.NativeArtifactFormat import org.jetbrains.kotlin.gradle.plugin.KotlinNativeTargetConfigurator.NativeArtifactFormat
import org.jetbrains.kotlin.gradle.plugin.KotlinPluginLifecycle.Stage.AfterFinaliseDsl
import org.jetbrains.kotlin.gradle.plugin.KotlinTarget import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
import org.jetbrains.kotlin.gradle.plugin.categoryByName import org.jetbrains.kotlin.gradle.plugin.categoryByName
import org.jetbrains.kotlin.gradle.plugin.internal.artifactTypeAttribute import org.jetbrains.kotlin.gradle.plugin.internal.artifactTypeAttribute
import org.jetbrains.kotlin.gradle.plugin.launchInStage
import org.jetbrains.kotlin.gradle.plugin.mpp.* import org.jetbrains.kotlin.gradle.plugin.mpp.*
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.copyAttributes import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.copyAttributes
import org.jetbrains.kotlin.gradle.plugin.usesPlatformOf import org.jetbrains.kotlin.gradle.plugin.usesPlatformOf
import org.jetbrains.kotlin.gradle.plugin.whenEvaluated
import org.jetbrains.kotlin.gradle.targets.native.internal.CInteropKlibLibraryElements.cinteropKlibLibraryElements import org.jetbrains.kotlin.gradle.targets.native.internal.CInteropKlibLibraryElements.cinteropKlibLibraryElements
import org.jetbrains.kotlin.gradle.tasks.CInteropProcess import org.jetbrains.kotlin.gradle.tasks.CInteropProcess
internal fun createCInteropApiElementsKlibArtifact( internal fun createCInteropApiElementsKlibArtifact(
target: KotlinNativeTarget, target: KotlinNativeTarget,
settings: DefaultCInteropSettings, settings: DefaultCInteropSettings,
interopTask: TaskProvider<out CInteropProcess> interopTask: TaskProvider<out CInteropProcess>,
) { ) {
val project = target.project val project = target.project
val configurationName = cInteropApiElementsConfigurationName(target) val configurationName = cInteropApiElementsConfigurationName(target)
@@ -51,7 +52,7 @@ internal fun Project.locateOrCreateCInteropDependencyConfiguration(
isCanBeConsumed = false isCanBeConsumed = false
/* Deferring attributes to wait for compilation.attributes to be configured by user*/ /* Deferring attributes to wait for compilation.attributes to be configured by user*/
whenEvaluated { launchInStage(AfterFinaliseDsl) {
usesPlatformOf(compilation.target) usesPlatformOf(compilation.target)
copyAttributes(compilation.attributes, attributes) copyAttributes(compilation.attributes, attributes)
attributes.attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, cinteropKlibLibraryElements()) attributes.attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, cinteropKlibLibraryElements())
@@ -74,7 +75,7 @@ internal fun Project.locateOrCreateCInteropApiElementsConfiguration(target: Kotl
isCanBeConsumed = true isCanBeConsumed = true
/* Deferring attributes to wait for target.attributes to be configured by user */ /* Deferring attributes to wait for target.attributes to be configured by user */
whenEvaluated { launchInStage(AfterFinaliseDsl) {
usesPlatformOf(target) usesPlatformOf(target)
copyAttributes(target.attributes, attributes) copyAttributes(target.attributes, attributes)
attributes.attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, cinteropKlibLibraryElements()) attributes.attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, cinteropKlibLibraryElements())