Skip to content

Commit 49a3147

Browse files
committed
Merge branch 'main' into fix/logging-breadcrumb-object-tostring
2 parents 24c0b88 + d189e01 commit 49a3147

File tree

5 files changed

+12
-18
lines changed

5 files changed

+12
-18
lines changed

.github/workflows/flutter.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ jobs:
160160
steps:
161161
- uses: actions/checkout@v3
162162
# https://github.com/CocoaPods/CocoaPods/issues/5275#issuecomment-315461879
163-
- run: pod lib lint ios/sentry_flutter.podspec --configuration=Debug --skip-import-validation --allow-warnings
163+
- run: pod lib lint ios/sentry_flutter.podspec --configuration=Debug --skip-import-validation --allow-warnings --verbose
164164

165165
swift-lint:
166166
runs-on: ubuntu-latest

CHANGELOG.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
- Bump Android SDK from v6.25.2 to v6.28.0 ([#1586](https://github.com/getsentry/sentry-dart/pull/1586))
1313
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#6280)
1414
- [diff](https://github.com/getsentry/sentry-java/compare/6.25.2...6.28.0)
15-
- Bump Cocoa SDK from v8.9.1 to v8.9.4 ([#1584](https://github.com/getsentry/sentry-dart/pull/1584))
16-
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#894)
17-
- [diff](https://github.com/getsentry/sentry-cocoa/compare/8.9.1...8.9.4)
15+
- Bump Cocoa SDK from v8.9.1 to v8.10.0 ([#1584](https://github.com/getsentry/sentry-dart/pull/1584), [#1606](https://github.com/getsentry/sentry-dart/pull/1606))
16+
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8100)
17+
- [diff](https://github.com/getsentry/sentry-cocoa/compare/8.9.1...8.10.0)
1818

1919
## 7.9.0
2020

flutter/example/ios/Podfile

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
wanted_project_target = '11.0'
2-
31
# Uncomment this line to define a global platform for your project
4-
platform :ios, wanted_project_target
2+
platform :ios, '11.0'
53

64
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
75
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -37,15 +35,6 @@ target 'Runner' do
3735
end
3836

3937
post_install do |installer|
40-
# remove after https://github.com/flutter/flutter/issues/124340 getting into all channels
41-
installer.generated_projects.each do |project|
42-
project.targets.each do |target|
43-
target.build_configurations.each do |config|
44-
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = wanted_project_target
45-
end
46-
end
47-
end
48-
4938
installer.pods_project.targets.each do |target|
5039
flutter_additional_ios_build_settings(target)
5140
end

flutter/ios/Classes/SentryFlutterPluginApple.swift

+5
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,7 @@ public class SentryFlutterPluginApple: NSObject, FlutterPlugin {
466466
}
467467

468468
private func fetchNativeAppStart(result: @escaping FlutterResult) {
469+
#if os(iOS) || os(tvOS)
469470
guard let appStartMeasurement = PrivateSentrySDKOnly.appStartMeasurement else {
470471
print("warning: appStartMeasurement is null")
471472
result(nil)
@@ -481,6 +482,10 @@ public class SentryFlutterPluginApple: NSObject, FlutterPlugin {
481482
]
482483

483484
result(item)
485+
#else
486+
print("note: appStartMeasurement not available on this platform")
487+
result(nil)
488+
#endif
484489
}
485490

486491
private var totalFrames: UInt = 0

flutter/ios/sentry_flutter.podspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ Pod::Spec.new do |s|
66
Sentry SDK for Flutter with support to native through sentry-cocoa.
77
DESC
88
s.homepage = 'https://sentry.io'
9-
s.license = { :file => '../LICENSE' }
9+
s.license = { :type => 'MIT', :file => '../LICENSE' }
1010
s.authors = "Sentry"
1111
s.source = { :git => "https://github.com/getsentry/sentry-dart.git",
1212
:tag => s.version.to_s }
1313
s.source_files = 'Classes/**/*'
1414
s.public_header_files = 'Classes/**/*.h'
15-
s.dependency 'Sentry/HybridSDK', '8.9.4'
15+
s.dependency 'Sentry/HybridSDK', '8.10.0'
1616
s.ios.dependency 'Flutter'
1717
s.osx.dependency 'FlutterMacOS'
1818
s.ios.deployment_target = '11.0'

0 commit comments

Comments
 (0)