chore(deps): update Java SDK to v7.0.0 (#157)

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

* Update min and compile version for android

* Update samples

* Update sentry agp

* Add IScope

* Fix tests

* Update CHANGELOG

---------

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

Author: 3 people

CHANGELOG.md

@@ -4,6 +4,9 @@
 
 ### Dependencies
 
+- Bump Java SDK from v6.33.1 to v7.0.0 ([#157](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/157))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#700)
+  - [diff](https://github.com/getsentry/sentry-java/compare/6.33.1...7.0.0)
 - Bump Cocoa SDK from v8.4.0 to v8.17.1 ([#158](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/158))
     - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8171)
     - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.4.0...8.17.1)

buildSrc/src/main/java/Config.kt

@@ -32,7 +32,7 @@ object Config {
     object Libs {
         val kotlinStd = "org.jetbrains.kotlin:kotlin-stdlib"
 
-        val sentryJavaVersion = "6.33.1"
+        val sentryJavaVersion = "7.0.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 = 16
+        val minSdkVersion = 19
         val targetSdkVersion = sdkVersion
         val compileSdkVersion = sdkVersion
     }

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

@@ -8,7 +8,7 @@ import io.sentry.kotlin.multiplatform.extensions.toKmpUser
 import io.sentry.kotlin.multiplatform.protocol.Breadcrumb
 import io.sentry.kotlin.multiplatform.protocol.User
 
-internal class JvmScopeProvider(private val scope: JvmScope) : Scope {
+internal class JvmScopeProvider(private val scope: JvmIScope) : Scope {
 
     override var level: SentryLevel?
         set(value) {

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

@@ -61,7 +61,7 @@ internal actual object SentryBridge {
         Sentry.close()
     }
 
-    private fun configureScopeCallback(scopeCallback: ScopeCallback): (JvmScope) -> Unit {
+    private fun configureScopeCallback(scopeCallback: ScopeCallback): (JvmIScope) -> Unit {
         return {
             val jvmScopeProvider = JvmScopeProvider(it)
             scopeCallback.invoke(jvmScopeProvider)

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

@@ -2,6 +2,7 @@ package io.sentry.kotlin.multiplatform
 
 import io.sentry.Attachment
 import io.sentry.Breadcrumb
+import io.sentry.IScope
 import io.sentry.Scope
 import io.sentry.SentryEvent
 import io.sentry.SentryLevel
@@ -16,6 +17,7 @@ import io.sentry.protocol.User
 internal typealias JvmSentryLevel = SentryLevel
 internal typealias JvmUser = User
 internal typealias JvmScope = Scope
+internal typealias JvmIScope = IScope
 internal typealias JvmBreadcrumb = Breadcrumb
 internal typealias JvmSentryId = SentryId
 internal typealias JvmSentryOptions = SentryOptions

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

@@ -1,7 +1,7 @@
 plugins {
     id("com.android.application")
     kotlin("android")
-    id("io.sentry.android.gradle") version "3.5.0"
+    id("io.sentry.android.gradle") version "4.0.0"
 }
 
 android {
@@ -32,7 +32,7 @@ android {
 }
 
 dependencies {
-    implementation(rootProject.project(":sentry-samples:kmp-app-spm:shared"))
+    implementation(rootProject.project(":sentry-samples:kmp-app-cocoapods:shared"))
     implementation("com.google.android.material:material:1.6.1")
     implementation("androidx.appcompat:appcompat:1.4.2")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")

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

@@ -46,10 +46,9 @@ kotlin {
 }
 
 android {
-    compileSdk = 32
+    compileSdk = Config.Android.compileSdkVersion
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {
-        minSdk = 27
-        targetSdk = 32
+        minSdk = Config.Android.minSdkVersion
     }
 }

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

@@ -1,7 +1,7 @@
 plugins {
     id("com.android.application")
     kotlin("android")
-    id("io.sentry.android.gradle") version "3.5.0"
+    id("io.sentry.android.gradle") version "4.0.0"
 }
 
 android {