Skip to content

Commit

Permalink
Merge branch 'main' into feat/override-native-options
Browse files Browse the repository at this point in the history
  • Loading branch information
buenaflor authored May 15, 2024
2 parents b3c0fdf + dc19da0 commit 7a15057
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 9 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ actual fun createPlatformOptions(): PlatformOptionsConfiguration = {
- Bump Java SDK from v7.8.0 to v7.9.0 ([#219](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/219))
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#790)
- [diff](https://github.com/getsentry/sentry-java/compare/7.8.0...7.9.0)
- Bump Cocoa SDK from v8.25.0 to v8.26.0 ([#222](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/222))
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8260)
- [diff](https://github.com/getsentry/sentry-cocoa/compare/8.25.0...8.26.0)

## 0.6.0

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/Config.kt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ object Config {
val sentryAndroid = "io.sentry:sentry-android:$sentryJavaVersion"
val sentryJava = "io.sentry:sentry:$sentryJavaVersion"

val sentryCocoaVersion = "8.25.0"
val sentryCocoaVersion = "8.26.0"
val sentryCocoa = "Sentry"

object Samples {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.25.0'
spec.dependency 'Sentry', '8.26.0'

if !Dir.exist?('build/cocoapods/framework/sentry_kotlin_multiplatform.framework') || Dir.empty?('build/cocoapods/framework/sentry_kotlin_multiplatform.framework')
raise "
Expand Down
12 changes: 6 additions & 6 deletions sentry-samples/kmp-app-cocoapods/iosApp/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
PODS:
- Sentry (8.25.0):
- Sentry/Core (= 8.25.0)
- Sentry/Core (8.25.0)
- Sentry (8.26.0):
- Sentry/Core (= 8.26.0)
- Sentry/Core (8.26.0)
- shared (1.0):
- Sentry (= 8.25.0)
- Sentry (= 8.26.0)

DEPENDENCIES:
- shared (from `../shared`)
Expand All @@ -17,8 +17,8 @@ EXTERNAL SOURCES:
:path: "../shared"

SPEC CHECKSUMS:
Sentry: cd86fc55628f5b7c572cabe66cc8f95a9d2f165a
shared: 9b60306d775c7bb09035fb0d355ab1a6f253e819
Sentry: 74a073c71c998117edb08f56f443c83570a31bed
shared: ce00f3b03258dc0092e8d21b249e91f4d2fb1098

PODFILE CHECKSUM: f282da88f39e69507b0a255187c8a6b644477756

Expand Down
2 changes: 1 addition & 1 deletion sentry-samples/kmp-app-cocoapods/shared/shared.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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.25.0'
spec.dependency 'Sentry', '8.26.0'

if !Dir.exist?('build/cocoapods/framework/shared.framework') || Dir.empty?('build/cocoapods/framework/shared.framework')
raise "
Expand Down

0 comments on commit 7a15057

Please sign in to comment.