Skip to content

Commit 5d39473

Browse files
authored
Merging of integrations and packages (#1111)
1 parent 5ee19c1 commit 5d39473

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
### Fixes
66

7+
- Merging of integrations and packages ([#1111](https://github.com/getsentry/sentry-dart/pull/1111))
78
- Add missing `fragment` for HTTP Client Errors ([#1102](https://github.com/getsentry/sentry-dart/pull/1102))
89
- Sync user name and geo for Android ([#1102](https://github.com/getsentry/sentry-dart/pull/1102))
910

flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1400"
3+
LastUpgradeVersion = "1300"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

flutter/ios/Classes/SentryFlutterPluginApple.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -204,17 +204,17 @@ public class SentryFlutterPluginApple: NSObject, FlutterPlugin {
204204
self.setEventOriginTag(event: event)
205205

206206
if var sdk = event.sdk, self.isValidSdk(sdk: sdk) {
207-
if let packages = arguments["packages"] as? [String] {
208-
if var sdkPackages = sdk["packages"] as? [String] {
209-
sdk["packages"] = sdkPackages.append(contentsOf: packages)
207+
if let packages = arguments["packages"] as? [[String: String]] {
208+
if var sdkPackages = sdk["packages"] as? [[String: String]] {
209+
sdk["packages"] = sdkPackages + packages
210210
} else {
211211
sdk["packages"] = packages
212212
}
213213
}
214214

215215
if let integrations = arguments["integrations"] as? [String] {
216216
if var sdkIntegrations = sdk["integrations"] as? [String] {
217-
sdk["integrations"] = sdkIntegrations.append(contentsOf: integrations)
217+
sdk["integrations"] = sdkIntegrations + integrations
218218
} else {
219219
sdk["integrations"] = integrations
220220
}

0 commit comments

Comments
 (0)