Bump kotlin to 2.1.0

cashapp · Jan 8, 2025 · 5208e2e · 5208e2e
1 parent 7fb4c54
commit 5208e2e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,8 +5,8 @@ bytebuddy = "1.15.11"
 compose = "1.7.6"
 coroutines = "1.10.1"
 javaTarget = "17"
-kotlin = "2.0.21"
-ksp = "2.0.21-1.0.28"
+kotlin = "2.1.0"
+ksp = "2.1.0-1.0.29"
 layoutlib = "15.1.0"
 moshi = "1.15.2"
 
@@ -37,7 +37,7 @@ guava = { module = "com.google.guava:guava", version = "33.4.0-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" }
 

diff --git a/...cessor/src/test/java/app/cash/paparazzi/preview/processor/PreviewProcessorProviderTest.kt b/...cessor/src/test/java/app/cash/paparazzi/preview/processor/PreviewProcessorProviderTest.kt
@@ -5,10 +5,9 @@ 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.kspAllWarningsAsErrors
-import com.tschuchort.compiletesting.kspArgs
+import com.tschuchort.compiletesting.configureKsp
 import com.tschuchort.compiletesting.kspIncremental
-import com.tschuchort.compiletesting.symbolProcessorProviders
+import com.tschuchort.compiletesting.kspProcessorOptions
 import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
 import org.junit.Rule
 import org.junit.Test
@@ -204,11 +203,15 @@ class PreviewProcessorProviderTest {
         sources =
           sourceFiles.asList() + COMPOSE_SOURCES + PAPARAZZI_ANNOTATION_SOURCE + PAPARAZZI_PREVIEW_DATA_RUNTIME_SOURCE
         verbose = false
-
-        kspAllWarningsAsErrors = true
-        kspArgs["app.cash.paparazzi.preview.namespace"] = TEST_NAMESPACE
-        kspIncremental = true
-        symbolProcessorProviders = listOf(PreviewProcessorProvider())
+        // Needed for @PreviewParameterProvider annotation that uses `@JvmDefaultWithCompatibility`
+        kotlincArguments = listOf("-Xjvm-default=all")
+
+        configureKsp(useKsp2 = true) {
+          allWarningsAsErrors = true
+          kspProcessorOptions = mutableMapOf("app.cash.paparazzi.preview.namespace" to TEST_NAMESPACE)
+          kspIncremental = true
+          symbolProcessorProviders += PreviewProcessorProvider()
+        }
       }
 
   private companion object {