From 1d3f871d7af2a1ba21b79772da04b5b14b7de550 Mon Sep 17 00:00:00 2001
From: Anton Lakotka <anton.lakotka@jetbrains.com>
Date: Mon, 18 Dec 2023 11:45:19 +0100
Subject: [PATCH] [Gradle] Remove unnecessary useK2 gradle property

^KT-64379 Verification Pending
---
 .../org/jetbrains/kotlin/gradle/plugin/PropertiesProvider.kt  | 3 ---
 .../KotlinCreateNativeCompileTasksSideEffect.kt               | 3 ---
 .../gradle/tasks/configuration/AbstractKotlinCompileConfig.kt | 4 ----
 3 files changed, 10 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/PropertiesProvider.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/PropertiesProvider.kt
index e880900d331..c59530a29f1 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/PropertiesProvider.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/PropertiesProvider.kt
@@ -174,9 +174,6 @@ internal class PropertiesProvider private constructor(private val project: Proje
     val useKotlinAbiSnapshot: Boolean
         get() = booleanProperty(KOTLIN_ABI_SNAPSHOT) ?: false
 
-    val useK2: Boolean?
-        get() = booleanProperty("kotlin.useK2")
-
     val keepMppDependenciesIntactInPoms: Boolean?
         get() = booleanProperty("kotlin.mpp.keepMppDependenciesIntactInPoms")
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCreateNativeCompileTasksSideEffect.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCreateNativeCompileTasksSideEffect.kt
index 83a9d3e3b19..3fbcb5a8e32 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCreateNativeCompileTasksSideEffect.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCreateNativeCompileTasksSideEffect.kt
@@ -40,9 +40,6 @@ internal val KotlinCreateNativeCompileTasksSideEffect = KotlinCompilationSideEff
         task.enabled = compilation.konanTarget.enabledOnCurrentHost
 
         task.destinationDirectory.set(project.klibOutputDirectory(compilationInfo).dir("klib"))
-        if (project.kotlinPropertiesProvider.useK2 == true) {
-            task.compilerOptions.useK2.set(true)
-        }
         task.runViaBuildToolsApi.value(false).disallowChanges() // K/N is not yet supported
 
         task.explicitApiMode.value(
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/AbstractKotlinCompileConfig.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/AbstractKotlinCompileConfig.kt
index fbc2a4ed4ef..a1971bd702d 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/AbstractKotlinCompileConfig.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/AbstractKotlinCompileConfig.kt
@@ -85,10 +85,6 @@ internal abstract class AbstractKotlinCompileConfig<TASK : AbstractKotlinCompile
 
             task.incremental = false
             task.useModuleDetection.convention(false)
-            if (propertiesProvider.useK2 == true) {
-                @Suppress("DEPRECATION")
-                task.compilerOptions.useK2.value(true)
-            }
             task.runViaBuildToolsApi.convention(propertiesProvider.runKotlinCompilerViaBuildToolsApi).finalizeValueOnRead()
             task.classLoadersCachingService.value(cachedClassLoadersService).disallowChanges()