From 487368d9df3baa37a68793659066ecc24af573bd Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Thu, 6 Oct 2022 20:27:04 +0200 Subject: [PATCH] [Gradle][MPP] KotlinTargetHierarchyDescriptor: Remove function supertype ^KT-53570 Verification Pending --- .../kotlin/gradle/plugin/KotlinTargetHierarchyDescriptor.kt | 5 +++-- .../plugin/mpp/targetHierarchy/buildKotlinTargetHierarchy.kt | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetHierarchyDescriptor.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetHierarchyDescriptor.kt index 4eccf3c855d..df3b212d046 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetHierarchyDescriptor.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetHierarchyDescriptor.kt @@ -8,7 +8,8 @@ package org.jetbrains.kotlin.gradle.plugin import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi @ExperimentalKotlinGradlePluginApi -interface KotlinTargetHierarchyDescriptor : (KotlinTargetHierarchyBuilder) -> Unit { +interface KotlinTargetHierarchyDescriptor { + fun describe(builder: KotlinTargetHierarchyBuilder) fun extend(describe: KotlinTargetHierarchyBuilder.() -> Unit): KotlinTargetHierarchyDescriptor } @@ -32,5 +33,5 @@ private class KotlinTargetHierarchyDescriptorImpl( } } - override fun invoke(p1: KotlinTargetHierarchyBuilder) = p1.describe() + override fun describe(builder: KotlinTargetHierarchyBuilder) = builder.describe() } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/targetHierarchy/buildKotlinTargetHierarchy.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/targetHierarchy/buildKotlinTargetHierarchy.kt index 04d7f9c639e..7d4ed0847db 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/targetHierarchy/buildKotlinTargetHierarchy.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/targetHierarchy/buildKotlinTargetHierarchy.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.tooling.core.closure internal fun KotlinTargetHierarchyDescriptor.buildKotlinTargetHierarchy(compilation: KotlinCompilation<*>): KotlinTargetHierarchy { val context = KotlinTargetHierarchyBuilderImplContext(compilation) - this(context.getOrCreateBuilder(KotlinTargetHierarchy.Node.Root)) + describe(context.getOrCreateBuilder(KotlinTargetHierarchy.Node.Root)) return context.build(KotlinTargetHierarchy.Node.Root) }