From d27efaf241a5691654b5ec0ecf4db29c5835a643 Mon Sep 17 00:00:00 2001 From: GitHub Date: Thu, 7 Dec 2023 03:03:39 +0000 Subject: [PATCH 1/7] chore: update scripts/update-java.sh to 7.0.0 --- CHANGELOG.md | 6 ++++++ buildSrc/src/main/java/Config.kt | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 132c2417..a888d655 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,12 @@ - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.4.0...8.17.1) - Bump Kotlin version from v1.8.0 to v1.9.21 ([#146](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/146)) +### Features + +- 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) + ## 0.3.0 ### Features diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index 55314513..a155e255 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/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" From dac97ded5859cf15d25d5bd6e0e461e74b9a2533 Mon Sep 17 00:00:00 2001 From: GIancarlo Buenaflor Date: Wed, 6 Dec 2023 13:34:34 +0100 Subject: [PATCH 2/7] Update min and compile version for android --- buildSrc/src/main/java/Config.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index a155e255..0d37a011 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -65,9 +65,9 @@ object Config { } object Android { - private val sdkVersion = 33 + private val sdkVersion = 34 - val minSdkVersion = 16 + val minSdkVersion = 19 val targetSdkVersion = sdkVersion val compileSdkVersion = sdkVersion } From 18c936bb2641b9a64e01571ed9b124e2547e9229 Mon Sep 17 00:00:00 2001 From: GIancarlo Buenaflor Date: Thu, 7 Dec 2023 13:31:27 +0100 Subject: [PATCH 3/7] Update samples --- sentry-samples/kmp-app-cocoapods/androidApp/build.gradle.kts | 2 +- sentry-samples/kmp-app-cocoapods/shared/build.gradle.kts | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sentry-samples/kmp-app-cocoapods/androidApp/build.gradle.kts b/sentry-samples/kmp-app-cocoapods/androidApp/build.gradle.kts index 3e70dcaf..88cabc1a 100644 --- a/sentry-samples/kmp-app-cocoapods/androidApp/build.gradle.kts +++ b/sentry-samples/kmp-app-cocoapods/androidApp/build.gradle.kts @@ -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") diff --git a/sentry-samples/kmp-app-cocoapods/shared/build.gradle.kts b/sentry-samples/kmp-app-cocoapods/shared/build.gradle.kts index 5783d251..7adc9878 100644 --- a/sentry-samples/kmp-app-cocoapods/shared/build.gradle.kts +++ b/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 } } From 4cc495dfaa2172d26a3fed3584d458f938881e36 Mon Sep 17 00:00:00 2001 From: GIancarlo Buenaflor Date: Thu, 7 Dec 2023 13:33:34 +0100 Subject: [PATCH 4/7] Update sentry agp --- sentry-samples/kmp-app-cocoapods/androidApp/build.gradle.kts | 2 +- sentry-samples/kmp-app-spm/androidApp/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sentry-samples/kmp-app-cocoapods/androidApp/build.gradle.kts b/sentry-samples/kmp-app-cocoapods/androidApp/build.gradle.kts index 88cabc1a..46275975 100644 --- a/sentry-samples/kmp-app-cocoapods/androidApp/build.gradle.kts +++ b/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 { diff --git a/sentry-samples/kmp-app-spm/androidApp/build.gradle.kts b/sentry-samples/kmp-app-spm/androidApp/build.gradle.kts index 3e70dcaf..4c08f0a9 100644 --- a/sentry-samples/kmp-app-spm/androidApp/build.gradle.kts +++ b/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 { From 4f0c616554d22d9c3758636da79b6016045c0f54 Mon Sep 17 00:00:00 2001 From: GIancarlo Buenaflor Date: Thu, 7 Dec 2023 13:40:24 +0100 Subject: [PATCH 5/7] Add IScope --- .../kotlin/io/sentry/kotlin/multiplatform/JvmScopeProvider.kt | 2 +- .../kotlin/io/sentry/kotlin/multiplatform/SentryBridge.jvm.kt | 2 +- .../kotlin/io/sentry/kotlin/multiplatform/TypeAliases.jvm.kt | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sentry-kotlin-multiplatform/src/commonJvmMain/kotlin/io/sentry/kotlin/multiplatform/JvmScopeProvider.kt b/sentry-kotlin-multiplatform/src/commonJvmMain/kotlin/io/sentry/kotlin/multiplatform/JvmScopeProvider.kt index 8f32b633..3e47181a 100644 --- a/sentry-kotlin-multiplatform/src/commonJvmMain/kotlin/io/sentry/kotlin/multiplatform/JvmScopeProvider.kt +++ b/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) { diff --git a/sentry-kotlin-multiplatform/src/commonJvmMain/kotlin/io/sentry/kotlin/multiplatform/SentryBridge.jvm.kt b/sentry-kotlin-multiplatform/src/commonJvmMain/kotlin/io/sentry/kotlin/multiplatform/SentryBridge.jvm.kt index 585ae762..51b1e662 100644 --- a/sentry-kotlin-multiplatform/src/commonJvmMain/kotlin/io/sentry/kotlin/multiplatform/SentryBridge.jvm.kt +++ b/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) diff --git a/sentry-kotlin-multiplatform/src/commonJvmMain/kotlin/io/sentry/kotlin/multiplatform/TypeAliases.jvm.kt b/sentry-kotlin-multiplatform/src/commonJvmMain/kotlin/io/sentry/kotlin/multiplatform/TypeAliases.jvm.kt index 68164e6e..14923844 100644 --- a/sentry-kotlin-multiplatform/src/commonJvmMain/kotlin/io/sentry/kotlin/multiplatform/TypeAliases.jvm.kt +++ b/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 From 0d714e322750a628e07f509bd3630299dff98daf Mon Sep 17 00:00:00 2001 From: GIancarlo Buenaflor Date: Thu, 7 Dec 2023 13:50:51 +0100 Subject: [PATCH 6/7] Fix tests --- buildSrc/src/main/java/Config.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index 0d37a011..67675c97 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -65,7 +65,7 @@ object Config { } object Android { - private val sdkVersion = 34 + private val sdkVersion = 33 val minSdkVersion = 19 val targetSdkVersion = sdkVersion From c303e2abda010462e9f2a6a9a49a03ca095bfb17 Mon Sep 17 00:00:00 2001 From: GIancarlo Buenaflor Date: Thu, 7 Dec 2023 14:08:43 +0100 Subject: [PATCH 7/7] Update CHANGELOG --- CHANGELOG.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a888d655..9cfdf341 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,17 +4,14 @@ ### 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) - Bump Kotlin version from v1.8.0 to v1.9.21 ([#146](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/146)) -### Features - -- 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) - ## 0.3.0 ### Features