From f26f3e073871dd710a468f727767d2ee52485784 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Thu, 22 Jun 2023 09:50:55 +0200 Subject: [PATCH] [Gradle] Remove InternalKotlinHierarchyTemplate interface (in favor of using Impl directly) ^KT-58676 Verification Pending --- .../gradle/plugin/KotlinHierarchyTemplate.kt | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinHierarchyTemplate.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinHierarchyTemplate.kt index 15f9f94cd29..5e99fefbf3f 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinHierarchyTemplate.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinHierarchyTemplate.kt @@ -61,7 +61,7 @@ fun KotlinHierarchyTemplate( @ExperimentalKotlinGradlePluginApi fun KotlinHierarchyTemplate.extend(describe: KotlinHierarchyBuilder.Root.() -> Unit): KotlinHierarchyTemplate { return KotlinHierarchyTemplate { - this@extend.internal.layout(this) + this@extend.impl.layout(this) describe() } } @@ -73,24 +73,19 @@ INTERNAL API @InternalKotlinGradlePluginApi @OptIn(ExperimentalKotlinGradlePluginApi::class) fun KotlinHierarchyBuilder.Root.applyHierarchyTemplate(template: KotlinHierarchyTemplate) { - template.internal.layout(this) + template.impl.layout(this) } -internal val KotlinHierarchyTemplate.internal +internal val KotlinHierarchyTemplate.impl get() = when (this) { - is InternalKotlinHierarchyTemplate -> this + is KotlinHierarchyTemplateImpl -> this } -@OptIn(ExperimentalKotlinGradlePluginApi::class) -internal interface InternalKotlinHierarchyTemplate : KotlinHierarchyTemplate { - fun layout(builder: KotlinHierarchyBuilder.Root) -} - @OptIn(ExperimentalKotlinGradlePluginApi::class) internal class KotlinHierarchyTemplateImpl( private val describe: KotlinHierarchyBuilder.Root.() -> Unit, -) : InternalKotlinHierarchyTemplate { - override fun layout(builder: KotlinHierarchyBuilder.Root) { +) : KotlinHierarchyTemplate { + fun layout(builder: KotlinHierarchyBuilder.Root) { describe(builder) } }