From ca2a5a8ebf23f2510a2163c86958e2d329cd248d Mon Sep 17 00:00:00 2001
From: Sebastian Sellmair <sebastian.sellmair@jetbrains.com>
Date: Wed, 10 May 2023 15:34:10 +0200
Subject: [PATCH] [Gradle] Remove .configure property from
 External.*Descriptors

KT-58601
---
 .../tools/kotlin-gradle-plugin/api/kotlin-gradle-plugin.api   | 4 ----
 .../mpp/external/ExternalKotlinCompilationDescriptor.kt       | 2 +-
 .../external/ExternalKotlinTargetConfigurationDescriptor.kt   | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/api/kotlin-gradle-plugin.api b/libraries/tools/kotlin-gradle-plugin/api/kotlin-gradle-plugin.api
index 44b8850e80f..75f8d9eeb75 100644
--- a/libraries/tools/kotlin-gradle-plugin/api/kotlin-gradle-plugin.api
+++ b/libraries/tools/kotlin-gradle-plugin/api/kotlin-gradle-plugin.api
@@ -252,7 +252,6 @@ public final class org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotli
 	public final fun getCompilationName ()Ljava/lang/String;
 	public final fun getCompileAllTaskName ()Ljava/lang/String;
 	public final fun getCompileTaskName ()Ljava/lang/String;
-	public final fun getConfigure ()Lkotlin/jvm/functions/Function1;
 	public final fun getDefaultSourceSet ()Lorg/jetbrains/kotlin/gradle/plugin/KotlinSourceSet;
 	public final fun getFriendArtifactResolver ()Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinCompilationDescriptor$FriendArtifactResolver;
 	public final fun setCompilationAssociator (Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinCompilationDescriptor$CompilationAssociator;)V
@@ -260,7 +259,6 @@ public final class org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotli
 	public final fun setCompilationName (Ljava/lang/String;)V
 	public final fun setCompileAllTaskName (Ljava/lang/String;)V
 	public final fun setCompileTaskName (Ljava/lang/String;)V
-	public final fun setConfigure (Lkotlin/jvm/functions/Function1;)V
 	public final fun setDefaultSourceSet (Lorg/jetbrains/kotlin/gradle/plugin/KotlinSourceSet;)V
 	public final fun setFriendArtifactResolver (Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinCompilationDescriptor$FriendArtifactResolver;)V
 }
@@ -275,8 +273,6 @@ public abstract interface class org/jetbrains/kotlin/gradle/plugin/mpp/external/
 
 public final class org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetConfigurationDescriptorBuilder {
 	public final fun configure (Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetConfigurationDescriptorBuilder;
-	public final fun getConfigure ()Lkotlin/jvm/functions/Function2;
-	public final fun setConfigure (Lkotlin/jvm/functions/Function2;)V
 }
 
 public abstract interface class org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetDescriptor {
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinCompilationDescriptor.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinCompilationDescriptor.kt
index 781732601cf..b379959b9e7 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinCompilationDescriptor.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinCompilationDescriptor.kt
@@ -84,7 +84,7 @@ class ExternalKotlinCompilationDescriptorBuilder<T : DecoratedExternalKotlinComp
     var compilationFactory: CompilationFactory<T> by Delegates.notNull()
     var friendArtifactResolver: FriendArtifactResolver<T>? = null
     var compilationAssociator: CompilationAssociator<T>? = null
-    var configure: ((T) -> Unit)? = null
+    internal var configure: ((T) -> Unit)? = null
 
     fun configure(action: (T) -> Unit) = apply {
         val configure = this.configure
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetConfigurationDescriptor.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetConfigurationDescriptor.kt
index 0a7e9b25279..cfc5e87f8de 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetConfigurationDescriptor.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetConfigurationDescriptor.kt
@@ -16,7 +16,7 @@ interface ExternalKotlinTargetConfigurationDescriptor<T : DecoratedExternalKotli
 @ExternalKotlinTargetApi
 class ExternalKotlinTargetConfigurationDescriptorBuilder<T : DecoratedExternalKotlinTarget> internal constructor() {
 
-    var configure: ((target: T, configuration: Configuration) -> Unit)? = null
+    internal var configure: ((target: T, configuration: Configuration) -> Unit)? = null
 
     fun configure(action: (target: T, configuration: Configuration) -> Unit) = apply {
         val configure = this.configure