From 27e449cd5692362cbb30c6cfeff9618cce7d9af1 Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Fri, 28 Jan 2022 15:09:22 +0100
Subject: [PATCH] Remove 'useIR' from Gradle options

^KT-49011 In Progress
---
 .../cli/common/arguments/K2JVMCompilerArguments.kt     |  2 --
 .../jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt    |  7 -------
 .../kotlin/gradle/dsl/KotlinJvmOptionsBase.kt          | 10 ----------
 3 files changed, 19 deletions(-)

diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
index f8c5d087f20..c4fb1b97d0a 100644
--- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
+++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
@@ -95,8 +95,6 @@ class K2JVMCompilerArguments : CommonCompilerArguments() {
 
     // Advanced options
 
-    @GradleDeprecatedOption(removeAfter = "1.6", level = DeprecationLevel.HIDDEN)
-    @GradleOption(DefaultValues.BooleanFalseDefault::class)
     @Argument(
         value = "-Xuse-ir",
         description = "Use the IR backend. This option has no effect unless the language version less than 1.5 is used"
diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt
index eee07fc9d0a..f85d4e0ae74 100644
--- a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt
+++ b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt
@@ -44,13 +44,6 @@ interface KotlinJvmOptions  : org.jetbrains.kotlin.gradle.dsl.KotlinCommonOption
     @Deprecated(message = "This option has no effect and will be removed in a future release.", level = DeprecationLevel.ERROR)
      var noStdlib: kotlin.Boolean
 
-    /**
-     * Use the IR backend. This option has no effect unless the language version less than 1.5 is used
-     * Default value: false
-     */
-    @Deprecated(message = "This option has no effect and will be removed in a future release.", level = DeprecationLevel.HIDDEN)
-     var useIR: kotlin.Boolean
-
     /**
      * Use the old JVM backend
      * Default value: false
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt
index 5c7b2e8e6d0..a0d6bef9e19 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt
@@ -66,14 +66,6 @@ internal abstract class KotlinJvmOptionsBase : org.jetbrains.kotlin.gradle.dsl.K
             noStdlibField = value
         }
 
-    private var useIRField: kotlin.Boolean? = null
-    @Deprecated(message = "This option has no effect and will be removed in a future release.", level = DeprecationLevel.HIDDEN)
-    override var useIR: kotlin.Boolean
-        get() = useIRField ?: false
-        set(value) {
-            useIRField = value
-        }
-
     private var useOldBackendField: kotlin.Boolean? = null
     override var useOldBackend: kotlin.Boolean
         get() = useOldBackendField ?: false
@@ -94,7 +86,6 @@ internal abstract class KotlinJvmOptionsBase : org.jetbrains.kotlin.gradle.dsl.K
         moduleName?.let { args.moduleName = it }
         noJdkField?.let { args.noJdk = it }
         noStdlibField?.let { args.noStdlib = it }
-        useIRField?.let { args.useIR = it }
         useOldBackendField?.let { args.useOldBackend = it }
     }
 }
@@ -112,6 +103,5 @@ internal fun org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments.fi
     moduleName = null
     noJdk = false
     noStdlib = true
-    useIR = false
     useOldBackend = false
 }