From b2d90b88a2738dc7833a8e873af14adad37fdbf7 Mon Sep 17 00:00:00 2001
From: Ting-Yuan Huang <laszio@google.com>
Date: Thu, 7 Nov 2024 14:15:49 -0800
Subject: [PATCH] UPDATE_KOTLIN_VERSION: 2.1.0-RC

(cherry picked from commit b9a5788105bbaab3c49ba4fb8a6487d19363351e)
---
 .../kotlin/com/google/devtools/ksp/gradle/KotlinFactories.kt  | 2 +-
 .../kotlin/com/google/devtools/ksp/gradle/KspSubplugin.kt     | 1 -
 gradle.properties                                             | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KotlinFactories.kt b/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KotlinFactories.kt
index c2f02a8374..36ed53b8b5 100644
--- a/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KotlinFactories.kt
+++ b/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KotlinFactories.kt
@@ -166,7 +166,7 @@ class KotlinFactories {
                         from = compilerOptions,
                         into = kspTask.compilerOptions
                     )
-                    kspTask.produceUnpackedKlib.set(false)
+                    kspTask.produceUnpackagedKlib.set(false)
                     kspTask.onlyIf {
                         // KonanTarget is not properly serializable, hence we should check by name
                         // see https://youtrack.jetbrains.com/issue/KT-61657.
diff --git a/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspSubplugin.kt b/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspSubplugin.kt
index ebdfbe389f..4a0220cf46 100644
--- a/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspSubplugin.kt
+++ b/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspSubplugin.kt
@@ -417,7 +417,6 @@ class KspGradleSubplugin @Inject internal constructor(private val registry: Tool
         }
 
         fun configureLanguageVersion(kspTask: KotlinCompilationTask<*>) {
-            kspTask.compilerOptions.useK2.value(false)
             val languageVersion = kotlinCompilation.compilerOptions.options.languageVersion
             val progressiveMode = kotlinCompilation.compilerOptions.options.progressiveMode
             kspTask.compilerOptions.languageVersion.value(
diff --git a/gradle.properties b/gradle.properties
index 25533d50ee..83cf099894 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,10 +1,10 @@
 # Copied from kotlinc
 org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx4096m -Dfile.encoding=UTF-8
 
-kotlinBaseVersion=2.0.21
+kotlinBaseVersion=2.1.0-RC
 agpBaseVersion=7.3.1
 agpTestVersion=8.7.1
-intellijVersion=233.13135.103
+intellijVersion=233.13135.128
 junitVersion=4.13.1
 junit5Version=5.8.2
 junitPlatformVersion=1.8.2