Deps: Update Kotlin to 2.1.21

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Dependencies
 
+- Bump Kotlin from `1.9.23` to `2.1.21` ([#389](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/389/))
 - Bump Cocoa SDK from v8.49.1 to v8.53.1 ([#405](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/405))
   - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8531)
   - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.49.1...8.53.1)

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"
@@ -26,7 +27,7 @@ object Config {
         val detekt = "io.gitlab.arturbosch.detekt"
         val detektVersion = "1.22.0"
         val binaryCompatibility = "org.jetbrains.kotlinx.binary-compatibility-validator"
-        val binaryCompatibilityVersion = "0.13.1"
+        val binaryCompatibilityVersion = "0.18.0"
     }
 
     object Libs {
@@ -59,9 +60,9 @@ object Config {
         val ktorClientOkHttp = "io.ktor:ktor-client-okhttp:2.3.6"
         val ktorClientDarwin = "io.ktor:ktor-client-darwin:2.3.6"
 
-        val roboelectric = "org.robolectric:robolectric:4.9"
-        val junitKtx = "androidx.test.ext:junit-ktx:1.1.5"
-        val mockitoCore = "org.mockito:mockito-core:5.4.0"
+        val roboelectric = "org.robolectric:robolectric:4.15.1"
+        val junitKtx = "androidx.test.ext:junit-ktx:1.2.1"
+        val mockitoCore = "org.mockito:mockito-core:5.18.0"
     }
 
     object Android {

sentry-kotlin-multiplatform/api/android/sentry-kotlin-multiplatform.api

@@ -109,6 +109,7 @@ public abstract class io/sentry/kotlin/multiplatform/SentryBaseEvent {
 	public fun getUser ()Lio/sentry/kotlin/multiplatform/protocol/User;
 	public final fun removeTag (Ljava/lang/String;)V
 	public fun setBreadcrumbs (Ljava/util/List;)V
+	public final fun setContexts (Ljava/util/Map;)V
 	public fun setDist (Ljava/lang/String;)V
 	public fun setEnvironment (Ljava/lang/String;)V
 	public fun setEventId (Lio/sentry/kotlin/multiplatform/protocol/SentryId;)V

sentry-kotlin-multiplatform/api/jvm/sentry-kotlin-multiplatform.api

@@ -106,6 +106,7 @@ public abstract class io/sentry/kotlin/multiplatform/SentryBaseEvent {
 	public fun getUser ()Lio/sentry/kotlin/multiplatform/protocol/User;
 	public final fun removeTag (Ljava/lang/String;)V
 	public fun setBreadcrumbs (Ljava/util/List;)V
+	public final fun setContexts (Ljava/util/Map;)V
 	public fun setDist (Ljava/lang/String;)V
 	public fun setEnvironment (Ljava/lang/String;)V
 	public fun setEventId (Lio/sentry/kotlin/multiplatform/protocol/SentryId;)V

sentry-kotlin-multiplatform/src/androidMain/kotlin/io/sentry/kotlin/multiplatform/SentryPlatformInstance.android.kt

@@ -3,7 +3,7 @@ package io.sentry.kotlin.multiplatform
 import io.sentry.android.core.SentryAndroid
 
 internal actual class SentryPlatformInstance : SentryInstance {
-    override fun init(configuration: PlatformOptionsConfiguration) {
+    actual override fun init(configuration: PlatformOptionsConfiguration) {
         val context = applicationContext ?: run {
             // TODO: add logging later
             return

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

@@ -15,7 +15,6 @@
 package io.sentry.kotlin.multiplatform.nsexception
 
 import kotlin.concurrent.AtomicReference
-import kotlin.native.concurrent.freeze
 
 /**
  * Wraps the unhandled exception hook such that the provided [hook] is invoked
@@ -31,5 +30,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-kotlin-multiplatform/src/commonMain/kotlin/io/sentry/kotlin/multiplatform/SentryPlatformInstance.kt

@@ -7,4 +7,6 @@ internal interface SentryInstance {
 /**
  * Represents the actual Sentry SDK instance.
  */
-internal expect class SentryPlatformInstance() : SentryInstance
+internal expect class SentryPlatformInstance() : SentryInstance {
+    override fun init(configuration: PlatformOptionsConfiguration)
+}

sentry-kotlin-multiplatform/src/commonTest/kotlin/io/sentry/kotlin/multiplatform/SentryE2ETest.kt

@@ -46,7 +46,7 @@ class SentryE2ETest : BaseSentryTest() {
     @BeforeTest
     fun setup() {
         assertNotNull(authToken)
-        assertTrue(authToken.isNotEmpty())
+        assertTrue(authToken!!.isNotEmpty())
         sentryInit { options ->
             options.dsn = realDsn
             options.beforeSend = { event ->

sentry-kotlin-multiplatform/src/commonTvWatchMacOsMain/kotlin/io/sentry/kotlin/multiplatform/SentryPlatformInstance.tvwatchmacos.kt

@@ -3,7 +3,7 @@ package io.sentry.kotlin.multiplatform
 import cocoapods.Sentry.SentrySDK
 
 internal actual class SentryPlatformInstance : SentryInstance {
-    override fun init(configuration: PlatformOptionsConfiguration) {
+    actual override fun init(configuration: PlatformOptionsConfiguration) {
         val finalConfiguration: (CocoaSentryOptions?) -> Unit = {
             if (it != null) {
                 configuration(it)

sentry-kotlin-multiplatform/src/iosMain/kotlin/io/sentry/kotlin/multiplatform/SentryPlatformInstance.ios.kt

@@ -3,7 +3,7 @@ package io.sentry.kotlin.multiplatform
 import cocoapods.Sentry.SentrySDK
 
 internal actual class SentryPlatformInstance : SentryInstance {
-    override fun init(configuration: PlatformOptionsConfiguration) {
+    actual override fun init(configuration: PlatformOptionsConfiguration) {
         val finalConfiguration: (CocoaSentryOptions?) -> Unit = {
             if (it != null) {
                 configuration(it)

sentry-kotlin-multiplatform/src/jvmMain/kotlin/io/sentry/kotlin/multiplatform/SentryPlatformInstance.jvm.kt

@@ -3,7 +3,7 @@ package io.sentry.kotlin.multiplatform
 import io.sentry.Sentry as JvmSentry
 
 internal actual class SentryPlatformInstance : SentryInstance {
-    override fun init(configuration: PlatformOptionsConfiguration) {
+    actual override fun init(configuration: PlatformOptionsConfiguration) {
         JvmSentry.init(configuration)
     }
 }

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

@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.application")
@@ -7,6 +7,10 @@ plugins {
 }
 
 android {
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
     compileSdk = Config.Android.compileSdkVersion
     defaultConfig {
         applicationId = "sample.kmp.app.android"
@@ -34,12 +38,18 @@ android {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(11))
+    }
 }
 
-tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "1.8"
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_11
+    }
 }
 
 dependencies {

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

@@ -1,8 +1,9 @@
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     kotlin("multiplatform")
+    id("org.jetbrains.kotlin.plugin.compose")
     id("org.jetbrains.compose")
 }
 
@@ -16,17 +17,16 @@ repositories {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "1.8"
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(11))
+    }
 }
 
 kotlin {
     jvm {
-        withJava()
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_11
+        }
     }
     sourceSets {
         val jvmMain by getting {

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

@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     kotlin("multiplatform")
@@ -8,19 +8,20 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "1.8"
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(11))
+    }
 }
 
 kotlin {
     applyDefaultHierarchyTemplate()
 
     androidTarget()
-    jvm()
+    jvm {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_11
+        }
+    }
     iosX64()
     iosArm64()
     iosSimulatorArm64()
@@ -59,6 +60,10 @@ kotlin {
 }
 
 android {
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
     compileSdk = Config.Android.compileSdkVersion
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {

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

@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.application")
@@ -7,15 +7,25 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(11))
+    }
 }
 
-tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "1.8"
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_11
+    }
 }
 
 android {
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
     compileSdk = Config.Android.compileSdkVersion
     defaultConfig {
         applicationId = "sample.kmp.app.android"

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

@@ -1,8 +1,9 @@
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     kotlin("multiplatform")
+    id("org.jetbrains.kotlin.plugin.compose")
     id("org.jetbrains.compose")
 }
 
@@ -16,17 +17,16 @@ repositories {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "1.8"
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(11))
+    }
 }
 
 kotlin {
     jvm {
-        withJava()
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_11
+        }
     }
     sourceSets {
         val jvmMain by getting {

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

@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     kotlin("multiplatform")
@@ -7,19 +7,20 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "1.8"
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(11))
+    }
 }
 
 kotlin {
     applyDefaultHierarchyTemplate()
 
     androidTarget()
-    jvm()
+    jvm {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_11
+        }
+    }
     listOf(
         iosX64(),
         iosArm64(),
@@ -44,6 +45,10 @@ kotlin {
 }
 
 android {
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
     compileSdk = Config.Android.compileSdkVersion
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {