[Gradle] Remove .configure duplication in ExternalKotlinTargetDescriptorBuilder
KT-58601
This commit is contained in:
committed by
Space Team
parent
e1e2c04044
commit
f588b06ca5
@@ -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 configureIdeImport (Lkotlin/jvm/functions/Function1;)V
|
||||||
public final fun getApiElements ()Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetConfigurationDescriptorBuilder;
|
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 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 getPlatformType ()Lorg/jetbrains/kotlin/gradle/plugin/KotlinPlatformType;
|
||||||
public final fun getRuntimeElements ()Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetConfigurationDescriptorBuilder;
|
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 getRuntimeElementsPublished ()Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetConfigurationDescriptorBuilder;
|
||||||
public final fun getSourcesElements ()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 getTargetFactory ()Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetDescriptor$TargetFactory;
|
||||||
public final fun getTargetName ()Ljava/lang/String;
|
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 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 setTargetFactory (Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetDescriptor$TargetFactory;)V
|
||||||
public final fun setTargetName (Ljava/lang/String;)V
|
public final fun setTargetName (Ljava/lang/String;)V
|
||||||
|
|||||||
+4
-16
@@ -48,13 +48,13 @@ interface ExternalKotlinTargetDescriptor<T : DecoratedExternalKotlinTarget> {
|
|||||||
*/
|
*/
|
||||||
@ExternalKotlinTargetApi
|
@ExternalKotlinTargetApi
|
||||||
fun <T : DecoratedExternalKotlinTarget> ExternalKotlinTargetDescriptor(
|
fun <T : DecoratedExternalKotlinTarget> ExternalKotlinTargetDescriptor(
|
||||||
configure: ExternalKotlinTargetDescriptorBuilder<T>.() -> Unit
|
configure: ExternalKotlinTargetDescriptorBuilder<T>.() -> Unit,
|
||||||
): ExternalKotlinTargetDescriptor<T> {
|
): ExternalKotlinTargetDescriptor<T> {
|
||||||
return ExternalKotlinTargetDescriptorBuilder<T>().also(configure).build()
|
return ExternalKotlinTargetDescriptorBuilder<T>().also(configure).build()
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Mutable version of [ExternalKotlinTargetDescriptor]
|
* Builder for [ExternalKotlinTargetDescriptor]
|
||||||
* The following properties have to be specified:
|
* The following properties have to be specified:
|
||||||
* - [targetName]
|
* - [targetName]
|
||||||
* - [platformType]
|
* - [platformType]
|
||||||
@@ -84,12 +84,7 @@ class ExternalKotlinTargetDescriptorBuilder<T : DecoratedExternalKotlinTarget> i
|
|||||||
val runtimeElementsPublished: ExternalKotlinTargetConfigurationDescriptorBuilder<T> =
|
val runtimeElementsPublished: ExternalKotlinTargetConfigurationDescriptorBuilder<T> =
|
||||||
ExternalKotlinTargetConfigurationDescriptorBuilder()
|
ExternalKotlinTargetConfigurationDescriptorBuilder()
|
||||||
|
|
||||||
/**
|
private var configure: ((T) -> Unit)? = null
|
||||||
* 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
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Generic configuration that will be invoked when building the target.
|
* 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) }
|
else this.configure = { configure(it); action(it) }
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
internal var configureIdeImport: (IdeMultiplatformImport.() -> Unit)? = null
|
||||||
* 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
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Main entrance of configuring the ide import:
|
* Main entrance of configuring the ide import:
|
||||||
|
|||||||
Reference in New Issue
Block a user