Deps: Update Kotlin to 2.1.21

build.gradle.kts

@@ -11,7 +11,8 @@ plugins {
     id(Config.dokka).version(Config.dokkaVersion)
     kotlin(Config.multiplatform).version(Config.kotlinVersion).apply(false)
     kotlin(Config.cocoapods).version(Config.kotlinVersion).apply(false)
-    id(Config.jetpackCompose).version(Config.composeVersion).apply(false)
+    id(Config.jetpackCompose).version(Config.composePluginVersion).apply(false)
+    id(Config.kotlinCompose).version(Config.kotlinVersion).apply(false)
     id(Config.androidGradle).version(Config.agpVersion).apply(false)
     id(Config.BuildPlugins.buildConfig).version(Config.BuildPlugins.buildConfigVersion).apply(false)
     kotlin(Config.kotlinSerializationPlugin).version(Config.kotlinVersion).apply(false)

buildSrc/src/main/java/Config.kt

@@ -1,12 +1,13 @@
 object Config {
     val agpVersion = "7.4.2"
-    val kotlinVersion = "1.9.23"
-    val composeVersion = "1.6.1"
+    val kotlinVersion = "2.1.21"
+    val composePluginVersion = "1.8.0"
     val gradleMavenPublishPluginVersion = "0.18.0"
 
     val multiplatform = "multiplatform"
     val cocoapods = "native.cocoapods"
     val jetpackCompose = "org.jetbrains.compose"
+    val kotlinCompose = "org.jetbrains.kotlin.plugin.compose"
     val gradleMavenPublishPlugin = "com.vanniktech.maven.publish"
     val androidGradle = "com.android.library"
     val kotlinSerializationPlugin = "plugin.serialization"

sentry-kotlin-multiplatform/build.gradle.kts

@@ -75,6 +75,8 @@ kotlin {
                 optIn("kotlinx.cinterop.ExperimentalForeignApi")
                 optIn("kotlinx.cinterop.UnsafeNumber")
                 optIn("kotlin.experimental.ExperimentalNativeApi")
+                // TODO(buenaflor): we get compiler errors with k2 so right now don't use it
+                languageVersion = "1.9"
             }
         }
 

sentry-kotlin-multiplatform/src/appleMain/kotlin/io/sentry/kotlin/multiplatform/nsexception/UnhandledExceptionHook.kt

@@ -31,5 +31,5 @@ internal fun wrapUnhandledExceptionHook(hook: (Throwable) -> Unit) {
         prevHook.value?.invoke(it)
         terminateWithUnhandledException(it)
     }
-    prevHook.value = setUnhandledExceptionHook(wrappedHook.freeze())
+    prevHook.value = setUnhandledExceptionHook(wrappedHook)
 }

sentry-kotlin-multiplatform/src/commonMain/kotlin/io/sentry/kotlin/multiplatform/SentryBaseEvent.kt

@@ -44,7 +44,6 @@ public abstract class SentryBaseEvent(
      * This is not thread-safe.
      */
     public var contexts: Map<String, Any> = mapOf()
-        internal set
 
     /**
      * A mutable map of breadcrumbs that led to this event.

sentry-samples/kmp-app-cocoapods/desktopApp/build.gradle.kts

@@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     kotlin("multiplatform")
+    id("org.jetbrains.kotlin.plugin.compose")
     id("org.jetbrains.compose")
 }
 
@@ -25,9 +26,7 @@ tasks.withType<KotlinCompile> {
 }
 
 kotlin {
-    jvm {
-        withJava()
-    }
+    jvm()
     sourceSets {
         val jvmMain by getting {
             dependencies {

sentry-samples/kmp-app-spm/desktopApp/build.gradle.kts

@@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     kotlin("multiplatform")
+    id("org.jetbrains.kotlin.plugin.compose")
     id("org.jetbrains.compose")
 }
 
@@ -25,9 +26,7 @@ tasks.withType<KotlinCompile> {
 }
 
 kotlin {
-    jvm {
-        withJava()
-    }
+    jvm()
     sourceSets {
         val jvmMain by getting {
             dependencies {