Switch to dev.zacsweers.kctfor for Kotlin 2.x

Author: markushi

gradle/libs.versions.toml

@@ -42,7 +42,7 @@ kotlinCompilerEmbeddable = { group = "org.jetbrains.kotlin", name = "kotlin-comp
 autoService = { group = "com.google.auto.service", name = "auto-service", version = "1.0.1" }
 autoServiceAnnotatons = { group = "com.google.auto.service", name = "auto-service-annotations", version = "1.0.1" }
 kotlinJunit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlin" }
-kotlinCompileTesting = { group = "com.github.tschuchortdev", name = "kotlin-compile-testing", version = "1.6.0" }
+kotlinCompileTesting = { group = "dev.zacsweers.kctfork", name = "core", version = "0.7.0" }
 composeDesktop = { group = "org.jetbrains.compose.desktop", name = "desktop", version = "1.6.10" }
 
 # bytecode instrumentation

sentry-kotlin-compiler-plugin/build.gradle.kts

@@ -2,15 +2,15 @@ import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-  alias(libs.plugins.kotlin) version "2.1.20"
-  alias(libs.plugins.kapt) version "2.1.20"
+  alias(libs.plugins.kotlin) version "2.1.0"
+  alias(libs.plugins.kapt) version "2.1.0"
   id("distribution")
   alias(libs.plugins.mavenPublish)
   alias(libs.plugins.spotless)
 }
 
-val kotlin19: SourceSet by sourceSets.creating
-val kotlin21: SourceSet by sourceSets.creating
+val kotlin1920: SourceSet by sourceSets.creating
+val kotlin2120: SourceSet by sourceSets.creating
 
 allprojects {
   repositories {
@@ -68,12 +68,14 @@ dependencies {
   testImplementation(libs.kotlinCompilerEmbeddable)
   testImplementation(libs.kotlinCompileTesting)
   testImplementation(libs.composeDesktop)
+  testImplementation(kotlin1920.output)
+  testImplementation(kotlin2120.output)
 
-  kotlin19.compileOnlyConfigurationName("org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.24")
-  kotlin21.compileOnlyConfigurationName("org.jetbrains.kotlin:kotlin-compiler-embeddable:2.1.20")
+  kotlin1920.compileOnlyConfigurationName("org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.24")
+  kotlin2120.compileOnlyConfigurationName("org.jetbrains.kotlin:kotlin-compiler-embeddable:2.1.20")
 
-  compileOnly(kotlin19.output)
-  compileOnly(kotlin21.output)
+  compileOnly(kotlin1920.output)
+  compileOnly(kotlin2120.output)
 }
 
 kapt { correctErrorTypes = true }
@@ -90,8 +92,8 @@ plugins.withId("com.vanniktech.maven.publish.base") {
 }
 
 tasks.withType<Jar> {
-  from(kotlin19.output)
-  from(kotlin21.output)
+  from(kotlin1920.output)
+  from(kotlin2120.output)
 }
 
 tasks.withType<KotlinCompile>().configureEach {

…se/JetpackComposeTracingIrExtension19.kt …se/JetpackComposeTracingIrExtension19.ktsentry-kotlin-compiler-plugin/src/kotlin19/kotlin/io/sentry/compose/JetpackComposeTracingIrExtension19.kt renamed to sentry-kotlin-compiler-plugin/src/kotlin1920/kotlin/io/sentry/compose/JetpackComposeTracingIrExtension19.kt sentry-kotlin-compiler-plugin/src/kotlin19/kotlin/io/sentry/compose/JetpackComposeTracingIrExtension19.kt renamed to sentry-kotlin-compiler-plugin/src/kotlin1920/kotlin/io/sentry/compose/JetpackComposeTracingIrExtension19.kt

@@ -1,6 +1,7 @@
 package io.sentry.compose
 
 import androidx.compose.ui.Modifier
+import com.tschuchort.compiletesting.JvmCompilationResult
 import com.tschuchort.compiletesting.KotlinCompilation
 import com.tschuchort.compiletesting.SourceFile
 import io.sentry.SentryKotlinCompilerPlugin
@@ -84,7 +85,7 @@ class JetpackComposeInstrumentationTest {
     fun compileFile(
       file: SourceFile,
       includeFakeSentryModifier: Boolean = true,
-    ): KotlinCompilation.Result {
+    ): JvmCompilationResult {
       val result =
         KotlinCompilation()
           .apply {
@@ -110,7 +111,7 @@ class JetpackComposeInstrumentationTest {
      * calls, and they don't fail during execution
      */
     fun execute(
-      compilation: KotlinCompilation.Result,
+      compilation: JvmCompilationResult,
       className: String = "io.sentry.samples.Example",
       method: String,
       methodArgTypes: List<String> = emptyList(),