Skip to content

Commit 2b72b65

Browse files
morganchen12morganchen12
committed
migrate installations to spm and remove todos
1 parent af5b0c8 commit 2b72b65

File tree

5 files changed

+46
-74
lines changed

5 files changed

+46
-74
lines changed

‎installations/InstallationsExample.xcodeproj/project.pbxproj

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

99
/* Begin PBXBuildFile section */
1010
1D96FE8F5661BCC40ADE48D3 /* GoogleService-Info.plist in Sources */ = {isa = PBXBuildFile; fileRef = AF38C66CDB0155B6F2BDE0FD /* GoogleService-Info.plist */; };
1111
7AB7C66CB639531B714014CA /* GoogleService-Info.plist in Sources */ = {isa = PBXBuildFile; fileRef = AF38C66CDB0155B6F2BDE0FD /* GoogleService-Info.plist */; };
12+
8DC73D842D41ABC00092B6EE /* FirebaseInstallations in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D832D41ABC00092B6EE /* FirebaseInstallations */; };
13+
8DC73D862D41ACB30092B6EE /* FirebaseInstallations in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D852D41ACB30092B6EE /* FirebaseInstallations */; };
1214
9A0A6EE922CE55B2004CF0FF /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A0A6EE822CE55B2004CF0FF /* AppDelegate.swift */; };
1315
9A0A6EEB22CE55B2004CF0FF /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A0A6EEA22CE55B2004CF0FF /* ViewController.swift */; };
1416
9A0A6EEE22CE55B2004CF0FF /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9A0A6EEC22CE55B2004CF0FF /* Main.storyboard */; };
@@ -73,13 +75,15 @@
7375
isa = PBXFrameworksBuildPhase;
7476
buildActionMask = 2147483647;
7577
files = (
78+
8DC73D842D41ABC00092B6EE /* FirebaseInstallations in Frameworks */,
7679
);
7780
runOnlyForDeploymentPostprocessing = 0;
7881
};
7982
9A44BF5922CE72B60039A7EE /* Frameworks */ = {
8083
isa = PBXFrameworksBuildPhase;
8184
buildActionMask = 2147483647;
8285
files = (
86+
8DC73D862D41ACB30092B6EE /* FirebaseInstallations in Frameworks */,
8387
);
8488
runOnlyForDeploymentPostprocessing = 0;
8589
};
@@ -100,6 +104,13 @@
100104
/* End PBXFrameworksBuildPhase section */
101105

102106
/* Begin PBXGroup section */
107+
8DC73D822D41ABC00092B6EE /* Frameworks */ = {
108+
isa = PBXGroup;
109+
children = (
110+
);
111+
name = Frameworks;
112+
sourceTree = "<group>";
113+
};
103114
9A0A6EDC22CE55B2004CF0FF = {
104115
isa = PBXGroup;
105116
children = (
@@ -109,8 +120,8 @@
109120
9A76AE2F22E20A0C0024E473 /* InstallationsExampleSwiftTests */,
110121
9A76AE3D22E20A240024E473 /* InstallationsExampleTests */,
111122
9A0A6EE622CE55B2004CF0FF /* Products */,
112-
F47D9EFBA47214D7699A8C26 /* Pods */,
113123
AF38C66CDB0155B6F2BDE0FD /* GoogleService-Info.plist */,
124+
8DC73D822D41ABC00092B6EE /* Frameworks */,
114125
);
115126
sourceTree = "<group>";
116127
};
@@ -178,13 +189,6 @@
178189
path = InstallationsExampleTests;
179190
sourceTree = "<group>";
180191
};
181-
F47D9EFBA47214D7699A8C26 /* Pods */ = {
182-
isa = PBXGroup;
183-
children = (
184-
);
185-
path = Pods;
186-
sourceTree = "<group>";
187-
};
188192
/* End PBXGroup section */
189193

190194
/* Begin PBXNativeTarget section */
@@ -264,8 +268,9 @@
264268
9A0A6EDD22CE55B2004CF0FF /* Project object */ = {
265269
isa = PBXProject;
266270
attributes = {
271+
BuildIndependentTargetsInParallel = YES;
267272
LastSwiftUpdateCheck = 1020;
268-
LastUpgradeCheck = 1020;
273+
LastUpgradeCheck = 1610;
269274
ORGANIZATIONNAME = "Google Inc.";
270275
TargetAttributes = {
271276
9A0A6EE422CE55B2004CF0FF = {
@@ -294,6 +299,9 @@
294299
Base,
295300
);
296301
mainGroup = 9A0A6EDC22CE55B2004CF0FF;
302+
packageReferences = (
303+
8DC73D812D41ABB70092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
304+
);
297305
productRefGroup = 9A0A6EE622CE55B2004CF0FF /* Products */;
298306
projectDirPath = "";
299307
projectRoot = "";
@@ -444,6 +452,7 @@
444452
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
445453
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
446454
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
455+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
447456
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
448457
CLANG_WARN_STRICT_PROTOTYPES = YES;
449458
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -455,6 +464,7 @@
455464
DEBUG_INFORMATION_FORMAT = dwarf;
456465
ENABLE_STRICT_OBJC_MSGSEND = YES;
457466
ENABLE_TESTABILITY = YES;
467+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
458468
GCC_C_LANGUAGE_STANDARD = gnu11;
459469
GCC_DYNAMIC_NO_PIC = NO;
460470
GCC_NO_COMMON_BLOCKS = YES;
@@ -505,6 +515,7 @@
505515
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
506516
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
507517
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
518+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
508519
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
509520
CLANG_WARN_STRICT_PROTOTYPES = YES;
510521
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -516,6 +527,7 @@
516527
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
517528
ENABLE_NS_ASSERTIONS = NO;
518529
ENABLE_STRICT_OBJC_MSGSEND = YES;
530+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
519531
GCC_C_LANGUAGE_STANDARD = gnu11;
520532
GCC_NO_COMMON_BLOCKS = YES;
521533
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -603,7 +615,6 @@
603615
9A76AE3522E20A0C0024E473 /* Debug */ = {
604616
isa = XCBuildConfiguration;
605617
buildSettings = {
606-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
607618
BUNDLE_LOADER = "$(TEST_HOST)";
608619
CODE_SIGN_STYLE = Automatic;
609620
INFOPLIST_FILE = InstallationsExampleSwiftTests/Info.plist;
@@ -622,7 +633,6 @@
622633
9A76AE3622E20A0C0024E473 /* Release */ = {
623634
isa = XCBuildConfiguration;
624635
buildSettings = {
625-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
626636
BUNDLE_LOADER = "$(TEST_HOST)";
627637
CODE_SIGN_STYLE = Automatic;
628638
INFOPLIST_FILE = InstallationsExampleSwiftTests/Info.plist;
@@ -723,6 +733,30 @@
723733
defaultConfigurationName = Release;
724734
};
725735
/* End XCConfigurationList section */
736+
737+
/* Begin XCRemoteSwiftPackageReference section */
738+
8DC73D812D41ABB70092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
739+
isa = XCRemoteSwiftPackageReference;
740+
repositoryURL = "https://github.com/firebase/firebase-ios-sdk";
741+
requirement = {
742+
kind = upToNextMajorVersion;
743+
minimumVersion = 11.7.0;
744+
};
745+
};
746+
/* End XCRemoteSwiftPackageReference section */
747+
748+
/* Begin XCSwiftPackageProductDependency section */
749+
8DC73D832D41ABC00092B6EE /* FirebaseInstallations */ = {
750+
isa = XCSwiftPackageProductDependency;
751+
package = 8DC73D812D41ABB70092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
752+
productName = FirebaseInstallations;
753+
};
754+
8DC73D852D41ACB30092B6EE /* FirebaseInstallations */ = {
755+
isa = XCSwiftPackageProductDependency;
756+
package = 8DC73D812D41ABB70092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
757+
productName = FirebaseInstallations;
758+
};
759+
/* End XCSwiftPackageProductDependency section */
726760
};
727761
rootObject = 9A0A6EDD22CE55B2004CF0FF /* Project object */;
728762
}

‎installations/InstallationsExample/AppDelegate.m

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
#import "AppDelegate.h"
1818

19-
// TODO: Remove once FirebaseInstallations has released.
20-
#import <FirebaseInstallations/FIRInstallations.h>
2119
@import FirebaseCore;
2220

2321
@interface AppDelegate ()

‎installations/InstallationsExample/ViewController.m

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616

1717
#import "ViewController.h"
1818

19-
// TODO(M61): Remove once `Firebase/Installations` released.
20-
#import <FirebaseInstallations/FIRInstallations.h>
21-
#import <FirebaseInstallations/FIRInstallationsAuthTokenResult.h>
22-
2319
@import FirebaseInstallations;
2420

2521
@interface ViewController ()

‎installations/Podfile

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

‎installations/Podfile.lock

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

0 commit comments

Comments
 (0)