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

[Gradle] Remove .configure duplication in ExternalKotlinTargetDescriptorBuilder

Browse Source 
KT-58601
This commit is contained in:
Sebastian Sellmair
2023-05-10 15:22:54 +02:00
committed by Space Team
parent e1e2c04044
commit f588b06ca5
2 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/api/kotlin-gradle-plugin.api
-4
View File
@@ -311,16 +311,12 @@ public final class org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotli
public final fun configureIdeImport (Lkotlin/jvm/functions/Function1;)V
public final fun getApiElements ()Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetConfigurationDescriptorBuilder;
public final fun getApiElementsPublished ()Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetConfigurationDescriptorBuilder;
public final fun getConfigure ()Lkotlin/jvm/functions/Function1;
public final fun getConfigureIdeImport ()Lkotlin/jvm/functions/Function1;
public final fun getPlatformType ()Lorg/jetbrains/kotlin/gradle/plugin/KotlinPlatformType;
public final fun getRuntimeElements ()Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetConfigurationDescriptorBuilder;
public final fun getRuntimeElementsPublished ()Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetConfigurationDescriptorBuilder;
public final fun getSourcesElements ()Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetConfigurationDescriptorBuilder;
public final fun getTargetFactory ()Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetDescriptor$TargetFactory;
public final fun getTargetName ()Ljava/lang/String;
public final fun setConfigure (Lkotlin/jvm/functions/Function1;)V
public final fun setConfigureIdeImport (Lkotlin/jvm/functions/Function1;)V
public final fun setPlatformType (Lorg/jetbrains/kotlin/gradle/plugin/KotlinPlatformType;)V
public final fun setTargetFactory (Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetDescriptor$TargetFactory;)V
public final fun setTargetName (Ljava/lang/String;)V
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetDescriptor.kt
Vendored
+4 -16
View File
@@ -48,13 +48,13 @@ interface ExternalKotlinTargetDescriptor<T : DecoratedExternalKotlinTarget> {
*/
@ExternalKotlinTargetApi
fun <T : DecoratedExternalKotlinTarget> ExternalKotlinTargetDescriptor(
configure: ExternalKotlinTargetDescriptorBuilder<T>.() -> Unit
configure: ExternalKotlinTargetDescriptorBuilder<T>.() -> Unit,
): ExternalKotlinTargetDescriptor<T> {
return ExternalKotlinTargetDescriptorBuilder<T>().also(configure).build()
}
/**
* Mutable version of [ExternalKotlinTargetDescriptor]
* Builder for [ExternalKotlinTargetDescriptor]
* The following properties have to be specified:
* - [targetName]
* - [platformType]
@@ -84,12 +84,7 @@ class ExternalKotlinTargetDescriptorBuilder<T : DecoratedExternalKotlinTarget> i
val runtimeElementsPublished: ExternalKotlinTargetConfigurationDescriptorBuilder<T> =
ExternalKotlinTargetConfigurationDescriptorBuilder()
/**
* Generic configuration that will be invoked when building the target.
* This configuration is called right after creating the instance and before
* publishing the target to all subscribers of `kotlin.targets.all {}`
*/
var configure: ((T) -> Unit)? = null
private var configure: ((T) -> Unit)? = null
/**
* Generic configuration that will be invoked when building the target.
@@ -102,14 +97,7 @@ class ExternalKotlinTargetDescriptorBuilder<T : DecoratedExternalKotlinTarget> i
else this.configure = { configure(it); action(it) }
}
/**
* Main entrance of configuring the ide import:
* The [IdeMultiplatformImport] instance passed to this function shall
* not be captured and used outside of this block.
*
* The [IdeMultiplatformImport] instance shall not be retrieved any other way than using this function.
*/
var configureIdeImport: (IdeMultiplatformImport.() -> Unit)? = null
internal var configureIdeImport: (IdeMultiplatformImport.() -> Unit)? = null
/**
* Main entrance of configuring the ide import: