Skip to content

Commit 6d27fcb

Browse files
morganchen12morganchen12
committed
migrate messaging to spm
1 parent 2b72b65 commit 6d27fcb

File tree

5 files changed

+98
-163
lines changed

5 files changed

+98
-163
lines changed

‎messaging/MessagingExample.xcodeproj/project.pbxproj‎

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

99
/* Begin PBXBuildFile section */
@@ -22,6 +22,8 @@
2222
5F99610C1AE0CF4F0034F503 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5F9961071AE0CF4F0034F503 /* LaunchScreen.xib */; };
2323
5F99610D1AE0CF4F0034F503 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5F9961071AE0CF4F0034F503 /* LaunchScreen.xib */; };
2424
5FDE055D1B0DAA090037B82F /* AppTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 5FDE055C1B0DAA090037B82F /* AppTests.m */; };
25+
8DC73D8A2D41AE7E0092B6EE /* FirebaseMessaging in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D892D41AE7E0092B6EE /* FirebaseMessaging */; };
26+
8DC73D8C2D41AE850092B6EE /* FirebaseMessaging in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D8B2D41AE850092B6EE /* FirebaseMessaging */; };
2527
978E6F2CAAC2AD673D158985 /* GoogleService-Info.plist in Sources */ = {isa = PBXBuildFile; fileRef = 82E79B6D15A982EAE7B0E31B /* GoogleService-Info.plist */; };
2628
9EC3C1193ECE4B761399CA62 /* GoogleService-Info.plist in Sources */ = {isa = PBXBuildFile; fileRef = 82E79B6D15A982EAE7B0E31B /* GoogleService-Info.plist */; };
2729
A2448B9D9232B1BAEE1CA86B /* GoogleService-Info.plist in Sources */ = {isa = PBXBuildFile; fileRef = 82E79B6D15A982EAE7B0E31B /* GoogleService-Info.plist */; };
@@ -105,13 +107,15 @@
105107
isa = PBXFrameworksBuildPhase;
106108
buildActionMask = 2147483647;
107109
files = (
110+
8DC73D8A2D41AE7E0092B6EE /* FirebaseMessaging in Frameworks */,
108111
);
109112
runOnlyForDeploymentPostprocessing = 0;
110113
};
111114
5F5A53761ADE67D500F81DF0 /* Frameworks */ = {
112115
isa = PBXFrameworksBuildPhase;
113116
buildActionMask = 2147483647;
114117
files = (
118+
8DC73D8C2D41AE850092B6EE /* FirebaseMessaging in Frameworks */,
115119
);
116120
runOnlyForDeploymentPostprocessing = 0;
117121
};
@@ -155,6 +159,7 @@
155159
5F5A534D1ADE670C00F81DF0 /* Products */,
156160
5F9961041AE0CF4F0034F503 /* Shared */,
157161
82E79B6D15A982EAE7B0E31B /* GoogleService-Info.plist */,
162+
8DC73D882D41AE7E0092B6EE /* Frameworks */,
158163
);
159164
sourceTree = "<group>";
160165
wrapsLines = 0;
@@ -222,6 +227,13 @@
222227
path = MessagingExampleTests;
223228
sourceTree = "<group>";
224229
};
230+
8DC73D882D41AE7E0092B6EE /* Frameworks */ = {
231+
isa = PBXGroup;
232+
children = (
233+
);
234+
name = Frameworks;
235+
sourceTree = "<group>";
236+
};
225237
DEB13BC423AEC9DF0066A6F3 /* TestUtils */ = {
226238
isa = PBXGroup;
227239
children = (
@@ -332,8 +344,9 @@
332344
5F5A53441ADE670C00F81DF0 /* Project object */ = {
333345
isa = PBXProject;
334346
attributes = {
347+
BuildIndependentTargetsInParallel = YES;
335348
LastSwiftUpdateCheck = 0920;
336-
LastUpgradeCheck = 1110;
349+
LastUpgradeCheck = 1610;
337350
ORGANIZATIONNAME = "Google Inc.";
338351
TargetAttributes = {
339352
107347A720315A3A004A66D1 = {
@@ -386,6 +399,9 @@
386399
Base,
387400
);
388401
mainGroup = 5F5A53431ADE670C00F81DF0;
402+
packageReferences = (
403+
8DC73D872D41ADE00092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
404+
);
389405
productRefGroup = 5F5A534D1ADE670C00F81DF0 /* Products */;
390406
projectDirPath = "";
391407
projectRoot = "";
@@ -540,7 +556,11 @@
540556
GCC_C_LANGUAGE_STANDARD = gnu11;
541557
INFOPLIST_FILE = MessagingExampleSwiftUITests/Info.plist;
542558
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
543-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
559+
LD_RUNPATH_SEARCH_PATHS = (
560+
"$(inherited)",
561+
"@executable_path/Frameworks",
562+
"@loader_path/Frameworks",
563+
);
544564
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.MessagingExampleSwiftUITests;
545565
PRODUCT_NAME = "$(TARGET_NAME)";
546566
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
@@ -566,7 +586,11 @@
566586
GCC_C_LANGUAGE_STANDARD = gnu11;
567587
INFOPLIST_FILE = MessagingExampleSwiftUITests/Info.plist;
568588
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
569-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
589+
LD_RUNPATH_SEARCH_PATHS = (
590+
"$(inherited)",
591+
"@executable_path/Frameworks",
592+
"@loader_path/Frameworks",
593+
);
570594
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.MessagingExampleSwiftUITests;
571595
PRODUCT_NAME = "$(TARGET_NAME)";
572596
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
@@ -590,7 +614,11 @@
590614
GCC_C_LANGUAGE_STANDARD = gnu11;
591615
INFOPLIST_FILE = MessagingExampleUITests/Info.plist;
592616
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
593-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
617+
LD_RUNPATH_SEARCH_PATHS = (
618+
"$(inherited)",
619+
"@executable_path/Frameworks",
620+
"@loader_path/Frameworks",
621+
);
594622
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.MessagingExampleUITests;
595623
PRODUCT_NAME = "$(TARGET_NAME)";
596624
TARGETED_DEVICE_FAMILY = "1,2";
@@ -613,7 +641,11 @@
613641
GCC_C_LANGUAGE_STANDARD = gnu11;
614642
INFOPLIST_FILE = MessagingExampleUITests/Info.plist;
615643
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
616-
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+
);
617649
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.MessagingExampleUITests;
618650
PRODUCT_NAME = "$(TARGET_NAME)";
619651
TARGETED_DEVICE_FAMILY = "1,2";
@@ -644,6 +676,7 @@
644676
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
645677
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
646678
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
679+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
647680
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
648681
CLANG_WARN_STRICT_PROTOTYPES = YES;
649682
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -654,6 +687,7 @@
654687
ENABLE_BITCODE = NO;
655688
ENABLE_STRICT_OBJC_MSGSEND = YES;
656689
ENABLE_TESTABILITY = YES;
690+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
657691
GCC_C_LANGUAGE_STANDARD = gnu99;
658692
GCC_DYNAMIC_NO_PIC = NO;
659693
GCC_NO_COMMON_BLOCKS = YES;
@@ -701,6 +735,7 @@
701735
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
702736
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
703737
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
738+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
704739
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
705740
CLANG_WARN_STRICT_PROTOTYPES = YES;
706741
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -711,6 +746,7 @@
711746
ENABLE_BITCODE = NO;
712747
ENABLE_NS_ASSERTIONS = NO;
713748
ENABLE_STRICT_OBJC_MSGSEND = YES;
749+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
714750
GCC_C_LANGUAGE_STANDARD = gnu99;
715751
GCC_NO_COMMON_BLOCKS = YES;
716752
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -722,7 +758,8 @@
722758
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
723759
MTL_ENABLE_DEBUG_INFO = NO;
724760
SDKROOT = iphoneos;
725-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
761+
SWIFT_COMPILATION_MODE = wholemodule;
762+
SWIFT_OPTIMIZATION_LEVEL = "-O";
726763
TARGETED_DEVICE_FAMILY = "1,2";
727764
VALIDATE_PRODUCT = YES;
728765
};
@@ -739,7 +776,10 @@
739776
DEVELOPMENT_TEAM = "";
740777
ENABLE_BITCODE = NO;
741778
INFOPLIST_FILE = MessagingExample/Info.plist;
742-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
779+
LD_RUNPATH_SEARCH_PATHS = (
780+
"$(inherited)",
781+
"@executable_path/Frameworks",
782+
);
743783
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.MessagingExample;
744784
PRODUCT_NAME = "$(TARGET_NAME)";
745785
PROVISIONING_PROFILE = "";
@@ -757,7 +797,10 @@
757797
DEVELOPMENT_TEAM = "";
758798
ENABLE_BITCODE = NO;
759799
INFOPLIST_FILE = MessagingExample/Info.plist;
760-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
800+
LD_RUNPATH_SEARCH_PATHS = (
801+
"$(inherited)",
802+
"@executable_path/Frameworks",
803+
);
761804
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.MessagingExample;
762805
PRODUCT_NAME = "$(TARGET_NAME)";
763806
PROVISIONING_PROFILE = "";
@@ -774,7 +817,10 @@
774817
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
775818
DEVELOPMENT_TEAM = "";
776819
INFOPLIST_FILE = MessagingExample/Info.plist;
777-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
820+
LD_RUNPATH_SEARCH_PATHS = (
821+
"$(inherited)",
822+
"@executable_path/Frameworks",
823+
);
778824
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.MessagingExample;
779825
PRODUCT_NAME = "$(TARGET_NAME)";
780826
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
@@ -792,10 +838,14 @@
792838
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
793839
DEVELOPMENT_TEAM = "";
794840
INFOPLIST_FILE = MessagingExample/Info.plist;
795-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
841+
LD_RUNPATH_SEARCH_PATHS = (
842+
"$(inherited)",
843+
"@executable_path/Frameworks",
844+
);
796845
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.MessagingExample;
797846
PRODUCT_NAME = "$(TARGET_NAME)";
798-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
847+
SWIFT_COMPILATION_MODE = wholemodule;
848+
SWIFT_OPTIMIZATION_LEVEL = "-O";
799849
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
800850
SWIFT_VERSION = 5.0;
801851
};
@@ -811,7 +861,11 @@
811861
"$(inherited)",
812862
);
813863
INFOPLIST_FILE = MessagingExample/Info.plist;
814-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
864+
LD_RUNPATH_SEARCH_PATHS = (
865+
"$(inherited)",
866+
"@executable_path/Frameworks",
867+
"@loader_path/Frameworks",
868+
);
815869
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.MessagingExampleTests;
816870
PRODUCT_NAME = "$(TARGET_NAME)";
817871
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MessagingExample.app/MessagingExample";
@@ -825,7 +879,11 @@
825879
COPY_PHASE_STRIP = NO;
826880
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
827881
INFOPLIST_FILE = MessagingExample/Info.plist;
828-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
882+
LD_RUNPATH_SEARCH_PATHS = (
883+
"$(inherited)",
884+
"@executable_path/Frameworks",
885+
"@loader_path/Frameworks",
886+
);
829887
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.quickstart.MessagingExampleTests;
830888
PRODUCT_NAME = "$(TARGET_NAME)";
831889
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MessagingExample.app/MessagingExample";
@@ -890,6 +948,30 @@
890948
defaultConfigurationName = Release;
891949
};
892950
/* End XCConfigurationList section */
951+
952+
/* Begin XCRemoteSwiftPackageReference section */
953+
8DC73D872D41ADE00092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
954+
isa = XCRemoteSwiftPackageReference;
955+
repositoryURL = "https://github.com/firebase/firebase-ios-sdk";
956+
requirement = {
957+
kind = upToNextMajorVersion;
958+
minimumVersion = 11.7.0;
959+
};
960+
};
961+
/* End XCRemoteSwiftPackageReference section */
962+
963+
/* Begin XCSwiftPackageProductDependency section */
964+
8DC73D892D41AE7E0092B6EE /* FirebaseMessaging */ = {
965+
isa = XCSwiftPackageProductDependency;
966+
package = 8DC73D872D41ADE00092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
967+
productName = FirebaseMessaging;
968+
};
969+
8DC73D8B2D41AE850092B6EE /* FirebaseMessaging */ = {
970+
isa = XCSwiftPackageProductDependency;
971+
package = 8DC73D872D41ADE00092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
972+
productName = FirebaseMessaging;
973+
};
974+
/* End XCSwiftPackageProductDependency section */
893975
};
894976
rootObject = 5F5A53441ADE670C00F81DF0 /* Project object */;
895977
}

‎messaging/MessagingExample.xcodeproj/xcshareddata/xcschemes/MessagingExample.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1110"
3+
LastUpgradeVersion = "1610"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎messaging/MessagingExample.xcodeproj/xcshareddata/xcschemes/MessagingExampleSwift.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1110"
3+
LastUpgradeVersion = "1610"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎messaging/Podfile‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)