From 7aceda94acc0cfee31fae6e5dc689908097c1829 Mon Sep 17 00:00:00 2001
From: "sebastian.sellmair" <sebastian.sellmair@jetbrains.com>
Date: Wed, 19 Jan 2022 15:27:31 +0100
Subject: [PATCH] [KPM] Convert noop implementations from 'object' to 'val'

This is to avoid leaking the extension function defined
inside those objects to the global namespaces.
Using these extensions on the receiver outside the
noop object makes no sense.
---
 .../KotlinFragmentConfigurationDefinition.kt    | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinFragmentConfigurationDefinition.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinFragmentConfigurationDefinition.kt
index 89b490f49f0..c721dbb4247 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinFragmentConfigurationDefinition.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinFragmentConfigurationDefinition.kt
@@ -51,8 +51,8 @@ internal typealias FragmentRelation = KotlinGradleFragmentConfigurationRelation
 fun interface KotlinGradleFragmentConfigurationRelation {
     fun KotlinGradleFragmentConfigurationContext.setupExtendsFromRelations(configuration: Configuration)
 
-    object None : KotlinGradleFragmentConfigurationRelation {
-        override fun KotlinGradleFragmentConfigurationContext.setupExtendsFromRelations(configuration: Configuration) = Unit
+    companion object {
+        val None = FragmentRelation {}
     }
 }
 
@@ -62,8 +62,8 @@ internal typealias FragmentAttributes<T> = KotlinGradleFragmentConfigurationAttr
 fun interface KotlinGradleFragmentConfigurationAttributes<in T : KotlinGradleFragment> {
     fun AttributeContainer.setAttributes(fragment: T)
 
-    object None : KotlinGradleFragmentConfigurationAttributes<KotlinGradleFragment> {
-        override fun AttributeContainer.setAttributes(fragment: KotlinGradleFragment) = Unit
+    companion object {
+        val None = FragmentAttributes<KotlinGradleFragment> {}
     }
 }
 /* Internal abbreviation */
@@ -84,9 +84,10 @@ fun interface KotlinGradleFragmentConfigurationCapabilities<in T : KotlinGradleF
 
     fun Context.setCapabilities(fragment: T)
 
-    object None : KotlinGradleFragmentConfigurationCapabilities<KotlinGradleFragment> {
-        override fun Context.setCapabilities(fragment: KotlinGradleFragment) = Unit
+    companion object {
+        val None = FragmentCapabilities<KotlinGradleFragment> {}
     }
+
 }
 
 /* Internal abbreviation */
@@ -95,8 +96,8 @@ internal typealias FragmentArtifacts<T> = KotlinGradleFragmentConfigurationArtif
 fun interface KotlinGradleFragmentConfigurationArtifacts<in T : KotlinGradleFragment> {
     fun ConfigurationPublications.addArtifacts(fragment: T)
 
-    object None : KotlinGradleFragmentConfigurationArtifacts<KotlinGradleFragment> {
-        override fun ConfigurationPublications.addArtifacts(fragment: KotlinGradleFragment) = Unit
+    companion object {
+        val None = FragmentArtifacts<KotlinGradleFragment> {}
     }
 }