UPDATE_KOTLIN_VERSION: 2.1.0-dev-5441

google · Aug 29, 2024 · 9c8df38 · 9c8df38
1 parent e0deaba
commit 9c8df38
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
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
@@ -56,9 +56,12 @@ 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
@@ -172,6 +175,15 @@ 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
@@ -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-3498
+kotlinBaseVersion=2.1.0-dev-5441
 agpBaseVersion=7.3.1
 intellijVersion=233.13135.103
 junitVersion=4.13.1