Prolong -no-stdlib option lifetime and regenerate Gradle compilation options

-no-stdlib may still be required internally for kotlin gradle plugin
to launch the compiler with the correct options.

compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt

@@ -49,7 +49,7 @@ class K2JVMCompilerArguments : CommonCompilerArguments() {
     @Argument(value = "-no-jdk", description = "Don't automatically include the Java runtime into the classpath")
     var noJdk: Boolean by FreezableVar(false)
 
-    @DeprecatedOption(removeAfter = "1.5", level = DeprecationLevel.ERROR)
+    @DeprecatedOption(removeAfter = "1.6", level = DeprecationLevel.ERROR)
     @GradleOption(DefaultValues.BooleanTrueDefault::class)
     @Argument(
         value = "-no-stdlib",

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt

@@ -5,13 +5,6 @@ package org.jetbrains.kotlin.gradle.dsl
 @Suppress("DEPRECATION")
 interface KotlinJvmOptions  : org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions {
 
-    /**
-     * Include Kotlin runtime into the resulting JAR
-     * Default value: false
-     */
-    @Deprecated(message = "This option has no effect and will be removed in a future release.", level = DeprecationLevel.ERROR)
-     var includeRuntime: kotlin.Boolean
-
     /**
      * Generate metadata for Java 1.8 reflection on method parameters
      * Default value: false
@@ -44,13 +37,6 @@ interface KotlinJvmOptions  : org.jetbrains.kotlin.gradle.dsl.KotlinCommonOption
      */
      var noJdk: kotlin.Boolean
 
-    /**
-     * Don't automatically include Kotlin reflection into the classpath
-     * Default value: true
-     */
-    @Deprecated(message = "This option has no effect and will be removed in a future release.", level = DeprecationLevel.ERROR)
-     var noReflect: kotlin.Boolean
-
     /**
      * Don't automatically include the Kotlin/JVM stdlib and Kotlin reflection into the classpath
      * Default value: true
@@ -58,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.WARNING)
-     var useIR: kotlin.Boolean
-
     /**
      * Use the old JVM backend
      * Default value: false

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt

@@ -37,15 +37,6 @@ internal abstract class KotlinJvmOptionsBase : org.jetbrains.kotlin.gradle.dsl.K
             useFirField = value
         }
 
-    private var includeRuntimeField: kotlin.Boolean? = null
-
-    @Deprecated(message = "This option has no effect and will be removed in a future release.", level = DeprecationLevel.ERROR)
-    override var includeRuntime: kotlin.Boolean
-        get() = includeRuntimeField ?: false
-        set(value) {
-            includeRuntimeField = value
-        }
-
     private var javaParametersField: kotlin.Boolean? = null
     override var javaParameters: kotlin.Boolean
         get() = javaParametersField ?: false
@@ -72,17 +63,7 @@ internal abstract class KotlinJvmOptionsBase : org.jetbrains.kotlin.gradle.dsl.K
             noJdkField = value
         }
 
-    private var noReflectField: kotlin.Boolean? = null
-
-    @Deprecated(message = "This option has no effect and will be removed in a future release.", level = DeprecationLevel.ERROR)
-    override var noReflect: kotlin.Boolean
-        get() = noReflectField ?: true
-        set(value) {
-            noReflectField = value
-        }
-
     private var noStdlibField: kotlin.Boolean? = null
-
     @Deprecated(message = "This option has no effect and will be removed in a future release.", level = DeprecationLevel.ERROR)
     override var noStdlib: kotlin.Boolean
         get() = noStdlibField ?: true
@@ -90,15 +71,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.WARNING)
-    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
@@ -113,15 +85,12 @@ internal abstract class KotlinJvmOptionsBase : org.jetbrains.kotlin.gradle.dsl.K
         apiVersion?.let { args.apiVersion = it }
         languageVersion?.let { args.languageVersion = it }
         useFirField?.let { args.useFir = it }
-        includeRuntimeField?.let { args.includeRuntime = it }
         javaParametersField?.let { args.javaParameters = it }
         jdkHome?.let { args.jdkHome = it }
         jvmTargetField?.let { args.jvmTarget = it }
         moduleName?.let { args.moduleName = it }
         noJdkField?.let { args.noJdk = it }
-        noReflectField?.let { args.noReflect = it }
         noStdlibField?.let { args.noStdlib = it }
-        useIRField?.let { args.useIR = it }
         useOldBackendField?.let { args.useOldBackend = it }
     }
 }
@@ -133,14 +102,11 @@ internal fun org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments.fi
     apiVersion = null
     languageVersion = null
     useFir = false
-    includeRuntime = false
     javaParameters = false
     jdkHome = null
     jvmTarget = "1.8"
     moduleName = null
     noJdk = false
-    noReflect = true
     noStdlib = true
-    useIR = false
     useOldBackend = false
 }