UPDATE_KOTLIN_VERSION: 2.2.20

Author: ting-yuan

gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/AndroidPluginIntegration.kt

@@ -63,9 +63,7 @@ object AndroidPluginIntegration {
     }
 
     fun getCompilationSourceSets(kotlinCompilation: KotlinJvmAndroidCompilation): List<String> {
-        return kotlinCompilation.androidVariant
-            .sourceSets
-            .map { it.name }
+        return kotlinCompilation.androidVariant?.sourceSets?.map { it.name } ?: emptyList()
     }
 
     /**
@@ -83,13 +81,13 @@ object AndroidPluginIntegration {
 
         val useLegacyApi = project.useLegacyVariantApi()
         if (useLegacyApi) {
-            val sources = kotlinCompilation.androidVariant.getSourceFolders(SourceKind.JAVA)
+            val sources = kotlinCompilation.androidVariant?.getSourceFolders(SourceKind.JAVA)
             kspTaskProvider.configure { task ->
                 // this is workaround for KAPT generator that prevents circular dependency
                 val filteredSources = Callable {
                     val destinationProperty = (kaptProvider?.get() as? KaptTask)?.destinationDir
                     val dir = destinationProperty?.get()?.asFile
-                    sources.filter { dir?.isParentOf(it.dir) != true }
+                    sources?.filter { dir?.isParentOf(it.dir) != true }
                 }
                 when (task) {
                     is KspTaskJvm -> { task.source(filteredSources) }
@@ -180,12 +178,12 @@ object AndroidPluginIntegration {
             kspKotlinOutput.include("**/*.kt")
             kspClassOutput.include("**/*.class")
 
-            kotlinCompilation.androidVariant.addJavaSourceFoldersToModel(kspKotlinOutput.dir)
-            kotlinCompilation.androidVariant.registerExternalAptJavaOutput(kspJavaOutput)
-            kotlinCompilation.androidVariant.registerPostJavacGeneratedBytecode(resourcesOutput)
+            kotlinCompilation.androidVariant?.addJavaSourceFoldersToModel(kspKotlinOutput.dir)
+            kotlinCompilation.androidVariant?.registerExternalAptJavaOutput(kspJavaOutput)
+            kotlinCompilation.androidVariant?.registerPostJavacGeneratedBytecode(resourcesOutput)
             if (project.isAgpBuiltInKotlinUsed().not()) {
                 // This API leads to circular dependency with AGP + Built in kotlin
-                kotlinCompilation.androidVariant.registerPreJavacGeneratedBytecode(kspClassOutput)
+                kotlinCompilation.androidVariant?.registerPreJavacGeneratedBytecode(kspClassOutput)
             }
         }
     }

gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KotlinFactories.kt

@@ -38,7 +38,6 @@ import org.gradle.api.tasks.PathSensitivity
 import org.gradle.api.tasks.SkipWhenEmpty
 import org.gradle.api.tasks.TaskProvider
 import org.gradle.process.CommandLineArgumentProvider
-import org.gradle.process.ExecOperations
 import org.gradle.work.Incremental
 import org.gradle.work.InputChanges
 import org.gradle.work.NormalizeLineEndings
@@ -171,6 +170,7 @@ class KotlinFactories {
                             it.name == konanTargetName
                         }
                     }
+                    kspTask.separateKmpCompilation.value(false)
                 }
             }
         }
@@ -307,13 +307,11 @@ abstract class KspTaskNative @Inject internal constructor(
     compilation: KotlinCompilationInfo,
     objectFactory: ObjectFactory,
     providerFactory: ProviderFactory,
-    execOperations: ExecOperations
 ) : KotlinNativeCompile(
         compilation,
         objectFactory.newInstance(KotlinNativeCompilerOptionsDefault::class.java),
         objectFactory,
         providerFactory,
-        execOperations
     ),
     KspTask
 

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.2.0
+kotlinBaseVersion=2.2.20
 agpBaseVersion=8.13.0-rc01
 intellijVersion=241.19416.19
 junitVersion=4.13.1