From e72f236bd47162d8f02370f36bbe4f8a656ce750 Mon Sep 17 00:00:00 2001
From: Sebastian Sellmair <sebastian.sellmair@jetbrains.com>
Date: Tue, 25 Apr 2023 10:39:12 +0200
Subject: [PATCH] [Gradle] Schedule 'KotlinSourceSet.requiresVisibilityOf' for
 removal in 2.0

^KT-58220 Verification Pending
See: KT-58228
---
 .../org/jetbrains/kotlin/gradle/plugin/KotlinSourceSet.kt   | 6 ++++--
 .../kotlin/gradle/plugin/sources/DefaultKotlinSourceSet.kt  | 2 ++
 .../unitTests/sources/SourceSetVisibilityInferenceTest.kt   | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinSourceSet.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinSourceSet.kt
index 4e00a7edb65..6710f2fb2c6 100644
--- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinSourceSet.kt
+++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinSourceSet.kt
@@ -43,10 +43,12 @@ interface KotlinSourceSet : Named, HasProject, HasMutableExtras, HasKotlinDepend
         const val COMMON_TEST_SOURCE_SET_NAME = "commonTest"
     }
 
-    val customSourceFilesExtensions: Iterable<String> // lazy iterable expected
-
+    @Deprecated("Scheduled for removal with Kotlin 2.0")
     val requiresVisibilityOf: Set<KotlinSourceSet>
+
+    @Deprecated("Scheduled for removal with Kotlin 2.0")
     fun requiresVisibilityOf(other: KotlinSourceSet)
 
+    val customSourceFilesExtensions: Iterable<String> // lazy iterable expected
     fun addCustomSourceFilesExtensions(extensions: List<String>) {}
 }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultKotlinSourceSet.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultKotlinSourceSet.kt
index 209aa92f95e..c7d3382f17d 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultKotlinSourceSet.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultKotlinSourceSet.kt
@@ -124,9 +124,11 @@ abstract class DefaultKotlinSourceSet @Inject constructor(
 
     private val _requiresVisibilityOf = mutableSetOf<KotlinSourceSet>()
 
+    @Deprecated("Scheduled for removal with Kotlin 2.0")
     override val requiresVisibilityOf: MutableSet<KotlinSourceSet>
         get() = Collections.unmodifiableSet(_requiresVisibilityOf)
 
+    @Deprecated("Scheduled for removal with Kotlin 2.0")
     override fun requiresVisibilityOf(other: KotlinSourceSet) {
         _requiresVisibilityOf += other
     }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/sources/SourceSetVisibilityInferenceTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/sources/SourceSetVisibilityInferenceTest.kt
index 61a5668c44e..8c841a59ca7 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/sources/SourceSetVisibilityInferenceTest.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/sources/SourceSetVisibilityInferenceTest.kt
@@ -20,6 +20,7 @@ import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 import kotlin.test.assertNotNull
 
+@Suppress("DEPRECATION")
 class SourceSetVisibilityInferenceTest {
     private val project = buildProjectWithMPP()
     private val kotlin = project.multiplatformExtension.apply {