Merge branch 'main' into dependabot/github_actions/actions/upload-pages-artifact-3

buenaflor · web-flow · commit 8c5e8bb0cac8 · 2025-04-16T17:02:11.000+02:00
diff --git a/.github/workflows/generate-dokka.yml b/.github/workflows/generate-dokka.yml
@@ -37,7 +37,7 @@ jobs:
             ${{ runner.os }}-gradle-
 
       - name: Setup Pages
-        uses: actions/configure-pages@v3
+        uses: actions/configure-pages@v5
 
       - name: Generate docs with dokka
         run: make generateDokka
diff --git a/.github/workflows/kotlin-multiplatform-gradle-plugin.yml b/.github/workflows/kotlin-multiplatform-gradle-plugin.yml
@@ -34,7 +34,7 @@ jobs:
           restore-keys: ${{ runner.os }}-konan-
 
       - name: Cached Gradle
-        uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a
+        uses: gradle/gradle-build-action@ac2d340dc04d9e1113182899e983b5400c17cda1
 
       - name: Build
         run: |
diff --git a/.github/workflows/kotlin-multiplatform.yml b/.github/workflows/kotlin-multiplatform.yml
@@ -31,7 +31,7 @@ jobs:
           restore-keys: ${{ runner.os }}-konan-
 
       - name: Cached Gradle
-        uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a
+        uses: gradle/gradle-build-action@ac2d340dc04d9e1113182899e983b5400c17cda1
 
       - name: Apple build
         run: |
@@ -59,7 +59,7 @@ jobs:
           restore-keys: ${{ runner.os }}-konan-
 
       - name: Cached Gradle
-        uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a
+        uses: gradle/gradle-build-action@ac2d340dc04d9e1113182899e983b5400c17cda1
 
       - name: Apple build
         run: |
@@ -78,7 +78,7 @@ jobs:
           distribution: temurin
 
       - name: Cached Gradle
-        uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a
+        uses: gradle/gradle-build-action@ac2d340dc04d9e1113182899e983b5400c17cda1
 
       - name: JVM build
         run: |
@@ -108,7 +108,7 @@ jobs:
           distribution: temurin
 
       - name: Cached Gradle
-        uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a
+        uses: gradle/gradle-build-action@ac2d340dc04d9e1113182899e983b5400c17cda1
 
       - name: Test samples
         run: |
diff --git a/.github/workflows/upload-artifacts.yml b/.github/workflows/upload-artifacts.yml
@@ -22,7 +22,7 @@ jobs:
           distribution: temurin
 
       - name: Cached Gradle
-        uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a
+        uses: gradle/gradle-build-action@ac2d340dc04d9e1113182899e983b5400c17cda1
 
       - name: DistZip libraries
         run: |
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,14 +2,22 @@
 
 ## Unreleased
 
+### Fixes
+
+- Do not throw if exec operation fails ([#360](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/360))
+
+### 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))
-  - [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)
+- Bump Cocoa SDK from v8.44.0 to v8.49.0 ([#345](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/345), [#363](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/363))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8490)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.44.0...8.49.0)
+- Bump Java SDK from v7.18.1 to v8.8.0 ([#350](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/350), [#364](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/364))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#880)
+  - [diff](https://github.com/getsentry/sentry-java/compare/7.18.1...8.8.0)
 
 ## 0.11.0
 
diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt
@@ -32,11 +32,11 @@ object Config {
     object Libs {
         val kotlinStd = "org.jetbrains.kotlin:kotlin-stdlib"
 
-        val sentryJavaVersion = "8.6.0"
+        val sentryJavaVersion = "8.8.0"
         val sentryAndroid = "io.sentry:sentry-android:$sentryJavaVersion"
         val sentryJava = "io.sentry:sentry:$sentryJavaVersion"
 
-        val sentryCocoaVersion = "8.48.0"
+        val sentryCocoaVersion = "8.49.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"
diff --git a/sentry-kotlin-multiplatform-gradle-plugin/gradle.properties b/sentry-kotlin-multiplatform-gradle-plugin/gradle.properties
@@ -2,7 +2,7 @@ id=io.sentry.kotlin.multiplatform.gradle
 implementationClass=io.sentry.kotlin.multiplatform.gradle.SentryPlugin
 versionName=0.11.0
 group=io.sentry
-sentryCocoaVersion=8.48.0
+sentryCocoaVersion=8.49.0
 
 # publication pom properties
 POM_NAME=Sentry Kotlin Multiplatform Gradle Plugin
diff --git a/sentry-kotlin-multiplatform-gradle-plugin/src/main/java/io/sentry/kotlin/multiplatform/gradle/DerivedDataPathValueSource.kt b/sentry-kotlin-multiplatform-gradle-plugin/src/main/java/io/sentry/kotlin/multiplatform/gradle/DerivedDataPathValueSource.kt
@@ -41,6 +41,7 @@ abstract class DerivedDataPathValueSource :
             )
             it.standardOutput = buildDirOutput
             it.errorOutput = errOutput
+            it.isIgnoreExitValue = true
         }
 
         if (execOperations.exitValue == 0) {
diff --git a/sentry-kotlin-multiplatform-gradle-plugin/src/main/java/io/sentry/kotlin/multiplatform/gradle/ManualFrameworkPathSearchValueSource.kt b/sentry-kotlin-multiplatform-gradle-plugin/src/main/java/io/sentry/kotlin/multiplatform/gradle/ManualFrameworkPathSearchValueSource.kt
@@ -50,6 +50,7 @@ abstract class ManualFrameworkPathSearchValueSource :
             )
             it.standardOutput = stdOutput
             it.errorOutput = errOutput
+            it.isIgnoreExitValue = true
         }
 
         val stringOutput = stdOutput.toString("UTF-8")
diff --git 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/sentry_kotlin_multiplatform.podspec b/sentry-kotlin-multiplatform/sentry_kotlin_multiplatform.podspec
@@ -12,7 +12,7 @@ Pod::Spec.new do |spec|
     spec.osx.deployment_target    = '10.13'
     spec.tvos.deployment_target    = '11.0'
     spec.watchos.deployment_target    = '4.0'
-    spec.dependency 'Sentry', '8.48.0'
+    spec.dependency 'Sentry', '8.49.0'
                 
     if !Dir.exist?('build/cocoapods/framework/sentry_kotlin_multiplatform.framework') || Dir.empty?('build/cocoapods/framework/sentry_kotlin_multiplatform.framework')
         raise "
@@ -54,4 +54,4 @@ Pod::Spec.new do |spec|
         }
     ]
                 
-end
+end
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
@@ -10,6 +10,7 @@ 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
 }
 
 internal actual fun SentryOptions.toPlatformOptionsConfiguration(): PlatformOptionsConfiguration =
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
@@ -0,0 +1,36 @@
+package io.sentry.kotlin.multiplatform
+
+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(sentryInstance)
+    }
+}
diff --git a/sentry-samples/kmp-app-cocoapods/iosApp/Podfile.lock b/sentry-samples/kmp-app-cocoapods/iosApp/Podfile.lock
@@ -1,9 +1,9 @@
 PODS:
-  - Sentry (8.48.0):
-    - Sentry/Core (= 8.48.0)
-  - Sentry/Core (8.48.0)
+  - Sentry (8.49.0):
+    - Sentry/Core (= 8.49.0)
+  - Sentry/Core (8.49.0)
   - shared (1.0):
-    - Sentry (= 8.48.0)
+    - Sentry (= 8.49.0)
 
 DEPENDENCIES:
   - shared (from `../shared`)
@@ -17,8 +17,8 @@ EXTERNAL SOURCES:
     :path: "../shared"
 
 SPEC CHECKSUMS:
-  Sentry: 1ca8405451040482877dcd344dfa3ef80b646631
-  shared: a39a59e646f40aca21465f5b57c0ba28df8aaf8e
+  Sentry: 5eda2559a20fa0c377b695ed9d7c178a47122891
+  shared: 1b9a92de3fc68a6ae8f1d23b53e3a607cd5cdff7
 
 PODFILE CHECKSUM: f282da88f39e69507b0a255187c8a6b644477756
 
diff --git a/sentry-samples/kmp-app-cocoapods/shared/shared.podspec b/sentry-samples/kmp-app-cocoapods/shared/shared.podspec
@@ -9,7 +9,7 @@ Pod::Spec.new do |spec|
     spec.vendored_frameworks      = 'build/cocoapods/framework/shared.framework'
     spec.libraries                = 'c++'
     spec.ios.deployment_target    = '14.1'
-    spec.dependency 'Sentry', '8.48.0'
+    spec.dependency 'Sentry', '8.49.0'
                 
     if !Dir.exist?('build/cocoapods/framework/shared.framework') || Dir.empty?('build/cocoapods/framework/shared.framework')
         raise "

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ abstract class DerivedDataPathValueSource :`
`41`	`41`	`)`
`42`	`42`	`it.standardOutput = buildDirOutput`
`43`	`43`	`it.errorOutput = errOutput`
	`44`	`+ it.isIgnoreExitValue = true`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`if (execOperations.exitValue == 0) {`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ abstract class ManualFrameworkPathSearchValueSource :`
`50`	`50`	`)`
`51`	`51`	`it.standardOutput = stdOutput`
`52`	`52`	`it.errorOutput = errOutput`
	`53`	`+ it.isIgnoreExitValue = true`
`53`	`54`	`}`
`54`	`55`
`55`	`56`	`val stringOutput = stdOutput.toString("UTF-8")`