From b11c485fdfb798b4056496e3c68112d35b712bc6 Mon Sep 17 00:00:00 2001
From: Ting-Yuan Huang <laszio@google.com>
Date: Mon, 16 Sep 2024 10:29:12 -0700
Subject: [PATCH] UPDATE_KOTLIN_VERSION: 2.1.0-dev-7621

---
 .../google/devtools/ksp/gradle/KotlinFactories.kt  | 14 +-------------
 gradle.properties                                  |  2 +-
 2 files changed, 2 insertions(+), 14 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 9a47147340..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
@@ -56,12 +56,9 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformCommonCompilerOptionsH
 import org.jetbrains.kotlin.gradle.dsl.KotlinNativeCompilerOptions
 import org.jetbrains.kotlin.gradle.dsl.KotlinNativeCompilerOptionsDefault
 import org.jetbrains.kotlin.gradle.dsl.KotlinNativeCompilerOptionsHelper
-import org.jetbrains.kotlin.gradle.internal.ClassLoadersCachingBuildService
 import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
 import org.jetbrains.kotlin.gradle.plugin.KotlinCompilationInfo
-import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider.Companion.kotlinPropertiesProvider
 import org.jetbrains.kotlin.gradle.plugin.SubpluginOption
-import org.jetbrains.kotlin.gradle.targets.native.KonanPropertiesBuildService
 import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompileTool
 import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -169,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.
@@ -178,15 +175,6 @@ class KotlinFactories {
                             it.name == konanTargetName
                         }
                     }
-                    kspTask.kotlinCompilerArgumentsLogLevel
-                        .value(project.kotlinPropertiesProvider.kotlinCompilerArgumentsLogLevel)
-                        .finalizeValueOnRead()
-                    kspTask.konanPropertiesService
-                        .value(KonanPropertiesBuildService.registerIfAbsent(project))
-                        .disallowChanges()
-                    kspTask.classLoadersCachingService
-                        .value(ClassLoadersCachingBuildService.registerIfAbsent(project))
-                        .disallowChanges()
                 }
             }
         }
diff --git a/gradle.properties b/gradle.properties
index 5708037571..78f54ca93e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 # Copied from kotlinc
 org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx4096m -Dfile.encoding=UTF-8
 
-kotlinBaseVersion=2.1.0-dev-5441
+kotlinBaseVersion=2.1.0-dev-7621
 agpBaseVersion=8.7.0
 intellijVersion=233.13135.103
 junitVersion=4.13.1