From d7c3f5216a5ed360cb9057d5b3b100b3ae905d25 Mon Sep 17 00:00:00 2001 From: GitHub Date: Tue, 15 Oct 2024 15:21:31 +0000 Subject: [PATCH 1/3] chore: update scripts/update-cocoa.sh to 8.38.0 --- CHANGELOG.md | 6 +++--- buildSrc/src/main/java/Config.kt | 2 +- sentry-kotlin-multiplatform-gradle-plugin/gradle.properties | 2 +- .../sentry_kotlin_multiplatform.podspec | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6351acf6..4da50109 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,9 +17,9 @@ Sentry.init { options -> ### Dependencies -- Bump Cocoa SDK from v8.36.0 to v8.37.0 ([#279](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/279)) - - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8370) - - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.36.0...8.37.0) +- Bump Cocoa SDK from v8.36.0 to v8.38.0 ([#279](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/279), [#285](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/285)) + - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8380) + - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.36.0...8.38.0) - Bump Java SDK from v7.14.0 to v7.15.0 ([#284](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/284)) - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#7150) - [diff](https://github.com/getsentry/sentry-java/compare/7.14.0...7.15.0) diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index e9302819..2939b8a3 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.37.0" + val sentryCocoaVersion = "8.38.0" val sentryCocoa = "Sentry" object Samples { diff --git a/sentry-kotlin-multiplatform-gradle-plugin/gradle.properties b/sentry-kotlin-multiplatform-gradle-plugin/gradle.properties index 83563627..2a155a33 100644 --- 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.9.0 group=io.sentry -sentryCocoaVersion=8.37.0 +sentryCocoaVersion=8.38.0 # publication pom properties POM_NAME=Sentry Kotlin Multiplatform Gradle Plugin diff --git a/sentry-kotlin-multiplatform/sentry_kotlin_multiplatform.podspec b/sentry-kotlin-multiplatform/sentry_kotlin_multiplatform.podspec index e22cd9fd..26d37a32 100644 --- 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.37.0' + spec.dependency 'Sentry', '8.38.0' if !Dir.exist?('build/cocoapods/framework/sentry_kotlin_multiplatform.framework') || Dir.empty?('build/cocoapods/framework/sentry_kotlin_multiplatform.framework') raise " @@ -50,4 +50,4 @@ Pod::Spec.new do |spec| } ] -end \ No newline at end of file +end From 61b666480c88843ea9f4dea0d4f7eec5e8c3fec9 Mon Sep 17 00:00:00 2001 From: GIancarlo Buenaflor Date: Thu, 17 Oct 2024 13:10:04 +0200 Subject: [PATCH 2/3] update --- .../sentry_kotlin_multiplatform.podspec | 2 +- sentry-samples/kmp-app-cocoapods/iosApp/Podfile.lock | 12 ++++++------ .../kmp-app-cocoapods/shared/shared.podspec | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sentry-kotlin-multiplatform/sentry_kotlin_multiplatform.podspec b/sentry-kotlin-multiplatform/sentry_kotlin_multiplatform.podspec index 26d37a32..9cfc4359 100644 --- a/sentry-kotlin-multiplatform/sentry_kotlin_multiplatform.podspec +++ b/sentry-kotlin-multiplatform/sentry_kotlin_multiplatform.podspec @@ -50,4 +50,4 @@ Pod::Spec.new do |spec| } ] -end +end \ No newline at end of file diff --git a/sentry-samples/kmp-app-cocoapods/iosApp/Podfile.lock b/sentry-samples/kmp-app-cocoapods/iosApp/Podfile.lock index 05a32779..8d3f404c 100644 --- 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.37.0): - - Sentry/Core (= 8.37.0) - - Sentry/Core (8.37.0) + - Sentry (8.38.0): + - Sentry/Core (= 8.38.0) + - Sentry/Core (8.38.0) - shared (1.0): - - Sentry (= 8.37.0) + - Sentry (= 8.38.0) DEPENDENCIES: - shared (from `../shared`) @@ -17,8 +17,8 @@ EXTERNAL SOURCES: :path: "../shared" SPEC CHECKSUMS: - Sentry: ee060c09b2f7ec1240e95c766ab44c04c7bdb052 - shared: 4717ae7bad4e94adc1177508d0519ab174142885 + Sentry: 205813e7e758b53df157cedb8c55b31a14300645 + shared: 29ad91c0e6392887a08175041ce5c1ff1cb63ee7 PODFILE CHECKSUM: f282da88f39e69507b0a255187c8a6b644477756 diff --git a/sentry-samples/kmp-app-cocoapods/shared/shared.podspec b/sentry-samples/kmp-app-cocoapods/shared/shared.podspec index 462cf732..87cbe4c3 100644 --- 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.37.0' + spec.dependency 'Sentry', '8.38.0' if !Dir.exist?('build/cocoapods/framework/shared.framework') || Dir.empty?('build/cocoapods/framework/shared.framework') raise " From 6b34286be1cca7cc673e12b3d22544468a2ecf63 Mon Sep 17 00:00:00 2001 From: GIancarlo Buenaflor Date: Thu, 17 Oct 2024 13:23:05 +0200 Subject: [PATCH 3/3] update --- .../multiplatform/extensions/SentryOptionsExtensions.ios.kt | 4 ++-- .../io/sentry/kotlin/multiplatform/PlatformOptions.ios.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sentry-kotlin-multiplatform/src/iosMain/kotlin/io/sentry/kotlin/multiplatform/extensions/SentryOptionsExtensions.ios.kt b/sentry-kotlin-multiplatform/src/iosMain/kotlin/io/sentry/kotlin/multiplatform/extensions/SentryOptionsExtensions.ios.kt index c523db66..ff4a849d 100644 --- a/sentry-kotlin-multiplatform/src/iosMain/kotlin/io/sentry/kotlin/multiplatform/extensions/SentryOptionsExtensions.ios.kt +++ b/sentry-kotlin-multiplatform/src/iosMain/kotlin/io/sentry/kotlin/multiplatform/extensions/SentryOptionsExtensions.ios.kt @@ -23,8 +23,8 @@ internal fun SentryOptions.toIosOptionsConfiguration(): (CocoaSentryOptions?) -> "errorSampleRate" to kmpOptions.experimental.sessionReplay.onErrorSampleRate?.toFloat() ) ).apply { - setRedactAllText(kmpOptions.experimental.sessionReplay.maskAllText) - setRedactAllImages(kmpOptions.experimental.sessionReplay.maskAllImages) + setMaskAllText(kmpOptions.experimental.sessionReplay.maskAllText) + setMaskAllImages(kmpOptions.experimental.sessionReplay.maskAllImages) kmpOptions.experimental.sessionReplay.sessionSampleRate?.let { setSessionSampleRate(it.toFloat()) } setQuality(kmpOptions.experimental.sessionReplay.quality.ordinal.toLong()) } diff --git a/sentry-kotlin-multiplatform/src/iosTest/kotlin/io/sentry/kotlin/multiplatform/PlatformOptions.ios.kt b/sentry-kotlin-multiplatform/src/iosTest/kotlin/io/sentry/kotlin/multiplatform/PlatformOptions.ios.kt index 3fac591f..c5fc88c3 100644 --- a/sentry-kotlin-multiplatform/src/iosTest/kotlin/io/sentry/kotlin/multiplatform/PlatformOptions.ios.kt +++ b/sentry-kotlin-multiplatform/src/iosTest/kotlin/io/sentry/kotlin/multiplatform/PlatformOptions.ios.kt @@ -40,8 +40,8 @@ actual fun ApplePlatformOptions.assertApplePlatformSpecificOptions(options: Sent assertEquals(attachViewHierarchy, options.attachViewHierarchy) assertEquals(enableAppHangTracking, options.enableAppHangTracking) assertEquals(appHangTimeoutIntervalMillis, options.appHangTimeoutIntervalMillis) - assertEquals(sessionReplay.redactAllText(), options.experimental.sessionReplay.maskAllText) - assertEquals(sessionReplay.redactAllImages(), options.experimental.sessionReplay.maskAllImages) + assertEquals(sessionReplay.maskAllText(), options.experimental.sessionReplay.maskAllText) + assertEquals(sessionReplay.maskAllImages(), options.experimental.sessionReplay.maskAllImages) assertEquals(sessionReplay.onErrorSampleRate().toDouble(), options.experimental.sessionReplay.onErrorSampleRate) assertEquals(sessionReplay.sessionSampleRate().toDouble(), options.experimental.sessionReplay.sessionSampleRate) assertEquals(sessionReplay.quality(), options.experimental.sessionReplay.quality.ordinal.toLong())