From 583093ff81e57894c02f085580981c6606d87c6c Mon Sep 17 00:00:00 2001 From: Alan Charles Date: Fri, 27 Jan 2023 17:50:31 -0700 Subject: [PATCH] fix example and bump dependencies --- .../BasicExample.xcodeproj/project.pbxproj | 2 + .../xcschemes/BasicExample.xcscheme | 104 ++++++++++++++++++ .../xcshareddata/swiftpm/Package.resolved | 50 ++++----- .../BasicExample/BasicExampleApp.swift | 6 +- Package.swift | 4 +- 5 files changed, 138 insertions(+), 28 deletions(-) create mode 100644 Example/BasicExample/BasicExample.xcodeproj/xcshareddata/xcschemes/BasicExample.xcscheme diff --git a/Example/BasicExample/BasicExample.xcodeproj/project.pbxproj b/Example/BasicExample/BasicExample.xcodeproj/project.pbxproj index 18ec5b2..1adffe1 100644 --- a/Example/BasicExample/BasicExample.xcodeproj/project.pbxproj +++ b/Example/BasicExample/BasicExample.xcodeproj/project.pbxproj @@ -438,6 +438,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = "\"BasicExample/Preview Content\""; + DEVELOPMENT_TEAM = ""; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; @@ -466,6 +467,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = "\"BasicExample/Preview Content\""; + DEVELOPMENT_TEAM = ""; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; diff --git a/Example/BasicExample/BasicExample.xcodeproj/xcshareddata/xcschemes/BasicExample.xcscheme b/Example/BasicExample/BasicExample.xcodeproj/xcshareddata/xcschemes/BasicExample.xcscheme new file mode 100644 index 0000000..fb9dce1 --- /dev/null +++ b/Example/BasicExample/BasicExample.xcodeproj/xcshareddata/xcschemes/BasicExample.xcscheme @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Example/BasicExample/BasicExample.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Example/BasicExample/BasicExample.xcworkspace/xcshareddata/swiftpm/Package.resolved index 94de4c0..7380d1e 100644 --- a/Example/BasicExample/BasicExample.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Example/BasicExample/BasicExample.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/firebase/abseil-cpp-SwiftPM.git", "state": { "branch": null, - "revision": "fffc3c2729be5747390ad02d5100291a0d9ad26a", - "version": "0.20200225.4" + "revision": "583de9bd60f66b40e78d08599cc92036c2e7e4e1", + "version": "0.20220203.2" } }, { @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/segmentio/analytics-swift", "state": { "branch": null, - "revision": "76316a5009502de6e7c2788c295e9afc68793cd3", - "version": "1.1.2" + "revision": "af7f1d2fe6e48b1760538739f13f44ba71c1a61c", + "version": "1.3.4" } }, { @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/firebase/boringssl-SwiftPM.git", "state": { "branch": null, - "revision": "734a8247442fde37df4364c21f6a0085b6a36728", - "version": "0.7.2" + "revision": "dd3eda2b05a3f459fc3073695ad1b28659066eab", + "version": "0.9.1" } }, { @@ -33,8 +33,8 @@ "repositoryURL": "https://github.com/firebase/firebase-ios-sdk", "state": { "branch": null, - "revision": "78f7087fd5d48eb7c36e299f330b6dddccd647b2", - "version": "8.12.1" + "revision": "0df86ea17d5d281415be74f2290df8431644f156", + "version": "10.4.0" } }, { @@ -42,8 +42,8 @@ "repositoryURL": "https://github.com/google/GoogleAppMeasurement.git", "state": { "branch": null, - "revision": "6cc2991c11872510a5314bc112cc7558dd9d046a", - "version": "8.12.0" + "revision": "9a09ece724128e8d1e14c5133b87c0e236844ac0", + "version": "10.4.0" } }, { @@ -51,8 +51,8 @@ "repositoryURL": "https://github.com/google/GoogleDataTransport.git", "state": { "branch": null, - "revision": "15ccdfd25ac55b9239b82809531ff26605e7556e", - "version": "9.1.2" + "revision": "f6b558e3f801f2cac336b04f615ce111fa9ddaa0", + "version": "9.2.1" } }, { @@ -60,17 +60,17 @@ "repositoryURL": "https://github.com/google/GoogleUtilities.git", "state": { "branch": null, - "revision": "b3bb0c5551fb3f80ca939829639ab5b093edd14f", - "version": "7.7.0" + "revision": "0543562f85620b5b7c510c6bcbef75b562a5127b", + "version": "7.11.0" } }, { "package": "gRPC", - "repositoryURL": "https://github.com/firebase/grpc-SwiftPM.git", + "repositoryURL": "https://github.com/grpc/grpc-ios.git", "state": { "branch": null, - "revision": "fb405dd2c7901485f7e158b24e3a0a47e4efd8b5", - "version": "1.28.4" + "revision": "8440b914756e0d26d4f4d054a1c1581daedfc5b6", + "version": "1.44.3-grpc" } }, { @@ -78,8 +78,8 @@ "repositoryURL": "https://github.com/google/gtm-session-fetcher.git", "state": { "branch": null, - "revision": "bc6a19702ac76ac4e488b68148710eb815f9bc56", - "version": "1.7.0" + "revision": "5ccda3981422a84186387dbb763ba739178b529c", + "version": "2.3.0" } }, { @@ -96,8 +96,8 @@ "repositoryURL": "https://github.com/firebase/nanopb.git", "state": { "branch": null, - "revision": "7ee9ef9f627d85cbe1b8c4f49a3ed26eed216c77", - "version": "2.30908.0" + "revision": "819d0a2173aff699fb8c364b6fb906f7cdb1a692", + "version": "2.30909.0" } }, { @@ -105,8 +105,8 @@ "repositoryURL": "https://github.com/google/promises.git", "state": { "branch": null, - "revision": "611337c330350c9c1823ad6d671e7f936af5ee13", - "version": "2.0.0" + "revision": "3e4e743631e86c8c70dbc6efdc7beaa6e90fd3bb", + "version": "2.1.1" } }, { @@ -123,8 +123,8 @@ "repositoryURL": "https://github.com/apple/swift-protobuf.git", "state": { "branch": null, - "revision": "7e2c5f3cbbeea68e004915e3a8961e20bd11d824", - "version": "1.18.0" + "revision": "ab3a58b7209a17d781c0d1dbb3e1ff3da306bae8", + "version": "1.20.3" } } ] diff --git a/Example/BasicExample/BasicExample/BasicExampleApp.swift b/Example/BasicExample/BasicExample/BasicExampleApp.swift index 8f25111..888c718 100644 --- a/Example/BasicExample/BasicExample/BasicExampleApp.swift +++ b/Example/BasicExample/BasicExample/BasicExampleApp.swift @@ -11,11 +11,16 @@ import SegmentFirebase @main struct BasicExampleApp: App { + var body: some Scene { WindowGroup { ContentView() } } + + init() { + Analytics.main.add(plugin: FirebaseDestination()) + } } extension Analytics { @@ -23,7 +28,6 @@ extension Analytics { let analytics = Analytics(configuration: Configuration(writeKey: "") .flushAt(3) .trackApplicationLifecycleEvents(true)) - analytics.add(plugin: FirebaseDestination()) return analytics } } diff --git a/Package.swift b/Package.swift index c9db383..ef22981 100644 --- a/Package.swift +++ b/Package.swift @@ -23,12 +23,12 @@ let package = Package( .package( name: "Segment", url: "https://github.com/segmentio/analytics-swift.git", - from: "1.1.2" + from: "1.3.4" ), .package( name: "Firebase", url: "https://github.com/firebase/firebase-ios-sdk", - from: "9.1.0" + from: "10.0.0" ) ], targets: [