From 39151eec7ee76a425b6c167296bc96b1f66bc606 Mon Sep 17 00:00:00 2001 From: Giancarlo Buenaflor Date: Fri, 4 Apr 2025 00:15:05 +0200 Subject: [PATCH 1/9] Add native android sdk name --- buildSrc/src/main/java/Config.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index 28f3eb23..84b6ce94 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -36,7 +36,7 @@ object Config { val sentryAndroid = "io.sentry:sentry-android:$sentryJavaVersion" val sentryJava = "io.sentry:sentry:$sentryJavaVersion" - val sentryCocoaVersion = "8.48.0" + val sentryCocoaVersion = "8.44.0" val sentryCocoa = "Sentry" object Samples { @@ -83,6 +83,7 @@ object Config { val kmpCocoaSdkName = "sentry.cocoa.kmp" val kmpJavaSdkName = "sentry.java.kmp" val kmpAndroidSdkName = "sentry.java.android.kmp" + val kmpNativeAndroidSdkName = "sentry.native.android.kmp" val javaPackageName = "maven:io.sentry:sentry" val androidPackageName = "maven:io.sentry:sentry-android" val cocoaPackageName = "cocoapods:sentry-cocoa" From 719fce330bca19f7abd05c5156d168cc1dc8bf11 Mon Sep 17 00:00:00 2001 From: Giancarlo Buenaflor Date: Fri, 4 Apr 2025 00:15:31 +0200 Subject: [PATCH 2/9] Use native android sdk name --- sentry-kotlin-multiplatform/build.gradle.kts | 1 + .../kotlin/multiplatform/SentryPlatformOptions.android.kt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sentry-kotlin-multiplatform/build.gradle.kts b/sentry-kotlin-multiplatform/build.gradle.kts index 1dbea644..7b246d0d 100644 --- a/sentry-kotlin-multiplatform/build.gradle.kts +++ b/sentry-kotlin-multiplatform/build.gradle.kts @@ -204,6 +204,7 @@ buildkonfig { buildConfigField(STRING, "SENTRY_KMP_COCOA_SDK_NAME", Config.Sentry.kmpCocoaSdkName) buildConfigField(STRING, "SENTRY_KMP_JAVA_SDK_NAME", Config.Sentry.kmpJavaSdkName) buildConfigField(STRING, "SENTRY_KMP_ANDROID_SDK_NAME", Config.Sentry.kmpAndroidSdkName) + buildConfigField(STRING, "SENTRY_KMP_NATIVE_ANDROID_SDK_NAME", Config.Sentry.kmpNativeAndroidSdkName) buildConfigField(STRING, "VERSION_NAME", project.version.toString()) buildConfigField(STRING, "SENTRY_JAVA_PACKAGE_NAME", Config.Sentry.javaPackageName) diff --git a/sentry-kotlin-multiplatform/src/androidMain/kotlin/io/sentry/kotlin/multiplatform/SentryPlatformOptions.android.kt b/sentry-kotlin-multiplatform/src/androidMain/kotlin/io/sentry/kotlin/multiplatform/SentryPlatformOptions.android.kt index 2770c89a..dbb2e8fb 100644 --- a/sentry-kotlin-multiplatform/src/androidMain/kotlin/io/sentry/kotlin/multiplatform/SentryPlatformOptions.android.kt +++ b/sentry-kotlin-multiplatform/src/androidMain/kotlin/io/sentry/kotlin/multiplatform/SentryPlatformOptions.android.kt @@ -10,8 +10,9 @@ internal actual fun SentryPlatformOptions.prepareForInit() { if (sdkVersion?.packageSet?.none { it.name == BuildKonfig.SENTRY_ANDROID_PACKAGE_NAME } == true) { sdkVersion?.addPackage(BuildKonfig.SENTRY_ANDROID_PACKAGE_NAME, BuildKonfig.SENTRY_ANDROID_VERSION) } + nativeSdkName = BuildKonfig.SENTRY_KMP_NATIVE_ANDROID_SDK_NAME } - +a internal actual fun SentryOptions.toPlatformOptionsConfiguration(): PlatformOptionsConfiguration = toAndroidSentryOptionsCallback() From f6b658b6069e87b2dad1045ba88637bce72f413c Mon Sep 17 00:00:00 2001 From: Giancarlo Buenaflor Date: Fri, 4 Apr 2025 00:25:16 +0200 Subject: [PATCH 3/9] Fix analyze --- .../kotlin/multiplatform/SentryPlatformOptions.android.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sentry-kotlin-multiplatform/src/androidMain/kotlin/io/sentry/kotlin/multiplatform/SentryPlatformOptions.android.kt b/sentry-kotlin-multiplatform/src/androidMain/kotlin/io/sentry/kotlin/multiplatform/SentryPlatformOptions.android.kt index dbb2e8fb..8fa945fe 100644 --- a/sentry-kotlin-multiplatform/src/androidMain/kotlin/io/sentry/kotlin/multiplatform/SentryPlatformOptions.android.kt +++ b/sentry-kotlin-multiplatform/src/androidMain/kotlin/io/sentry/kotlin/multiplatform/SentryPlatformOptions.android.kt @@ -12,7 +12,7 @@ internal actual fun SentryPlatformOptions.prepareForInit() { } nativeSdkName = BuildKonfig.SENTRY_KMP_NATIVE_ANDROID_SDK_NAME } -a + internal actual fun SentryOptions.toPlatformOptionsConfiguration(): PlatformOptionsConfiguration = toAndroidSentryOptionsCallback() From e1b392fcc9039532d5064c1bbcf904ab1a187733 Mon Sep 17 00:00:00 2001 From: Giancarlo Buenaflor Date: Fri, 4 Apr 2025 00:25:59 +0200 Subject: [PATCH 4/9] Update Config.kt --- 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 21a2419d..226e9b12 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -36,7 +36,7 @@ object Config { val sentryAndroid = "io.sentry:sentry-android:$sentryJavaVersion" val sentryJava = "io.sentry:sentry:$sentryJavaVersion" - val sentryCocoaVersion = "8.44.0" + val sentryCocoaVersion = "8.48.0" val sentryCocoa = "Sentry" object Samples { From 55d653517eb655b4c1049bf11969f8823e889193 Mon Sep 17 00:00:00 2001 From: Giancarlo Buenaflor Date: Fri, 4 Apr 2025 00:27:40 +0200 Subject: [PATCH 5/9] update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a10ce76f..3e3983ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +### Miscellaneous + +- Update native android sdk name to `sentry.native.android.kmp` ([#353](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/353)) + ### Dependencies - Bump Cocoa SDK from v8.44.0 to v8.48.0 ([#345](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/345)) From 8e78b2453bc712ebbcd8007b60010c7e069d335d Mon Sep 17 00:00:00 2001 From: Giancarlo Buenaflor Date: Fri, 4 Apr 2025 11:58:03 +0200 Subject: [PATCH 6/9] update test --- .../multiplatform/SentryAndroidBridgeTest.kt | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 sentry-kotlin-multiplatform/src/androidUnitTest/kotlin/io/sentry/kotlin/multiplatform/SentryAndroidBridgeTest.kt diff --git a/sentry-kotlin-multiplatform/src/androidUnitTest/kotlin/io/sentry/kotlin/multiplatform/SentryAndroidBridgeTest.kt b/sentry-kotlin-multiplatform/src/androidUnitTest/kotlin/io/sentry/kotlin/multiplatform/SentryAndroidBridgeTest.kt new file mode 100644 index 00000000..fd1abc43 --- /dev/null +++ b/sentry-kotlin-multiplatform/src/androidUnitTest/kotlin/io/sentry/kotlin/multiplatform/SentryAndroidBridgeTest.kt @@ -0,0 +1,37 @@ +package io.sentry.kotlin.multiplatform + +import io.sentry.android.core.SentryAndroidOptions +import io.sentry.kotlin.multiplatform.fakes.FakeSentryInstance +import junit.framework.TestCase.assertEquals +import kotlin.test.BeforeTest +import kotlin.test.Test + +class SentryAndroidBridgeTest { + private lateinit var fixture: Fixture + + @BeforeTest + fun setup() { + fixture = Fixture() + } + + @Test + fun `init sets native android sdk name`() { + val sut = fixture.getSut() + + sut.init { } + + val option = SentryPlatformOptions().apply { + fixture.sentryInstance.lastConfiguration?.invoke(this) + } + + assertEquals(BuildKonfig.SENTRY_KMP_NATIVE_ANDROID_SDK_NAME, option.nativeSdkName) + } +} + +internal class Fixture { + val sentryInstance = FakeSentryInstance() + + fun getSut(): SentryBridge { + return SentryBridge(instance) + } +} \ No newline at end of file From 5cc7a92aa770a96465f0d47953ead606138631a3 Mon Sep 17 00:00:00 2001 From: Giancarlo Buenaflor Date: Fri, 4 Apr 2025 11:58:23 +0200 Subject: [PATCH 7/9] Fix test --- .../io/sentry/kotlin/multiplatform/SentryAndroidBridgeTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sentry-kotlin-multiplatform/src/androidUnitTest/kotlin/io/sentry/kotlin/multiplatform/SentryAndroidBridgeTest.kt b/sentry-kotlin-multiplatform/src/androidUnitTest/kotlin/io/sentry/kotlin/multiplatform/SentryAndroidBridgeTest.kt index fd1abc43..14dcf961 100644 --- a/sentry-kotlin-multiplatform/src/androidUnitTest/kotlin/io/sentry/kotlin/multiplatform/SentryAndroidBridgeTest.kt +++ b/sentry-kotlin-multiplatform/src/androidUnitTest/kotlin/io/sentry/kotlin/multiplatform/SentryAndroidBridgeTest.kt @@ -32,6 +32,6 @@ internal class Fixture { val sentryInstance = FakeSentryInstance() fun getSut(): SentryBridge { - return SentryBridge(instance) + return SentryBridge(sentryInstance) } } \ No newline at end of file From ad98dd4a502a6d2c80248dc7f993e302eb38dfb9 Mon Sep 17 00:00:00 2001 From: Giancarlo Buenaflor Date: Fri, 4 Apr 2025 11:58:31 +0200 Subject: [PATCH 8/9] Fix test --- .../io/sentry/kotlin/multiplatform/SentryAndroidBridgeTest.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/sentry-kotlin-multiplatform/src/androidUnitTest/kotlin/io/sentry/kotlin/multiplatform/SentryAndroidBridgeTest.kt b/sentry-kotlin-multiplatform/src/androidUnitTest/kotlin/io/sentry/kotlin/multiplatform/SentryAndroidBridgeTest.kt index 14dcf961..ffbf0b8d 100644 --- a/sentry-kotlin-multiplatform/src/androidUnitTest/kotlin/io/sentry/kotlin/multiplatform/SentryAndroidBridgeTest.kt +++ b/sentry-kotlin-multiplatform/src/androidUnitTest/kotlin/io/sentry/kotlin/multiplatform/SentryAndroidBridgeTest.kt @@ -1,6 +1,5 @@ package io.sentry.kotlin.multiplatform -import io.sentry.android.core.SentryAndroidOptions import io.sentry.kotlin.multiplatform.fakes.FakeSentryInstance import junit.framework.TestCase.assertEquals import kotlin.test.BeforeTest From ecdd8cffdb52413ba5166685ac2eb95308de0f67 Mon Sep 17 00:00:00 2001 From: Giancarlo Buenaflor Date: Fri, 4 Apr 2025 12:07:49 +0200 Subject: [PATCH 9/9] Formatting --- .../io/sentry/kotlin/multiplatform/SentryAndroidBridgeTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sentry-kotlin-multiplatform/src/androidUnitTest/kotlin/io/sentry/kotlin/multiplatform/SentryAndroidBridgeTest.kt b/sentry-kotlin-multiplatform/src/androidUnitTest/kotlin/io/sentry/kotlin/multiplatform/SentryAndroidBridgeTest.kt index ffbf0b8d..49981170 100644 --- a/sentry-kotlin-multiplatform/src/androidUnitTest/kotlin/io/sentry/kotlin/multiplatform/SentryAndroidBridgeTest.kt +++ b/sentry-kotlin-multiplatform/src/androidUnitTest/kotlin/io/sentry/kotlin/multiplatform/SentryAndroidBridgeTest.kt @@ -17,7 +17,7 @@ class SentryAndroidBridgeTest { fun `init sets native android sdk name`() { val sut = fixture.getSut() - sut.init { } + sut.init { } val option = SentryPlatformOptions().apply { fixture.sentryInstance.lastConfiguration?.invoke(this) @@ -33,4 +33,4 @@ internal class Fixture { fun getSut(): SentryBridge { return SentryBridge(sentryInstance) } -} \ No newline at end of file +}