chore(deps): update Java SDK to v8.6.0 (#350)

* chore: update scripts/update-java.sh to 8.6.0

* Fix api from major

* Fix api

* Fix formatting

* Fix analyze

* Fix test

* Bump minSdkVersion

---------

Co-authored-by: GitHub <[email protected]>
Co-authored-by: Giancarlo Buenaflor <[email protected]>

Author: 3 people

CHANGELOG.md

@@ -7,6 +7,9 @@
 - Bump Cocoa SDK from v8.44.0 to v8.48.0 ([#345](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/345))
   - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8480)
   - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.44.0...8.48.0)
+- Bump Java SDK from v7.18.1 to v8.6.0 ([#350](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/350))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#860)
+  - [diff](https://github.com/getsentry/sentry-java/compare/7.18.1...8.6.0)
 
 ## 0.11.0
 

buildSrc/src/main/java/Config.kt

@@ -32,7 +32,7 @@ object Config {
     object Libs {
         val kotlinStd = "org.jetbrains.kotlin:kotlin-stdlib"
 
-        val sentryJavaVersion = "7.18.1"
+        val sentryJavaVersion = "8.6.0"
         val sentryAndroid = "io.sentry:sentry-android:$sentryJavaVersion"
         val sentryJava = "io.sentry:sentry:$sentryJavaVersion"
 
@@ -67,7 +67,7 @@ object Config {
     object Android {
         private val sdkVersion = 33
 
-        val minSdkVersion = 19
+        val minSdkVersion = 21
         val targetSdkVersion = sdkVersion
         val compileSdkVersion = sdkVersion
     }

sentry-kotlin-multiplatform/src/androidMain/kotlin/io/sentry/kotlin/multiplatform/extensions/SentryOptionsExtensions.android.kt

@@ -21,15 +21,15 @@ internal fun SentryOptions.toAndroidSentryOptionsCallback(): (SentryAndroidOptio
     androidOptions.anrTimeoutIntervalMillis = kmpOptions.anrTimeoutIntervalMillis
 
     // Replay options
-    androidOptions.experimental.sessionReplay.maskAllText =
+    androidOptions.sessionReplay.maskAllText =
         kmpOptions.experimental.sessionReplay.maskAllText
-    androidOptions.experimental.sessionReplay.maskAllImages =
+    androidOptions.sessionReplay.maskAllImages =
         kmpOptions.experimental.sessionReplay.maskAllImages
-    androidOptions.experimental.sessionReplay.sessionSampleRate =
+    androidOptions.sessionReplay.sessionSampleRate =
         kmpOptions.experimental.sessionReplay.sessionSampleRate
-    androidOptions.experimental.sessionReplay.onErrorSampleRate =
+    androidOptions.sessionReplay.onErrorSampleRate =
         kmpOptions.experimental.sessionReplay.onErrorSampleRate
-    androidOptions.experimental.sessionReplay.quality =
+    androidOptions.sessionReplay.quality =
         kmpOptions.experimental.sessionReplay.quality.toAndroidSentryQuality()
 
     // kForEach solves an issue with linter where it thinks forEach is the Java version

sentry-kotlin-multiplatform/src/androidUnitTest/kotlin/io/sentry/kotlin/multiplatform/PlatformOptions.android.kt

@@ -71,7 +71,7 @@ class SentryAndroidOptionsWrapper(private val androidOptions: SentryAndroidOptio
         get() = androidOptions.isAttachViewHierarchy
 
     override val sessionReplay: AndroidSentryReplayOptions
-        get() = androidOptions.experimental.sessionReplay
+        get() = androidOptions.sessionReplay
 
     override fun applyFromOptions(options: SentryOptions) {
         options.toAndroidSentryOptionsCallback().invoke(androidOptions)

sentry-kotlin-multiplatform/src/commonJvmMain/kotlin/io/sentry/kotlin/multiplatform/JvmScopeProvider.kt

@@ -5,6 +5,7 @@ import io.sentry.kotlin.multiplatform.extensions.toJvmSentryLevel
 import io.sentry.kotlin.multiplatform.extensions.toJvmUser
 import io.sentry.kotlin.multiplatform.extensions.toKmpSentryLevel
 import io.sentry.kotlin.multiplatform.extensions.toKmpUser
+import io.sentry.kotlin.multiplatform.extensions.toMap
 import io.sentry.kotlin.multiplatform.protocol.Breadcrumb
 import io.sentry.kotlin.multiplatform.protocol.User
 
@@ -31,7 +32,7 @@ internal class JvmScopeProvider(private val scope: JvmIScope) : Scope {
     }
 
     override fun getContexts(): MutableMap<String, Any> {
-        return scope.contexts
+        return scope.contexts.toMap().toMutableMap()
     }
 
     override fun getTags(): MutableMap<String, String> {

sentry-kotlin-multiplatform/src/commonJvmMain/kotlin/io/sentry/kotlin/multiplatform/SentryEvent.jvm.kt

@@ -5,6 +5,7 @@ import io.sentry.kotlin.multiplatform.extensions.toKmpMessage
 import io.sentry.kotlin.multiplatform.extensions.toKmpSentryException
 import io.sentry.kotlin.multiplatform.extensions.toKmpSentryLevel
 import io.sentry.kotlin.multiplatform.extensions.toKmpUser
+import io.sentry.kotlin.multiplatform.extensions.toMap
 import io.sentry.kotlin.multiplatform.protocol.Message
 import io.sentry.kotlin.multiplatform.protocol.SentryException
 import io.sentry.kotlin.multiplatform.protocol.SentryId
@@ -34,7 +35,7 @@ public actual class SentryEvent actual constructor() : SentryBaseEvent() {
         user = jvmSentryEvent.user?.toKmpUser()
         serverName = jvmSentryEvent.serverName
         dist = jvmSentryEvent.dist
-        contexts = jvmSentryEvent.contexts
+        contexts = jvmSentryEvent.contexts.toMap()
         jvmSentryEvent.fingerprints?.let { fingerprint = it }
         jvmSentryEvent.exceptions?.let { exceptions = it.map { it.toKmpSentryException() }.toMutableList() }
         jvmSentryEvent.breadcrumbs?.let { breadcrumbs = it.map { it.toKmpBreadcrumb() }.toMutableList() }

sentry-kotlin-multiplatform/src/commonJvmMain/kotlin/io/sentry/kotlin/multiplatform/extensions/ContextsExtension.jvm.kt

@@ -0,0 +1,14 @@
+package io.sentry.kotlin.multiplatform.extensions
+
+import io.sentry.kotlin.multiplatform.JvmContexts
+
+internal fun JvmContexts.toMap(): Map<String, Any> {
+    val resultMap = mutableMapOf<String, Any>()
+    for (key in keys()) {
+        val value = get(key)
+        value?.let {
+            resultMap[key] = it
+        }
+    }
+    return resultMap
+}

sentry-kotlin-multiplatform/src/commonJvmMain/kotlin/io/sentry/kotlin/multiplatform/extensions/UserExtensions.jvm.kt

@@ -9,7 +9,7 @@ internal fun User.toJvmUser() = JvmUser().apply {
     username = scope.username
     email = scope.email
     ipAddress = scope.ipAddress
-    others = scope.other?.toMutableMap()
+    data = scope.other?.toMutableMap()
     unknown = scope.unknown?.toMutableMap()
 }
 
@@ -19,6 +19,6 @@ internal fun JvmUser.toKmpUser() = User().apply {
     username = scope.username
     email = scope.email
     ipAddress = scope.ipAddress
-    other = scope.others?.toMutableMap()
+    other = scope.data?.toMutableMap()
     unknown = scope.unknown?.toMutableMap()
 }