From 25c2fe03a97c9466f304ec3d23fb4e48e74142d8 Mon Sep 17 00:00:00 2001
From: Sebastian Sellmair <sebastian.sellmair@jetbrains.com>
Date: Tue, 25 Apr 2023 09:57:23 +0200
Subject: [PATCH] [Gradle] Update 'Scheduled for removal' deprecations

^KT-58220 Verification Pending
---
 .../org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt | 6 +++---
 .../jetbrains/kotlin/gradle/tasks/AbstractKotlinCompile.kt  | 2 +-
 .../jetbrains/kotlin/tooling/core/KotlinToolingVersion.kt   | 2 +-
 .../kotlin/org/jetbrains/kotlin/tooling/core/closure.kt     | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt
index 542eeaafd68..edbac72376a 100644
--- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt
+++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt
@@ -108,7 +108,7 @@ interface KotlinCompilation<out T : KotlinCommonOptionsDeprecated> : Named,
         get() = target.disambiguationClassifier + name
 }
 
-@Deprecated("Scheduled for removal with Kotlin 1.9")
+@Deprecated("Scheduled for removal with Kotlin 2.0")
 interface KotlinCompilationToRunnableFiles<T : KotlinCommonOptionsDeprecated> : KotlinCompilation<T> {
     override val runtimeDependencyConfigurationName: String
 
@@ -118,12 +118,12 @@ interface KotlinCompilationToRunnableFiles<T : KotlinCommonOptionsDeprecated> :
         get() = super.relatedConfigurationNames + runtimeDependencyConfigurationName
 }
 
-@Deprecated("Scheduled for removal with Kotlin 1.9")
+@Deprecated("Scheduled for removal with Kotlin 2.0")
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "deprecation") // kept for compatibility
 val <T : KotlinCommonOptionsDeprecated> KotlinCompilation<T>.runtimeDependencyConfigurationName: String?
     get() = (this as? KotlinCompilationToRunnableFiles<T>)?.runtimeDependencyConfigurationName
 
-@Deprecated("Scheduled for removal with Kotlin 1.9")
+@Deprecated("Scheduled for removal with Kotlin 2.0")
 interface KotlinCompilationWithResources<T : KotlinCommonOptionsDeprecated> : KotlinCompilation<T> {
     val processResourcesTaskName: String
 }
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/AbstractKotlinCompile.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/AbstractKotlinCompile.kt
index ab36be838c9..107cf1e2182 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/AbstractKotlinCompile.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/AbstractKotlinCompile.kt
@@ -102,7 +102,7 @@ abstract class AbstractKotlinCompile<T : CommonCompilerArguments> @Inject constr
     internal open fun isIncrementalCompilationEnabled(): Boolean =
         incremental
 
-    @Deprecated("Scheduled for removal with Kotlin 1.9", ReplaceWith("moduleName"))
+    @Deprecated("Scheduled for removal with Kotlin 2.0", ReplaceWith("moduleName"))
     @get:Input
     abstract val ownModuleName: Property<String>
 
diff --git a/libraries/tools/kotlin-tooling-core/src/main/kotlin/org/jetbrains/kotlin/tooling/core/KotlinToolingVersion.kt b/libraries/tools/kotlin-tooling-core/src/main/kotlin/org/jetbrains/kotlin/tooling/core/KotlinToolingVersion.kt
index 4959eaa33d0..464ec0fb323 100644
--- a/libraries/tools/kotlin-tooling-core/src/main/kotlin/org/jetbrains/kotlin/tooling/core/KotlinToolingVersion.kt
+++ b/libraries/tools/kotlin-tooling-core/src/main/kotlin/org/jetbrains/kotlin/tooling/core/KotlinToolingVersion.kt
@@ -36,7 +36,7 @@ fun KotlinToolingVersion(kotlinVersion: KotlinVersion, classifier: String? = nul
 }
 
 @Deprecated(
-    "Use KotlinToolingVersion instead. Scheduled for removal with Kotlin 1.9",
+    "Use KotlinToolingVersion instead. Scheduled for removal with Kotlin 2.0",
     replaceWith = ReplaceWith("KotlinToolingVersion(kotlinVersionString)")
 )
 fun KotlinToolingVersionOrNull(kotlinVersionString: String): KotlinToolingVersion? {
diff --git a/libraries/tools/kotlin-tooling-core/src/main/kotlin/org/jetbrains/kotlin/tooling/core/closure.kt b/libraries/tools/kotlin-tooling-core/src/main/kotlin/org/jetbrains/kotlin/tooling/core/closure.kt
index a5ee7589b8c..23c95c780d4 100644
--- a/libraries/tools/kotlin-tooling-core/src/main/kotlin/org/jetbrains/kotlin/tooling/core/closure.kt
+++ b/libraries/tools/kotlin-tooling-core/src/main/kotlin/org/jetbrains/kotlin/tooling/core/closure.kt
@@ -168,21 +168,21 @@ internal fun <T> createResultSet(initialSize: Int = 16): MutableSet<T> {
 //region Deprecations
 
 @Suppress("unused")
-@Deprecated("Scheduled for removal in 1.8", level = DeprecationLevel.ERROR)
+@Deprecated("Scheduled for removal in 2.0", level = DeprecationLevel.ERROR)
 @PublishedApi
 internal fun <T> createResultSet(withValue: T, initialSize: Int = 16): MutableSet<T> {
     return LinkedHashSet<T>(initialSize).also { it.add(withValue) }
 }
 
 @Suppress("unused")
-@Deprecated("Scheduled for removal in 1.8", level = DeprecationLevel.ERROR)
+@Deprecated("Scheduled for removal in 2.0", level = DeprecationLevel.ERROR)
 @PublishedApi
 internal fun <T> createResultSet(withValues: Iterable<T>, initialSize: Int = 16): MutableSet<T> {
     return LinkedHashSet<T>(initialSize).also { it.addAll(withValues) }
 }
 
 @Suppress("unused")
-@Deprecated("Scheduled for removal in 1.8", level = DeprecationLevel.ERROR)
+@Deprecated("Scheduled for removal in 2.0", level = DeprecationLevel.ERROR)
 @PublishedApi
 internal inline fun <T> closureTo(
     destination: MutableSet<T>,