Address compose-related issues

Author: markushi

build.gradle.kts

@@ -27,7 +27,7 @@ plugins {
     // dokka is required by gradle-maven-publish-plugin.
     alias(libs.plugins.dokka) apply false
     alias(libs.plugins.dokka.javadoc) apply false
-    alias(libs.plugins.compose.compiler) apply false
+    alias(libs.plugins.kotlin.compose) apply false
     alias(libs.plugins.errorprone) apply false
     alias(libs.plugins.gradle.versions) apply false
     alias(libs.plugins.spring.dependency.management) apply false

gradle/libs.versions.toml

@@ -11,7 +11,7 @@ feign = "11.6"
 jacoco = "0.8.7"
 jackson = "2.18.3"
 jetbrainsCompose = "1.6.11"
-kotlin = "1.9.24"
+kotlin = "2.2.0"
 kotlinSpring7 = "2.2.0"
 kotlin-compatible-version = "1.9"
 ktorClient = "3.0.0"
@@ -50,7 +50,6 @@ buildconfig = { id = "com.github.gmazzo.buildconfig", version = "5.6.5" }
 dokka = { id = "org.jetbrains.dokka", version = "2.0.0" }
 dokka-javadoc = { id = "org.jetbrains.dokka-javadoc", version = "2.0.0" }
 binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.13.0" }
-compose-compiler = { id = "org.jetbrains.compose", version.ref = "jetbrainsCompose" }
 errorprone = { id = "net.ltgt.errorprone", version = "3.0.1" }
 gradle-versions = { id = "com.github.ben-manes.versions", version = "0.42.0" }
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }

sentry-android-integration-tests/sentry-uitest-android-critical/build.gradle.kts

@@ -3,7 +3,7 @@ import io.gitlab.arturbosch.detekt.Detekt
 plugins {
   id("com.android.application")
   alias(libs.plugins.kotlin.android)
-  //  alias(libs.plugins.kotlin.compose)
+  alias(libs.plugins.kotlin.compose)
 }
 
 android {

sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts

@@ -4,7 +4,7 @@ import net.ltgt.gradle.errorprone.errorprone
 plugins {
   id("com.android.application")
   alias(libs.plugins.kotlin.android)
-  //  alias(libs.plugins.kotlin.compose)
+  alias(libs.plugins.kotlin.compose)
   alias(libs.plugins.errorprone)
   alias(libs.plugins.gradle.versions)
   alias(libs.plugins.detekt)

sentry-android-replay/build.gradle.kts

@@ -5,7 +5,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 plugins {
   id("com.android.library")
   alias(libs.plugins.kotlin.android)
-  //  alias(libs.plugins.kotlin.compose)
+  alias(libs.plugins.kotlin.compose)
   jacoco
   alias(libs.plugins.jacoco.android)
   alias(libs.plugins.gradle.versions)

sentry-compose/build.gradle.kts

@@ -1,11 +1,12 @@
 import io.gitlab.arturbosch.detekt.Detekt
 import org.jetbrains.dokka.gradle.DokkaTask
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 plugins {
   alias(libs.plugins.kotlin.multiplatform)
   alias(libs.plugins.kotlin.compose)
   id("com.android.library")
-  id("org.jetbrains.compose")
   alias(libs.plugins.kover)
   alias(libs.plugins.gradle.versions)
   alias(libs.plugins.detekt)
@@ -18,13 +19,23 @@ kotlin {
   explicitApi()
 
   androidTarget {
+    compilerOptions {
+      jvmTarget.set(JvmTarget.JVM_1_8)
+      apiVersion.set(KotlinVersion.KOTLIN_1_8)
+      languageVersion.set(KotlinVersion.KOTLIN_1_8)
+    }
     publishLibraryVariants("release")
-    compilations.all { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() }
   }
   jvm("desktop") {
-    compilations.all { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() }
+    compilerOptions {
+      jvmTarget.set(JvmTarget.JVM_1_8)
+      apiVersion.set(KotlinVersion.KOTLIN_1_8)
+      languageVersion.set(KotlinVersion.KOTLIN_1_8)
+    }
   }
 
+  coreLibrariesVersion = "1.8"
+
   sourceSets.all {
     // Allow all experimental APIs, since MPP projects are themselves experimental
     languageSettings.apply {
@@ -35,9 +46,9 @@ kotlin {
 
   sourceSets {
     val commonMain by getting {
-      dependencies {
-        compileOnly(compose.runtime)
-        compileOnly(compose.ui)
+      compilerOptions {
+        apiVersion.set(KotlinVersion.KOTLIN_1_8)
+        languageVersion.set(KotlinVersion.KOTLIN_1_8)
       }
     }
     val androidMain by getting {

sentry-samples/sentry-samples-android/build.gradle.kts

@@ -6,7 +6,7 @@ import org.gradle.internal.extensions.stdlib.capitalized
 plugins {
   id("com.android.application")
   alias(libs.plugins.kotlin.android)
-  //  alias(libs.plugins.kotlin.compose)
+  alias(libs.plugins.kotlin.compose)
 }
 
 android {