Skip to content

Commit d63e928

Browse files
brianchang928brianchang928
committed
iOS: Update Firebase
1 parent c5ed3af commit d63e928

File tree

3 files changed

+48
-53
lines changed

3 files changed

+48
-53
lines changed

‎iosApp/OPass.xcodeproj/project.pbxproj‎

Lines changed: 44 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,6 @@
1010
D300355C2C85E31A0049B7B3 /* PortalHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = D300355B2C85E31A0049B7B3 /* PortalHelper.swift */; };
1111
D30235DB2CDC7AA80033D599 /* BlurView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D30235DA2CDC7AA80033D599 /* BlurView.swift */; };
1212
D307A8812C76039D00BB00FB /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = D307A8802C76039D00BB00FB /* GoogleService-Info.plist */; };
13-
D307A8842C76055F00BB00FB /* FirebaseAnalyticsWithoutAdIdSupport in Frameworks */ = {isa = PBXBuildFile; productRef = D307A8832C76055F00BB00FB /* FirebaseAnalyticsWithoutAdIdSupport */; };
14-
D307A8862C76055F00BB00FB /* FirebaseAppCheck in Frameworks */ = {isa = PBXBuildFile; productRef = D307A8852C76055F00BB00FB /* FirebaseAppCheck */; };
15-
D307A8882C76055F00BB00FB /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = D307A8872C76055F00BB00FB /* FirebaseAuth */; };
16-
D307A88A2C76055F00BB00FB /* FirebaseCrashlytics in Frameworks */ = {isa = PBXBuildFile; productRef = D307A8892C76055F00BB00FB /* FirebaseCrashlytics */; };
17-
D307A88C2C76055F00BB00FB /* FirebaseDynamicLinks in Frameworks */ = {isa = PBXBuildFile; productRef = D307A88B2C76055F00BB00FB /* FirebaseDynamicLinks */; };
18-
D307A88E2C76055F00BB00FB /* FirebaseFunctions in Frameworks */ = {isa = PBXBuildFile; productRef = D307A88D2C76055F00BB00FB /* FirebaseFunctions */; };
19-
D307A8902C76055F00BB00FB /* FirebasePerformance in Frameworks */ = {isa = PBXBuildFile; productRef = D307A88F2C76055F00BB00FB /* FirebasePerformance */; };
2013
D307A8932C760F8E00BB00FB /* AppearanceSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D307A8922C760F8E00BB00FB /* AppearanceSettingsView.swift */; };
2114
D34BEECB2C723BC6008F9A4C /* OPassApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = D34BEECA2C723BC6008F9A4C /* OPassApp.swift */; };
2215
D34BEECD2C723BC6008F9A4C /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D34BEECC2C723BC6008F9A4C /* ContentView.swift */; };
@@ -39,6 +32,12 @@
3932
D3BE9CE62E5DAAC70003666A /* SessionDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3BE9CE52E5DAAC70003666A /* SessionDetailView.swift */; };
4033
D3BE9CE82E5DFA780003666A /* Session.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3BE9CE72E5DFA6F0003666A /* Session.swift */; };
4134
D3BE9CEB2E5DFBA20003666A /* SwiftDate in Frameworks */ = {isa = PBXBuildFile; productRef = D3BE9CEA2E5DFBA20003666A /* SwiftDate */; };
35+
D3BE9CF02E5F20AF0003666A /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = D3BE9CEF2E5F20AF0003666A /* FirebaseAnalytics */; };
36+
D3BE9CF22E5F20AF0003666A /* FirebaseAppCheck in Frameworks */ = {isa = PBXBuildFile; productRef = D3BE9CF12E5F20AF0003666A /* FirebaseAppCheck */; };
37+
D3BE9CF42E5F20AF0003666A /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = D3BE9CF32E5F20AF0003666A /* FirebaseAuth */; };
38+
D3BE9CF62E5F20AF0003666A /* FirebaseCrashlytics in Frameworks */ = {isa = PBXBuildFile; productRef = D3BE9CF52E5F20AF0003666A /* FirebaseCrashlytics */; };
39+
D3BE9CF82E5F20AF0003666A /* FirebaseFirestore in Frameworks */ = {isa = PBXBuildFile; productRef = D3BE9CF72E5F20AF0003666A /* FirebaseFirestore */; };
40+
D3BE9CFA2E5F20AF0003666A /* FirebasePerformance in Frameworks */ = {isa = PBXBuildFile; productRef = D3BE9CF92E5F20AF0003666A /* FirebasePerformance */; };
4241
D3C397FE2C73A079002FFD42 /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = D3C397FD2C73A079002FFD42 /* Localizable.xcstrings */; };
4342
D3C398082C73A190002FFD42 /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3C398072C73A190002FFD42 /* NotificationService.swift */; };
4443
D3C3980C2C73A190002FFD42 /* OneSignalNotificationServiceExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = D3C398052C73A190002FFD42 /* OneSignalNotificationServiceExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
@@ -120,17 +119,16 @@
120119
isa = PBXFrameworksBuildPhase;
121120
buildActionMask = 2147483647;
122121
files = (
122+
D3BE9CFA2E5F20AF0003666A /* FirebasePerformance in Frameworks */,
123123
D3C398182C73A327002FFD42 /* OneSignalInAppMessages in Frameworks */,
124-
D307A8882C76055F00BB00FB /* FirebaseAuth in Frameworks */,
125-
D307A8902C76055F00BB00FB /* FirebasePerformance in Frameworks */,
124+
D3BE9CF02E5F20AF0003666A /* FirebaseAnalytics in Frameworks */,
125+
D3BE9CF82E5F20AF0003666A /* FirebaseFirestore in Frameworks */,
126126
D3C3981A2C73A327002FFD42 /* OneSignalLocation in Frameworks */,
127-
D307A88E2C76055F00BB00FB /* FirebaseFunctions in Frameworks */,
128-
D307A88C2C76055F00BB00FB /* FirebaseDynamicLinks in Frameworks */,
129-
D307A88A2C76055F00BB00FB /* FirebaseCrashlytics in Frameworks */,
127+
D3BE9CF22E5F20AF0003666A /* FirebaseAppCheck in Frameworks */,
130128
D3BE9CEB2E5DFBA20003666A /* SwiftDate in Frameworks */,
129+
D3BE9CF62E5F20AF0003666A /* FirebaseCrashlytics in Frameworks */,
131130
D3C398162C73A327002FFD42 /* OneSignalFramework in Frameworks */,
132-
D307A8862C76055F00BB00FB /* FirebaseAppCheck in Frameworks */,
133-
D307A8842C76055F00BB00FB /* FirebaseAnalyticsWithoutAdIdSupport in Frameworks */,
131+
D3BE9CF42E5F20AF0003666A /* FirebaseAuth in Frameworks */,
134132
);
135133
runOnlyForDeploymentPostprocessing = 0;
136134
};
@@ -315,14 +313,13 @@
315313
D3C398152C73A327002FFD42 /* OneSignalFramework */,
316314
D3C398172C73A327002FFD42 /* OneSignalInAppMessages */,
317315
D3C398192C73A327002FFD42 /* OneSignalLocation */,
318-
D307A8832C76055F00BB00FB /* FirebaseAnalyticsWithoutAdIdSupport */,
319-
D307A8852C76055F00BB00FB /* FirebaseAppCheck */,
320-
D307A8872C76055F00BB00FB /* FirebaseAuth */,
321-
D307A8892C76055F00BB00FB /* FirebaseCrashlytics */,
322-
D307A88B2C76055F00BB00FB /* FirebaseDynamicLinks */,
323-
D307A88D2C76055F00BB00FB /* FirebaseFunctions */,
324-
D307A88F2C76055F00BB00FB /* FirebasePerformance */,
325316
D3BE9CEA2E5DFBA20003666A /* SwiftDate */,
317+
D3BE9CEF2E5F20AF0003666A /* FirebaseAnalytics */,
318+
D3BE9CF12E5F20AF0003666A /* FirebaseAppCheck */,
319+
D3BE9CF32E5F20AF0003666A /* FirebaseAuth */,
320+
D3BE9CF52E5F20AF0003666A /* FirebaseCrashlytics */,
321+
D3BE9CF72E5F20AF0003666A /* FirebaseFirestore */,
322+
D3BE9CF92E5F20AF0003666A /* FirebasePerformance */,
326323
);
327324
productName = OPass;
328325
productReference = D34BEEC72C723BC6008F9A4C /* OPass.app */;
@@ -378,8 +375,8 @@
378375
mainGroup = D34BEEBE2C723BC6008F9A4C;
379376
packageReferences = (
380377
D3C398122C73A327002FFD42 /* XCRemoteSwiftPackageReference "OneSignal-XCFramework" */,
381-
D307A8822C76055F00BB00FB /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
382378
D3BE9CE92E5DFBA20003666A /* XCRemoteSwiftPackageReference "SwiftDate" */,
379+
D3BE9CEC2E5F20AF0003666A /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
383380
);
384381
productRefGroup = D34BEEC82C723BC6008F9A4C /* Products */;
385382
projectDirPath = "";
@@ -792,20 +789,20 @@
792789
/* End XCConfigurationList section */
793790

794791
/* Begin XCRemoteSwiftPackageReference section */
795-
D307A8822C76055F00BB00FB /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
792+
D3BE9CE92E5DFBA20003666A /* XCRemoteSwiftPackageReference "SwiftDate" */ = {
796793
isa = XCRemoteSwiftPackageReference;
797-
repositoryURL = "https://github.com/firebase/firebase-ios-sdk";
794+
repositoryURL = "https://github.com/malcommac/SwiftDate";
798795
requirement = {
799796
kind = upToNextMajorVersion;
800-
minimumVersion = 12.1.0;
797+
minimumVersion = 7.0.0;
801798
};
802799
};
803-
D3BE9CE92E5DFBA20003666A /* XCRemoteSwiftPackageReference "SwiftDate" */ = {
800+
D3BE9CEC2E5F20AF0003666A /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
804801
isa = XCRemoteSwiftPackageReference;
805-
repositoryURL = "https://github.com/malcommac/SwiftDate";
802+
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
806803
requirement = {
807804
kind = upToNextMajorVersion;
808-
minimumVersion = 7.0.0;
805+
minimumVersion = 12.1.0;
809806
};
810807
};
811808
D3C398122C73A327002FFD42 /* XCRemoteSwiftPackageReference "OneSignal-XCFramework" */ = {
@@ -819,46 +816,41 @@
819816
/* End XCRemoteSwiftPackageReference section */
820817

821818
/* Begin XCSwiftPackageProductDependency section */
822-
D307A8832C76055F00BB00FB /* FirebaseAnalyticsWithoutAdIdSupport */ = {
819+
D3BE9CEA2E5DFBA20003666A /* SwiftDate */ = {
820+
isa = XCSwiftPackageProductDependency;
821+
package = D3BE9CE92E5DFBA20003666A /* XCRemoteSwiftPackageReference "SwiftDate" */;
822+
productName = SwiftDate;
823+
};
824+
D3BE9CEF2E5F20AF0003666A /* FirebaseAnalytics */ = {
823825
isa = XCSwiftPackageProductDependency;
824-
package = D307A8822C76055F00BB00FB /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
825-
productName = FirebaseAnalyticsWithoutAdIdSupport;
826+
package = D3BE9CEC2E5F20AF0003666A /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
827+
productName = FirebaseAnalytics;
826828
};
827-
D307A8852C76055F00BB00FB /* FirebaseAppCheck */ = {
829+
D3BE9CF12E5F20AF0003666A /* FirebaseAppCheck */ = {
828830
isa = XCSwiftPackageProductDependency;
829-
package = D307A8822C76055F00BB00FB /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
831+
package = D3BE9CEC2E5F20AF0003666A /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
830832
productName = FirebaseAppCheck;
831833
};
832-
D307A8872C76055F00BB00FB /* FirebaseAuth */ = {
834+
D3BE9CF32E5F20AF0003666A /* FirebaseAuth */ = {
833835
isa = XCSwiftPackageProductDependency;
834-
package = D307A8822C76055F00BB00FB /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
836+
package = D3BE9CEC2E5F20AF0003666A /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
835837
productName = FirebaseAuth;
836838
};
837-
D307A8892C76055F00BB00FB /* FirebaseCrashlytics */ = {
839+
D3BE9CF52E5F20AF0003666A /* FirebaseCrashlytics */ = {
838840
isa = XCSwiftPackageProductDependency;
839-
package = D307A8822C76055F00BB00FB /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
841+
package = D3BE9CEC2E5F20AF0003666A /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
840842
productName = FirebaseCrashlytics;
841843
};
842-
D307A88B2C76055F00BB00FB /* FirebaseDynamicLinks */ = {
843-
isa = XCSwiftPackageProductDependency;
844-
package = D307A8822C76055F00BB00FB /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
845-
productName = FirebaseDynamicLinks;
846-
};
847-
D307A88D2C76055F00BB00FB /* FirebaseFunctions */ = {
844+
D3BE9CF72E5F20AF0003666A /* FirebaseFirestore */ = {
848845
isa = XCSwiftPackageProductDependency;
849-
package = D307A8822C76055F00BB00FB /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
850-
productName = FirebaseFunctions;
846+
package = D3BE9CEC2E5F20AF0003666A /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
847+
productName = FirebaseFirestore;
851848
};
852-
D307A88F2C76055F00BB00FB /* FirebasePerformance */ = {
849+
D3BE9CF92E5F20AF0003666A /* FirebasePerformance */ = {
853850
isa = XCSwiftPackageProductDependency;
854-
package = D307A8822C76055F00BB00FB /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
851+
package = D3BE9CEC2E5F20AF0003666A /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
855852
productName = FirebasePerformance;
856853
};
857-
D3BE9CEA2E5DFBA20003666A /* SwiftDate */ = {
858-
isa = XCSwiftPackageProductDependency;
859-
package = D3BE9CE92E5DFBA20003666A /* XCRemoteSwiftPackageReference "SwiftDate" */;
860-
productName = SwiftDate;
861-
};
862854
D3C398132C73A327002FFD42 /* OneSignalExtension */ = {
863855
isa = XCSwiftPackageProductDependency;
864856
package = D3C398122C73A327002FFD42 /* XCRemoteSwiftPackageReference "OneSignal-XCFramework" */;

‎iosApp/OPass.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎iosApp/Supporting Files/Localizable.xcstrings‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@
8585
},
8686
"Haptic Feedback" : {
8787

88+
},
89+
"Hello, World!" : {
90+
8891
},
8992
"Loading" : {
9093
"localizations" : {

0 commit comments

Comments
 (0)