Skip to content

Commit 73678e3

Browse files
morganchen12morganchen12
committed
migrate Firestore sample to spm
1 parent ec46631 commit 73678e3

File tree

7 files changed

+156
-1458
lines changed

7 files changed

+156
-1458
lines changed

‎firestore/FirestoreExample.xcodeproj/project.pbxproj

Lines changed: 142 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 77;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -19,6 +19,13 @@
1919
8D9BBC381EE2200900194E9A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8D9BBC371EE2200900194E9A /* Assets.xcassets */; };
2020
8D9BBC3B1EE2200900194E9A /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8D9BBC391EE2200900194E9A /* LaunchScreen.storyboard */; };
2121
8D9BBC461EE2200900194E9A /* FirestoreExampleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D9BBC451EE2200900194E9A /* FirestoreExampleTests.swift */; };
22+
8DC73D692D41A3AD0092B6EE /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D682D41A3AD0092B6EE /* FirebaseAuth */; };
23+
8DC73D6B2D41A3AD0092B6EE /* FirebaseFirestore in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D6A2D41A3AD0092B6EE /* FirebaseFirestore */; };
24+
8DC73D6D2D41A3B60092B6EE /* FirebaseAuthUI in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D6C2D41A3B60092B6EE /* FirebaseAuthUI */; };
25+
8DC73D6F2D41A3B60092B6EE /* FirebaseEmailAuthUI in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D6E2D41A3B60092B6EE /* FirebaseEmailAuthUI */; };
26+
8DC73D722D41A4330092B6EE /* SDWebImage in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D712D41A4330092B6EE /* SDWebImage */; };
27+
8DC73D742D41A5BF0092B6EE /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D732D41A5BF0092B6EE /* FirebaseAuth */; };
28+
8DC73D762D41A5BF0092B6EE /* FirebaseFirestore in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D752D41A5BF0092B6EE /* FirebaseFirestore */; };
2229
8DD9ACDA1F7B166900C2DD24 /* pizza-monster.png in Resources */ = {isa = PBXBuildFile; fileRef = 8DD9ACD91F7B166900C2DD24 /* pizza-monster.png */; };
2330
8DF1E3131EE5CFF900192CDE /* Restaurant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DF1E3121EE5CFF900192CDE /* Restaurant.swift */; };
2431
8DF1E3151EE72C4600192CDE /* LocalCollection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DF1E3141EE72C4600192CDE /* LocalCollection.swift */; };
@@ -134,6 +141,11 @@
134141
isa = PBXFrameworksBuildPhase;
135142
buildActionMask = 2147483647;
136143
files = (
144+
8DC73D6F2D41A3B60092B6EE /* FirebaseEmailAuthUI in Frameworks */,
145+
8DC73D692D41A3AD0092B6EE /* FirebaseAuth in Frameworks */,
146+
8DC73D6D2D41A3B60092B6EE /* FirebaseAuthUI in Frameworks */,
147+
8DC73D6B2D41A3AD0092B6EE /* FirebaseFirestore in Frameworks */,
148+
8DC73D722D41A4330092B6EE /* SDWebImage in Frameworks */,
137149
);
138150
runOnlyForDeploymentPostprocessing = 0;
139151
};
@@ -148,6 +160,8 @@
148160
isa = PBXFrameworksBuildPhase;
149161
buildActionMask = 2147483647;
150162
files = (
163+
8DC73D742D41A5BF0092B6EE /* FirebaseAuth in Frameworks */,
164+
8DC73D762D41A5BF0092B6EE /* FirebaseFirestore in Frameworks */,
151165
);
152166
runOnlyForDeploymentPostprocessing = 0;
153167
};
@@ -175,6 +189,7 @@
175189
8E4C62CF25E9CFE0001678A1 /* FirestoreSwiftUIExample */,
176190
8D9BBC2E1EE2200900194E9A /* Products */,
177191
6AA80A371E484FE3095D24C4 /* GoogleService-Info.plist */,
192+
8DC73D672D41A3AD0092B6EE /* Frameworks */,
178193
);
179194
sourceTree = "<group>";
180195
};
@@ -219,6 +234,13 @@
219234
path = FirestoreExampleTests;
220235
sourceTree = "<group>";
221236
};
237+
8DC73D672D41A3AD0092B6EE /* Frameworks */ = {
238+
isa = PBXGroup;
239+
children = (
240+
);
241+
name = Frameworks;
242+
sourceTree = "<group>";
243+
};
222244
8E1E43AB25F9604B00BC64D3 /* Extensions */ = {
223245
isa = PBXGroup;
224246
children = (
@@ -379,8 +401,9 @@
379401
8D9BBC251EE2200800194E9A /* Project object */ = {
380402
isa = PBXProject;
381403
attributes = {
404+
BuildIndependentTargetsInParallel = YES;
382405
LastSwiftUpdateCheck = 1230;
383-
LastUpgradeCheck = 1020;
406+
LastUpgradeCheck = 1610;
384407
ORGANIZATIONNAME = Firebase;
385408
TargetAttributes = {
386409
1073476F203159E3004A66D1 = {
@@ -407,14 +430,19 @@
407430
};
408431
};
409432
buildConfigurationList = 8D9BBC281EE2200800194E9A /* Build configuration list for PBXProject "FirestoreExample" */;
410-
compatibilityVersion = "Xcode 3.2";
411433
developmentRegion = en;
412434
hasScannedForEncodings = 0;
413435
knownRegions = (
414436
en,
415437
Base,
416438
);
417439
mainGroup = 8D9BBC241EE2200800194E9A;
440+
packageReferences = (
441+
8DC73D652D41A3040092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
442+
8DC73D662D41A3410092B6EE /* XCRemoteSwiftPackageReference "FirebaseUI-iOS" */,
443+
8DC73D702D41A42A0092B6EE /* XCRemoteSwiftPackageReference "SDWebImage" */,
444+
);
445+
preferredProjectObjectVersion = 77;
418446
productRefGroup = 8D9BBC2E1EE2200900194E9A /* Products */;
419447
projectDirPath = "";
420448
projectRoot = "";
@@ -581,7 +609,11 @@
581609
GCC_C_LANGUAGE_STANDARD = gnu11;
582610
INFOPLIST_FILE = FirestoreExampleUITests/Info.plist;
583611
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
584-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
612+
LD_RUNPATH_SEARCH_PATHS = (
613+
"$(inherited)",
614+
"@executable_path/Frameworks",
615+
"@loader_path/Frameworks",
616+
);
585617
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.FirestoreExampleUITests;
586618
PRODUCT_NAME = "$(TARGET_NAME)";
587619
SWIFT_OBJC_BRIDGING_HEADER = "FirestoreExampleUITests/FirestoreExampleUITests-Bridging-Header.h";
@@ -609,7 +641,11 @@
609641
GCC_C_LANGUAGE_STANDARD = gnu11;
610642
INFOPLIST_FILE = FirestoreExampleUITests/Info.plist;
611643
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
612-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
644+
LD_RUNPATH_SEARCH_PATHS = (
645+
"$(inherited)",
646+
"@executable_path/Frameworks",
647+
"@loader_path/Frameworks",
648+
);
613649
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.FirestoreExampleUITests;
614650
PRODUCT_NAME = "$(TARGET_NAME)";
615651
SWIFT_OBJC_BRIDGING_HEADER = "FirestoreExampleUITests/FirestoreExampleUITests-Bridging-Header.h";
@@ -645,6 +681,7 @@
645681
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
646682
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
647683
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
684+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
648685
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
649686
CLANG_WARN_STRICT_PROTOTYPES = YES;
650687
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -655,6 +692,7 @@
655692
DEBUG_INFORMATION_FORMAT = dwarf;
656693
ENABLE_STRICT_OBJC_MSGSEND = YES;
657694
ENABLE_TESTABILITY = YES;
695+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
658696
GCC_C_LANGUAGE_STANDARD = gnu99;
659697
GCC_DYNAMIC_NO_PIC = NO;
660698
GCC_NO_COMMON_BLOCKS = YES;
@@ -669,7 +707,7 @@
669707
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
670708
GCC_WARN_UNUSED_FUNCTION = YES;
671709
GCC_WARN_UNUSED_VARIABLE = YES;
672-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
710+
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
673711
MTL_ENABLE_DEBUG_INFO = YES;
674712
ONLY_ACTIVE_ARCH = YES;
675713
SDKROOT = iphoneos;
@@ -705,6 +743,7 @@
705743
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
706744
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
707745
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
746+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
708747
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
709748
CLANG_WARN_STRICT_PROTOTYPES = YES;
710749
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -715,6 +754,7 @@
715754
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
716755
ENABLE_NS_ASSERTIONS = NO;
717756
ENABLE_STRICT_OBJC_MSGSEND = YES;
757+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
718758
GCC_C_LANGUAGE_STANDARD = gnu99;
719759
GCC_NO_COMMON_BLOCKS = YES;
720760
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -723,10 +763,11 @@
723763
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
724764
GCC_WARN_UNUSED_FUNCTION = YES;
725765
GCC_WARN_UNUSED_VARIABLE = YES;
726-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
766+
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
727767
MTL_ENABLE_DEBUG_INFO = NO;
728768
SDKROOT = iphoneos;
729-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
769+
SWIFT_COMPILATION_MODE = wholemodule;
770+
SWIFT_OPTIMIZATION_LEVEL = "-O";
730771
TARGETED_DEVICE_FAMILY = "1,2";
731772
VALIDATE_PRODUCT = YES;
732773
};
@@ -740,7 +781,10 @@
740781
CODE_SIGN_STYLE = Automatic;
741782
DEVELOPMENT_TEAM = "";
742783
INFOPLIST_FILE = "$(SRCROOT)/FirestoreExample/Info.plist";
743-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
784+
LD_RUNPATH_SEARCH_PATHS = (
785+
"$(inherited)",
786+
"@executable_path/Frameworks",
787+
);
744788
OTHER_LDFLAGS = "$(inherited)";
745789
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirestoreExample;
746790
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -758,7 +802,10 @@
758802
CODE_SIGN_STYLE = Automatic;
759803
DEVELOPMENT_TEAM = "";
760804
INFOPLIST_FILE = "$(SRCROOT)/FirestoreExample/Info.plist";
761-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
805+
LD_RUNPATH_SEARCH_PATHS = (
806+
"$(inherited)",
807+
"@executable_path/Frameworks",
808+
);
762809
OTHER_LDFLAGS = "$(inherited)";
763810
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirestoreExample;
764811
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -770,10 +817,13 @@
770817
8D9BBC4E1EE2200900194E9A /* Debug */ = {
771818
isa = XCBuildConfiguration;
772819
buildSettings = {
773-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
774820
BUNDLE_LOADER = "$(TEST_HOST)";
775821
INFOPLIST_FILE = FirestoreExampleTests/Info.plist;
776-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
822+
LD_RUNPATH_SEARCH_PATHS = (
823+
"$(inherited)",
824+
"@executable_path/Frameworks",
825+
"@loader_path/Frameworks",
826+
);
777827
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirestoreExampleTests;
778828
PRODUCT_NAME = "$(TARGET_NAME)";
779829
SWIFT_VERSION = 5.0;
@@ -784,10 +834,13 @@
784834
8D9BBC4F1EE2200900194E9A /* Release */ = {
785835
isa = XCBuildConfiguration;
786836
buildSettings = {
787-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
788837
BUNDLE_LOADER = "$(TEST_HOST)";
789838
INFOPLIST_FILE = FirestoreExampleTests/Info.plist;
790-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
839+
LD_RUNPATH_SEARCH_PATHS = (
840+
"$(inherited)",
841+
"@executable_path/Frameworks",
842+
"@loader_path/Frameworks",
843+
);
791844
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirestoreExampleTests;
792845
PRODUCT_NAME = "$(TARGET_NAME)";
793846
SWIFT_VERSION = 5.0;
@@ -808,8 +861,11 @@
808861
ENABLE_PREVIEWS = YES;
809862
GCC_C_LANGUAGE_STANDARD = gnu11;
810863
INFOPLIST_FILE = FirestoreSwiftUIExample/Info.plist;
811-
IPHONEOS_DEPLOYMENT_TARGET = 14.3;
812-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
864+
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
865+
LD_RUNPATH_SEARCH_PATHS = (
866+
"$(inherited)",
867+
"@executable_path/Frameworks",
868+
);
813869
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
814870
MTL_FAST_MATH = YES;
815871
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirestoreSwiftUIExample;
@@ -832,8 +888,11 @@
832888
ENABLE_PREVIEWS = YES;
833889
GCC_C_LANGUAGE_STANDARD = gnu11;
834890
INFOPLIST_FILE = FirestoreSwiftUIExample/Info.plist;
835-
IPHONEOS_DEPLOYMENT_TARGET = 14.3;
836-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
891+
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
892+
LD_RUNPATH_SEARCH_PATHS = (
893+
"$(inherited)",
894+
"@executable_path/Frameworks",
895+
);
837896
MTL_FAST_MATH = YES;
838897
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirestoreSwiftUIExample;
839898
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -891,6 +950,71 @@
891950
defaultConfigurationName = Release;
892951
};
893952
/* End XCConfigurationList section */
953+
954+
/* Begin XCRemoteSwiftPackageReference section */
955+
8DC73D652D41A3040092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
956+
isa = XCRemoteSwiftPackageReference;
957+
repositoryURL = "https://github.com/firebase/firebase-ios-sdk";
958+
requirement = {
959+
kind = upToNextMajorVersion;
960+
minimumVersion = 11.7.0;
961+
};
962+
};
963+
8DC73D662D41A3410092B6EE /* XCRemoteSwiftPackageReference "FirebaseUI-iOS" */ = {
964+
isa = XCRemoteSwiftPackageReference;
965+
repositoryURL = "https://github.com/firebase/FirebaseUI-iOS";
966+
requirement = {
967+
kind = upToNextMajorVersion;
968+
minimumVersion = 15.0.0;
969+
};
970+
};
971+
8DC73D702D41A42A0092B6EE /* XCRemoteSwiftPackageReference "SDWebImage" */ = {
972+
isa = XCRemoteSwiftPackageReference;
973+
repositoryURL = "https://github.com/SDWebImage/SDWebImage.git";
974+
requirement = {
975+
kind = upToNextMajorVersion;
976+
minimumVersion = 5.20.0;
977+
};
978+
};
979+
/* End XCRemoteSwiftPackageReference section */
980+
981+
/* Begin XCSwiftPackageProductDependency section */
982+
8DC73D682D41A3AD0092B6EE /* FirebaseAuth */ = {
983+
isa = XCSwiftPackageProductDependency;
984+
package = 8DC73D652D41A3040092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
985+
productName = FirebaseAuth;
986+
};
987+
8DC73D6A2D41A3AD0092B6EE /* FirebaseFirestore */ = {
988+
isa = XCSwiftPackageProductDependency;
989+
package = 8DC73D652D41A3040092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
990+
productName = FirebaseFirestore;
991+
};
992+
8DC73D6C2D41A3B60092B6EE /* FirebaseAuthUI */ = {
993+
isa = XCSwiftPackageProductDependency;
994+
package = 8DC73D662D41A3410092B6EE /* XCRemoteSwiftPackageReference "FirebaseUI-iOS" */;
995+
productName = FirebaseAuthUI;
996+
};
997+
8DC73D6E2D41A3B60092B6EE /* FirebaseEmailAuthUI */ = {
998+
isa = XCSwiftPackageProductDependency;
999+
package = 8DC73D662D41A3410092B6EE /* XCRemoteSwiftPackageReference "FirebaseUI-iOS" */;
1000+
productName = FirebaseEmailAuthUI;
1001+
};
1002+
8DC73D712D41A4330092B6EE /* SDWebImage */ = {
1003+
isa = XCSwiftPackageProductDependency;
1004+
package = 8DC73D702D41A42A0092B6EE /* XCRemoteSwiftPackageReference "SDWebImage" */;
1005+
productName = SDWebImage;
1006+
};
1007+
8DC73D732D41A5BF0092B6EE /* FirebaseAuth */ = {
1008+
isa = XCSwiftPackageProductDependency;
1009+
package = 8DC73D652D41A3040092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
1010+
productName = FirebaseAuth;
1011+
};
1012+
8DC73D752D41A5BF0092B6EE /* FirebaseFirestore */ = {
1013+
isa = XCSwiftPackageProductDependency;
1014+
package = 8DC73D652D41A3040092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
1015+
productName = FirebaseFirestore;
1016+
};
1017+
/* End XCSwiftPackageProductDependency section */
8941018
};
8951019
rootObject = 8D9BBC251EE2200800194E9A /* Project object */;
8961020
}

‎firestore/FirestoreExample.xcodeproj/xcshareddata/xcschemes/FirestoreExample.xcscheme

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1610"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<MacroExpansion>
31+
<BuildableReference
32+
BuildableIdentifier = "primary"
33+
BlueprintIdentifier = "8D9BBC2C1EE2200900194E9A"
34+
BuildableName = "FirestoreExample.app"
35+
BlueprintName = "FirestoreExample"
36+
ReferencedContainer = "container:FirestoreExample.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -49,17 +58,6 @@
4958
</BuildableReference>
5059
</TestableReference>
5160
</Testables>
52-
<MacroExpansion>
53-
<BuildableReference
54-
BuildableIdentifier = "primary"
55-
BlueprintIdentifier = "8D9BBC2C1EE2200900194E9A"
56-
BuildableName = "FirestoreExample.app"
57-
BlueprintName = "FirestoreExample"
58-
ReferencedContainer = "container:FirestoreExample.xcodeproj">
59-
</BuildableReference>
60-
</MacroExpansion>
61-
<AdditionalOptions>
62-
</AdditionalOptions>
6361
</TestAction>
6462
<LaunchAction
6563
buildConfiguration = "Debug"
@@ -81,8 +79,6 @@
8179
ReferencedContainer = "container:FirestoreExample.xcodeproj">
8280
</BuildableReference>
8381
</BuildableProductRunnable>
84-
<AdditionalOptions>
85-
</AdditionalOptions>
8682
</LaunchAction>
8783
<ProfileAction
8884
buildConfiguration = "Release"

0 commit comments

Comments
 (0)