From 60f27365d7c3763b143a2ec4696b3b6acefa2c58 Mon Sep 17 00:00:00 2001 From: GitHub Date: Tue, 30 Apr 2024 19:44:58 +0000 Subject: [PATCH 1/4] chore: update scripts/update-cocoa.sh to 8.25.0 --- CHANGELOG.md | 3 +++ buildSrc/src/main/java/Config.kt | 2 +- .../sentry_kotlin_multiplatform.podspec | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e378f874..98f12b93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,9 @@ - Bump Java SDK from v7.4.0 to v7.8.0 ([#205](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/205), [#206](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/206)) - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#780) - [diff](https://github.com/getsentry/sentry-java/compare/7.4.0...7.8.0) +- Bump Cocoa SDK from v8.20.0 to v8.25.0 ([#209](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/209)) + - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8250) + - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.20.0...8.25.0) ## 0.5.0 diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index 792b8884..9cbb2f83 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.20.0" + val sentryCocoaVersion = "8.25.0" val sentryCocoa = "Sentry" object Samples { diff --git a/sentry-kotlin-multiplatform/sentry_kotlin_multiplatform.podspec b/sentry-kotlin-multiplatform/sentry_kotlin_multiplatform.podspec index fd365097..7af05cf5 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.20.0' + spec.dependency 'Sentry', '8.25.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 df0e58d2de6981b0607a31e6f30990a23f7a2080 Mon Sep 17 00:00:00 2001 From: GIancarlo Buenaflor Date: Tue, 30 Apr 2024 21:54:31 +0200 Subject: [PATCH 2/4] Update --- buildSrc/src/main/java/Config.kt | 4 ++-- sentry-samples/kmp-app-cocoapods/shared/shared.podspec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index 9cbb2f83..d92353d8 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -1,7 +1,7 @@ object Config { val agpVersion = "7.4.2" - val kotlinVersion = "1.9.21" - val composeVersion = "1.5.11" + val kotlinVersion = "1.9.23" + val composeVersion = "1.6.1" val gradleMavenPublishPluginVersion = "0.18.0" val multiplatform = "multiplatform" diff --git a/sentry-samples/kmp-app-cocoapods/shared/shared.podspec b/sentry-samples/kmp-app-cocoapods/shared/shared.podspec index 46ad91f3..59f24592 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.20.0' + spec.dependency 'Sentry', '8.25.0' if !Dir.exist?('build/cocoapods/framework/shared.framework') || Dir.empty?('build/cocoapods/framework/shared.framework') raise " From 1bb98e78cab4ef5e57bfe4dfc54ea11b799b2391 Mon Sep 17 00:00:00 2001 From: GIancarlo Buenaflor Date: Tue, 30 Apr 2024 22:17:36 +0200 Subject: [PATCH 3/4] Update --- sentry-kotlin-multiplatform/build.gradle.kts | 5 ++++- .../kmp-app-cocoapods/iosApp/Podfile.lock | 17 ++++++----------- .../kmp-app-cocoapods/shared/build.gradle.kts | 5 ++++- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/sentry-kotlin-multiplatform/build.gradle.kts b/sentry-kotlin-multiplatform/build.gradle.kts index de4b815e..45dda945 100644 --- a/sentry-kotlin-multiplatform/build.gradle.kts +++ b/sentry-kotlin-multiplatform/build.gradle.kts @@ -145,7 +145,10 @@ kotlin { homepage = "https://github.com/getsentry/sentry-kotlin-multiplatform" version = "0.0.1" - pod(Config.Libs.sentryCocoa, Config.Libs.sentryCocoaVersion) + pod(Config.Libs.sentryCocoa) { + version = Config.Libs.sentryCocoaVersion + extraOpts += listOf("-compiler-option", "-fmodules") + } ios.deploymentTarget = Config.Cocoa.iosDeploymentTarget osx.deploymentTarget = Config.Cocoa.osxDeploymentTarget diff --git a/sentry-samples/kmp-app-cocoapods/iosApp/Podfile.lock b/sentry-samples/kmp-app-cocoapods/iosApp/Podfile.lock index ea11a31b..20ce8b8e 100644 --- a/sentry-samples/kmp-app-cocoapods/iosApp/Podfile.lock +++ b/sentry-samples/kmp-app-cocoapods/iosApp/Podfile.lock @@ -1,12 +1,9 @@ PODS: - - Sentry (8.20.0): - - Sentry/Core (= 8.20.0) - - SentryPrivate (= 8.20.0) - - Sentry/Core (8.20.0): - - SentryPrivate (= 8.20.0) - - SentryPrivate (8.20.0) + - Sentry (8.25.0): + - Sentry/Core (= 8.25.0) + - Sentry/Core (8.25.0) - shared (1.0): - - Sentry (= 8.20.0) + - Sentry (= 8.25.0) DEPENDENCIES: - shared (from `../shared`) @@ -14,16 +11,14 @@ DEPENDENCIES: SPEC REPOS: trunk: - Sentry - - SentryPrivate EXTERNAL SOURCES: shared: :path: "../shared" SPEC CHECKSUMS: - Sentry: a8d7b373b9f9868442b02a0c425192f693103cbf - SentryPrivate: 006b24af16828441f70e2ab6adf241bd0a8ad130 - shared: 1f6c0649407365a649be810e8ee7f09e1fc32868 + Sentry: cd86fc55628f5b7c572cabe66cc8f95a9d2f165a + shared: 9b60306d775c7bb09035fb0d355ab1a6f253e819 PODFILE CHECKSUM: f282da88f39e69507b0a255187c8a6b644477756 diff --git a/sentry-samples/kmp-app-cocoapods/shared/build.gradle.kts b/sentry-samples/kmp-app-cocoapods/shared/build.gradle.kts index b6537b4b..fde5761c 100644 --- a/sentry-samples/kmp-app-cocoapods/shared/build.gradle.kts +++ b/sentry-samples/kmp-app-cocoapods/shared/build.gradle.kts @@ -31,7 +31,10 @@ kotlin { ios.deploymentTarget = "14.1" podfile = project.file("../iosApp/Podfile") - pod("Sentry", Config.Libs.sentryCocoaVersion) + pod("Sentry") { + version = Config.Libs.sentryCocoaVersion + extraOpts += listOf("-compiler-option", "-fmodules") + } framework { baseName = "shared" From c729f529db01532f693fe40c6350aed933c157c0 Mon Sep 17 00:00:00 2001 From: GIancarlo Buenaflor Date: Fri, 3 May 2024 02:51:19 +0200 Subject: [PATCH 4/4] Update Changelog --- CHANGELOG.md | 12 ++++++++++++ buildSrc/src/main/java/Config.kt | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98f12b93..67af930a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,18 @@ ## Unreleased +**Note**: This release includes a bump to Sentry Cocoa v8.25.0. +Please use at least version 8.25.0 of the Sentry Cocoa SDK starting from this release. +If you are using the Cocoapods gradle plugin you need to adjust your configuration: + +```kotlin +pod("Sentry") { + version = "8.25.0" + // These extra options are required + extraOpts += listOf("-compiler-option", "-fmodules") +} +``` + ### Enhancements - Make `setSentryUnhandledExceptionHook` public ([#208](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/208)) diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index d92353d8..9cbb2f83 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -1,7 +1,7 @@ object Config { val agpVersion = "7.4.2" - val kotlinVersion = "1.9.23" - val composeVersion = "1.6.1" + val kotlinVersion = "1.9.21" + val composeVersion = "1.5.11" val gradleMavenPublishPluginVersion = "0.18.0" val multiplatform = "multiplatform"