From 1ee2a3e76d9b0789849d2e561cfe86eeff6dd8f0 Mon Sep 17 00:00:00 2001 From: Sixten Otto Date: Fri, 17 Feb 2023 12:35:17 -0700 Subject: [PATCH 1/2] change analytics-swift package URL to HTTPS --- .../Omnivore.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +- apple/OmnivoreKit/Package.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apple/Omnivore.xcworkspace/xcshareddata/swiftpm/Package.resolved b/apple/Omnivore.xcworkspace/xcshareddata/swiftpm/Package.resolved index 9ae70cf8e..6bedd5ebd 100644 --- a/apple/Omnivore.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/apple/Omnivore.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -12,7 +12,7 @@ { "identity" : "analytics-swift", "kind" : "remoteSourceControl", - "location" : "git@github.com:segmentio/analytics-swift.git", + "location" : "https://github.com/segmentio/analytics-swift.git", "state" : { "revision" : "92cc824211160ab98c28c7d40c1e6d27645c2bf1", "version" : "1.2.3" diff --git a/apple/OmnivoreKit/Package.swift b/apple/OmnivoreKit/Package.swift index 175e8ef0e..962c67a39 100644 --- a/apple/OmnivoreKit/Package.swift +++ b/apple/OmnivoreKit/Package.swift @@ -65,7 +65,7 @@ var dependencies: [Package.Dependency] { .package(url: "https://github.com/Square/Valet", from: "4.1.2"), .package(url: "https://github.com/maticzav/swift-graphql", from: "2.3.1"), .package(url: "https://github.com/siteline/SwiftUI-Introspect.git", from: "0.1.4"), - .package(url: "git@github.com:segmentio/analytics-swift.git", .upToNextMajor(from: "1.0.0")), + .package(url: "https://github.com/segmentio/analytics-swift.git", .upToNextMajor(from: "1.0.0")), .package(url: "https://github.com/google/GoogleSignIn-iOS", from: "6.2.2") ] // Comment out following line for macOS build From 177f461499893b26804215669b89f781f1a21fa9 Mon Sep 17 00:00:00 2001 From: Sixten Otto Date: Fri, 17 Feb 2023 12:35:35 -0700 Subject: [PATCH 2/2] don't try to bootstrap Firebase without app ID --- apple/Sources/PushNotificationConfig.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apple/Sources/PushNotificationConfig.swift b/apple/Sources/PushNotificationConfig.swift index bc7b92a4b..71ec6cbf0 100644 --- a/apple/Sources/PushNotificationConfig.swift +++ b/apple/Sources/PushNotificationConfig.swift @@ -15,7 +15,7 @@ extension AppDelegate { return firebaseKeys ?? AppKeys.sharedInstance?.firebaseProdKeys }() - guard let keys = keys else { return } + guard let keys = keys, !keys.googleAppID.isEmpty else { return } let firebaseOpts = FirebaseOptions(googleAppID: keys.googleAppID, gcmSenderID: keys.gcmSenderID)