fix: sdk name (#57)

* fix sdk name

* pin cocoapods gradle version to 0.0.1

Author: buenaflor

buildSrc/src/main/java/Config.kt

@@ -53,7 +53,9 @@ object Config {
     }
 
     object Sentry {
-        val kotlinMultiplatformSdkName = "sentry.kotlin.kmp"
+        val kmpCocoaSdkName = "sentry.cocoa.kmp"
+        val kmpJavaSdkName = "sentry.java.kmp"
+        val kmpAndroidSdkName = "sentry.java.android.kmp"
         val javaPackageName = "maven:io.sentry:sentry"
         val androidPackageName = "maven:io.sentry:sentry-android"
         val cocoaPackageName = "cocoapods:sentry-cocoa"

sentry-kotlin-multiplatform/build.gradle.kts

@@ -81,6 +81,7 @@ kotlin {
         cocoapods {
             summary = "Official Sentry SDK Kotlin Multiplatform"
             homepage = "https://github.com/getsentry/sentry-kotlin-multiplatform"
+            version = "0.0.1"
 
             pod(Config.Libs.sentryCocoa, "~> ${Config.Libs.sentryCocoaVersion}")
 
@@ -188,17 +189,16 @@ kotlin {
 buildkonfig {
     packageName = "io.sentry.kotlin.multiplatform"
     defaultConfigs {
-        buildConfigField(
-            STRING,
-            "SENTRY_KOTLIN_MULTIPLATFORM_SDK_NAME",
-            Config.Sentry.kotlinMultiplatformSdkName
-        )
+        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, "VERSION_NAME", project.version.toString())
-        buildConfigField(STRING, "SENTRY_JVM_PACKAGE_NAME", Config.Sentry.javaPackageName)
+        buildConfigField(STRING, "SENTRY_JAVA_PACKAGE_NAME", Config.Sentry.javaPackageName)
         buildConfigField(STRING, "SENTRY_ANDROID_PACKAGE_NAME", Config.Sentry.androidPackageName)
         buildConfigField(STRING, "SENTRY_COCOA_PACKAGE_NAME", Config.Sentry.cocoaPackageName)
 
-        buildConfigField(STRING, "SENTRY_JVM_VERSION", Config.Libs.sentryJavaVersion)
+        buildConfigField(STRING, "SENTRY_JAVA_VERSION", Config.Libs.sentryJavaVersion)
         buildConfigField(STRING, "SENTRY_ANDROID_VERSION", Config.Libs.sentryJavaVersion)
         buildConfigField(STRING, "SENTRY_COCOA_VERSION", Config.Libs.sentryCocoaVersion)
     }

sentry-kotlin-multiplatform/src/androidMain/kotlin/io/sentry/kotlin/multiplatform/extensions/SentryAndroidOptionsExtensions.kt

@@ -10,6 +10,15 @@ internal fun SentryOptions.toAndroidSentryOptionsCallback(): (SentryAndroidOptio
 
     // Apply Android specific options
     it.isAttachScreenshot = this.attachScreenshot
-    sdk.addPackage(BuildKonfig.SENTRY_ANDROID_PACKAGE_NAME, BuildKonfig.SENTRY_ANDROID_VERSION)
-    it.sdkVersion = sdk.toJvmSdkVersion()
+
+    it.sdkVersion?.name = this.sdk?.name ?: BuildKonfig.SENTRY_KMP_ANDROID_SDK_NAME
+    it.sdkVersion?.version = this.sdk?.version ?: BuildKonfig.VERSION_NAME
+
+    this.sdk?.packages?.forEach { sdkPackage ->
+        it.sdkVersion?.addPackage(sdkPackage.name, sdkPackage.version)
+    }
+
+    if (it.sdkVersion?.packages?.none { it.name == BuildKonfig.SENTRY_ANDROID_PACKAGE_NAME } == true) {
+        it.sdkVersion?.addPackage(BuildKonfig.SENTRY_ANDROID_PACKAGE_NAME, BuildKonfig.SENTRY_ANDROID_VERSION)
+    }
 }

sentry-kotlin-multiplatform/src/commonAppleMain/kotlin/io/sentry/kotlin/multiplatform/extensions/SentryOptionsExtensions.kt

@@ -35,24 +35,28 @@ internal fun CocoaSentryOptions.applyCocoaBaseOptions(options: SentryOptions) {
 
         val cocoaName = BuildKonfig.SENTRY_COCOA_PACKAGE_NAME
         val cocoaVersion = BuildKonfig.SENTRY_COCOA_VERSION
-        options.sdk.apply {
-            val names = this.packages?.map { it.name }
-            if (names?.contains(cocoaName) != true) {
-                this.addPackage(cocoaName, cocoaVersion)
-            }
-        }
+
         val sdk = event?.sdk?.toMutableMap()
-        sdk?.set(
-            "packages",
-            options.sdk.packages?.map {
-                mapOf("name" to it.name, "version" to it.version)
-            }
-        )
-        event?.sdk = sdk
 
+        val packages = options.sdk?.packages?.map {
+            mapOf("name" to it.name, "version" to it.version)
+        }?.toMutableList() ?: mutableListOf()
+
+        val names = packages.map { it["name"] }
+        if (!names.contains(cocoaName)) {
+            packages.add(mapOf("name" to cocoaName, "version" to cocoaVersion))
+        }
+
+        sdk?.set("packages", packages)
+
+        event?.sdk = sdk
         event
     }
-    PrivateSentrySDKOnly.setSdkName(options.sdk.name, options.sdk.version)
+
+    val sdkName = options.sdk?.name ?: BuildKonfig.SENTRY_KMP_COCOA_SDK_NAME
+    val sdkVersion = options.sdk?.version ?: BuildKonfig.VERSION_NAME
+    PrivateSentrySDKOnly.setSdkName(sdkName, sdkVersion)
+
     this.beforeBreadcrumb = { cocoaBreadcrumb ->
         cocoaBreadcrumb?.toKmpBreadcrumb()
             ?.let { options.beforeBreadcrumb?.invoke(it) }?.toCocoaBreadcrumb()

sentry-kotlin-multiplatform/src/commonJvmMain/kotlin/io/sentry/kotlin/multiplatform/extensions/SdkVersionExtensions.kt

@@ -8,10 +8,16 @@ internal fun SentryOptions.toJvmSentryOptionsCallback(): (JvmSentryOptions) -> U
     it.applyJvmBaseOptions(this)
 
     // Apply JVM specific options
-    this.sdk.apply {
-        addPackage(BuildKonfig.SENTRY_JVM_PACKAGE_NAME, BuildKonfig.SENTRY_JVM_VERSION)
+    it.sdkVersion?.name = this.sdk?.name ?: BuildKonfig.SENTRY_KMP_JAVA_SDK_NAME
+    it.sdkVersion?.version = this.sdk?.version ?: BuildKonfig.VERSION_NAME
+
+    this.sdk?.packages?.forEach { sdkPackage ->
+        it.sdkVersion?.addPackage(sdkPackage.name, sdkPackage.version)
+    }
+
+    if (it.sdkVersion?.packages?.none { it.name == BuildKonfig.SENTRY_JAVA_PACKAGE_NAME } == true) {
+        it.sdkVersion?.addPackage(BuildKonfig.SENTRY_JAVA_PACKAGE_NAME, BuildKonfig.SENTRY_JAVA_VERSION)
     }
-    it.sdkVersion = this.sdk.toJvmSdkVersion()
 }
 
 /**

sentry-kotlin-multiplatform/src/commonJvmMain/kotlin/io/sentry/kotlin/multiplatform/extensions/SentryOptionsExtensions.kt

@@ -59,7 +59,7 @@ open class SentryOptions {
     var beforeBreadcrumb: ((Breadcrumb) -> Breadcrumb?)? = null
 
     /** Information about the Sentry SDK that generated this event. */
-    var sdk: SdkVersion = SdkVersion(BuildKonfig.SENTRY_KOTLIN_MULTIPLATFORM_SDK_NAME, BuildKonfig.VERSION_NAME)
+    var sdk: SdkVersion? = null
 
     /** This variable controls the total amount of breadcrumbs that should be captured. Default is 100. */
     var maxBreadcrumbs = 100