Update Kotlin and Compose

gradle/libs.versions.toml

@@ -5,8 +5,8 @@ bytebuddy = "1.15.10"
 compose = "1.7.5"
 coroutines = "1.9.0"
 javaTarget = "11"
-kotlin = "2.0.21"
-ksp = "2.0.21-1.0.28"
+kotlin = "2.1.0"
+ksp = "2.1.0-1.0.29"
 layoutlib = "15.0.6"
 moshi = "1.15.1"
 
@@ -36,7 +36,7 @@ guava = { module = "com.google.guava:guava", version = "33.3.1-jre" }
 
 kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" }
 kotlinpoet-ksp = { module = "com.squareup:kotlinpoet-ksp", version = "2.0.0" }
-kotlin-compile-testing-ksp = { module = "com.github.tschuchortdev:kotlin-compile-testing-ksp", version = "1.6.0" }
+kotlin-compile-testing-ksp = { module = "dev.zacsweers.kctfork:ksp", version = "0.7.0" }
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
 

paparazzi-preview-processor/src/test/java/app/cash/paparazzi/preview/processor/PreviewProcessorProviderTest.kt

@@ -5,10 +5,17 @@ package app.cash.paparazzi.preview.processor
 import com.google.common.truth.Truth.assertThat
 import com.tschuchort.compiletesting.KotlinCompilation
 import com.tschuchort.compiletesting.SourceFile
+import com.tschuchort.compiletesting.configureKsp
 import com.tschuchort.compiletesting.kspAllWarningsAsErrors
 import com.tschuchort.compiletesting.kspArgs
 import com.tschuchort.compiletesting.kspIncremental
+import com.tschuchort.compiletesting.kspIncrementalLog
+import com.tschuchort.compiletesting.kspLoggingLevels
+import com.tschuchort.compiletesting.kspProcessorOptions
+import com.tschuchort.compiletesting.kspSourcesDir
+import com.tschuchort.compiletesting.kspWithCompilation
 import com.tschuchort.compiletesting.symbolProcessorProviders
+import com.tschuchort.compiletesting.useKsp2
 import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
 import org.junit.Rule
 import org.junit.Test
@@ -197,18 +204,20 @@ class PreviewProcessorProviderTest {
   }
 
   private fun prepareCompilation(vararg sourceFiles: SourceFile): KotlinCompilation =
-    KotlinCompilation()
-      .apply {
-        workingDir = File(temporaryFolder.root, "debug")
-        inheritClassPath = true
-        sources = sourceFiles.asList() + COMPOSE_SOURCES + PAPARAZZI_ANNOTATION_SOURCE
-        verbose = false
-
-        kspAllWarningsAsErrors = true
-        kspArgs["app.cash.paparazzi.preview.namespace"] = TEST_NAMESPACE
+    KotlinCompilation().apply {
+      workingDir = File(temporaryFolder.root, "debug")
+      inheritClassPath = true
+      sources = sourceFiles.asList() + COMPOSE_SOURCES + PAPARAZZI_ANNOTATION_SOURCE + PAPARAZZI_PREVIEW_DATA_SOURCE
+      verbose = true
+      kotlincArguments = listOf("-Xjvm-default=all")
+
+      configureKsp(useKsp2 = true) {
+        allWarningsAsErrors = true
+        kspProcessorOptions = mutableMapOf("app.cash.paparazzi.preview.namespace" to TEST_NAMESPACE)
         kspIncremental = true
-        symbolProcessorProviders = listOf(PreviewProcessorProvider())
+        symbolProcessorProviders += PreviewProcessorProvider()
       }
+    }
 
   private companion object {
     private const val TEST_NAMESPACE = "test"
@@ -289,5 +298,19 @@ class PreviewProcessorProviderTest {
         annotation class Paparazzi
         """.trimIndent()
       )
+
+    private val PAPARAZZI_PREVIEW_DATA_SOURCE = SourceFile.kotlin(
+      "PaparazziPreviewData.kt",
+      """
+        package app.cash.paparazzi.annotations
+
+        import androidx.compose.runtime.Composable
+
+        data class PaparazziPreviewData(
+          val snapshotName: String,
+          val composable: @Composable () -> Unit
+        )
+        """.trimIndent()
+    )
   }
 }