Skip to content

Commit a2f525d

Browse files
morganchen12morganchen12
committed
migrate firoptions example
1 parent 6d45bb3 commit a2f525d

File tree

4 files changed

+91
-176
lines changed

4 files changed

+91
-176
lines changed

‎firoptions/FiroptionConfiguration.xcodeproj/project.pbxproj‎

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

99
/* Begin PBXBuildFile section */
10+
8D7951AC2D28AF88000FD694 /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = 8D7951AB2D28AF88000FD694 /* FirebaseAnalytics */; };
11+
8D7951AE2D28AF88000FD694 /* FirebaseCore in Frameworks */ = {isa = PBXBuildFile; productRef = 8D7951AD2D28AF88000FD694 /* FirebaseCore */; };
12+
8D7951B02D28AF88000FD694 /* FirebaseDatabase in Frameworks */ = {isa = PBXBuildFile; productRef = 8D7951AF2D28AF88000FD694 /* FirebaseDatabase */; };
13+
8D7951B22D28AFF4000FD694 /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = 8D7951B12D28AFF4000FD694 /* FirebaseAnalytics */; };
14+
8D7951B42D28AFF4000FD694 /* FirebaseCore in Frameworks */ = {isa = PBXBuildFile; productRef = 8D7951B32D28AFF4000FD694 /* FirebaseCore */; };
15+
8D7951B62D28B003000FD694 /* FirebaseDatabase in Frameworks */ = {isa = PBXBuildFile; productRef = 8D7951B52D28B003000FD694 /* FirebaseDatabase */; };
1016
8DFC20162410844B004392AD /* AnalyticsHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DFC20152410844B004392AD /* AnalyticsHelper.m */; };
1117
A19F764427EDED14002DE108 /* ISImpressionData.m in Sources */ = {isa = PBXBuildFile; fileRef = A19F764027EDED14002DE108 /* ISImpressionData.m */; };
1218
A19F764527EDED14002DE108 /* MAAd.m in Sources */ = {isa = PBXBuildFile; fileRef = A19F764327EDED14002DE108 /* MAAd.m */; };
@@ -51,33 +57,39 @@
5157
isa = PBXFrameworksBuildPhase;
5258
buildActionMask = 2147483647;
5359
files = (
60+
8D7951B02D28AF88000FD694 /* FirebaseDatabase in Frameworks */,
61+
8D7951AE2D28AF88000FD694 /* FirebaseCore in Frameworks */,
62+
8D7951AC2D28AF88000FD694 /* FirebaseAnalytics in Frameworks */,
5463
);
5564
runOnlyForDeploymentPostprocessing = 0;
5665
};
5766
EFEC9D751E01C6560021BDF9 /* Frameworks */ = {
5867
isa = PBXFrameworksBuildPhase;
5968
buildActionMask = 2147483647;
6069
files = (
70+
8D7951B62D28B003000FD694 /* FirebaseDatabase in Frameworks */,
71+
8D7951B42D28AFF4000FD694 /* FirebaseCore in Frameworks */,
72+
8D7951B22D28AFF4000FD694 /* FirebaseAnalytics in Frameworks */,
6173
);
6274
runOnlyForDeploymentPostprocessing = 0;
6375
};
6476
/* End PBXFrameworksBuildPhase section */
6577

6678
/* Begin PBXGroup section */
67-
868938E40019DC0FEF0F5F30 /* Pods */ = {
79+
8D7951AA2D28AF88000FD694 /* Frameworks */ = {
6880
isa = PBXGroup;
6981
children = (
7082
);
71-
path = Pods;
83+
name = Frameworks;
7284
sourceTree = "<group>";
7385
};
7486
EFEC9D561E01BF310021BDF9 = {
7587
isa = PBXGroup;
7688
children = (
7789
EFEC9D9B1E01EEB60021BDF9 /* Dev */,
7890
EFEC9D611E01BF310021BDF9 /* FiroptionConfiguration */,
91+
8D7951AA2D28AF88000FD694 /* Frameworks */,
7992
EFEC9D601E01BF310021BDF9 /* Products */,
80-
868938E40019DC0FEF0F5F30 /* Pods */,
8193
);
8294
sourceTree = "<group>";
8395
};
@@ -163,8 +175,9 @@
163175
EFEC9D571E01BF310021BDF9 /* Project object */ = {
164176
isa = PBXProject;
165177
attributes = {
178+
BuildIndependentTargetsInParallel = YES;
166179
LastSwiftUpdateCheck = 0820;
167-
LastUpgradeCheck = 1130;
180+
LastUpgradeCheck = 1610;
168181
ORGANIZATIONNAME = Google;
169182
TargetAttributes = {
170183
EFEC9D5E1E01BF310021BDF9 = {
@@ -189,6 +202,9 @@
189202
Base,
190203
);
191204
mainGroup = EFEC9D561E01BF310021BDF9;
205+
packageReferences = (
206+
8D7951A92D28AF6D000FD694 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
207+
);
192208
productRefGroup = EFEC9D601E01BF310021BDF9 /* Products */;
193209
projectDirPath = "";
194210
projectRoot = "";
@@ -293,6 +309,7 @@
293309
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
294310
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
295311
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
312+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
296313
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
297314
CLANG_WARN_STRICT_PROTOTYPES = YES;
298315
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -303,6 +320,7 @@
303320
DEBUG_INFORMATION_FORMAT = dwarf;
304321
ENABLE_STRICT_OBJC_MSGSEND = YES;
305322
ENABLE_TESTABILITY = YES;
323+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
306324
GCC_C_LANGUAGE_STANDARD = gnu99;
307325
GCC_DYNAMIC_NO_PIC = NO;
308326
GCC_NO_COMMON_BLOCKS = YES;
@@ -317,7 +335,7 @@
317335
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
318336
GCC_WARN_UNUSED_FUNCTION = YES;
319337
GCC_WARN_UNUSED_VARIABLE = YES;
320-
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
338+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
321339
MTL_ENABLE_DEBUG_INFO = YES;
322340
ONLY_ACTIVE_ARCH = YES;
323341
SDKROOT = iphoneos;
@@ -351,6 +369,7 @@
351369
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
352370
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
353371
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
372+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
354373
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
355374
CLANG_WARN_STRICT_PROTOTYPES = YES;
356375
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -361,6 +380,7 @@
361380
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
362381
ENABLE_NS_ASSERTIONS = NO;
363382
ENABLE_STRICT_OBJC_MSGSEND = YES;
383+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
364384
GCC_C_LANGUAGE_STANDARD = gnu99;
365385
GCC_NO_COMMON_BLOCKS = YES;
366386
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -369,10 +389,11 @@
369389
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
370390
GCC_WARN_UNUSED_FUNCTION = YES;
371391
GCC_WARN_UNUSED_VARIABLE = YES;
372-
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
392+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
373393
MTL_ENABLE_DEBUG_INFO = NO;
374394
SDKROOT = iphoneos;
375-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
395+
SWIFT_COMPILATION_MODE = wholemodule;
396+
SWIFT_OPTIMIZATION_LEVEL = "-O";
376397
TARGETED_DEVICE_FAMILY = "1,2";
377398
VALIDATE_PRODUCT = YES;
378399
};
@@ -385,7 +406,10 @@
385406
CLANG_ENABLE_MODULES = YES;
386407
DEVELOPMENT_TEAM = EQHXZ8M8AV;
387408
INFOPLIST_FILE = FiroptionConfiguration/Info.plist;
388-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
409+
LD_RUNPATH_SEARCH_PATHS = (
410+
"$(inherited)",
411+
"@executable_path/Frameworks",
412+
);
389413
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.devrel.FiroptionConfiguration;
390414
PRODUCT_NAME = "$(TARGET_NAME)";
391415
SWIFT_OBJC_BRIDGING_HEADER = "FiroptionConfiguration/FiroptionConfiguration-Bridging-Header.h";
@@ -401,7 +425,10 @@
401425
CLANG_ENABLE_MODULES = YES;
402426
DEVELOPMENT_TEAM = EQHXZ8M8AV;
403427
INFOPLIST_FILE = FiroptionConfiguration/Info.plist;
404-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
428+
LD_RUNPATH_SEARCH_PATHS = (
429+
"$(inherited)",
430+
"@executable_path/Frameworks",
431+
);
405432
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.devrel.FiroptionConfiguration;
406433
PRODUCT_NAME = "$(TARGET_NAME)";
407434
SWIFT_OBJC_BRIDGING_HEADER = "FiroptionConfiguration/FiroptionConfiguration-Bridging-Header.h";
@@ -415,7 +442,10 @@
415442
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
416443
DEVELOPMENT_TEAM = EQHXZ8M8AV;
417444
INFOPLIST_FILE = "$(SRCROOT)/FiroptionConfiguration/Info.plist";
418-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
445+
LD_RUNPATH_SEARCH_PATHS = (
446+
"$(inherited)",
447+
"@executable_path/Frameworks",
448+
);
419449
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.devrel.FiroptionConfigurationDev;
420450
PRODUCT_NAME = "$(TARGET_NAME)";
421451
SWIFT_VERSION = 4.2;
@@ -428,7 +458,10 @@
428458
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
429459
DEVELOPMENT_TEAM = EQHXZ8M8AV;
430460
INFOPLIST_FILE = "$(SRCROOT)/FiroptionConfiguration/Info.plist";
431-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
461+
LD_RUNPATH_SEARCH_PATHS = (
462+
"$(inherited)",
463+
"@executable_path/Frameworks",
464+
);
432465
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.devrel.FiroptionConfigurationDev;
433466
PRODUCT_NAME = "$(TARGET_NAME)";
434467
SWIFT_VERSION = 4.2;
@@ -466,6 +499,50 @@
466499
defaultConfigurationName = Release;
467500
};
468501
/* End XCConfigurationList section */
502+
503+
/* Begin XCRemoteSwiftPackageReference section */
504+
8D7951A92D28AF6D000FD694 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
505+
isa = XCRemoteSwiftPackageReference;
506+
repositoryURL = "https://github.com/firebase/firebase-ios-sdk";
507+
requirement = {
508+
kind = upToNextMajorVersion;
509+
minimumVersion = 11.6.0;
510+
};
511+
};
512+
/* End XCRemoteSwiftPackageReference section */
513+
514+
/* Begin XCSwiftPackageProductDependency section */
515+
8D7951AB2D28AF88000FD694 /* FirebaseAnalytics */ = {
516+
isa = XCSwiftPackageProductDependency;
517+
package = 8D7951A92D28AF6D000FD694 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
518+
productName = FirebaseAnalytics;
519+
};
520+
8D7951AD2D28AF88000FD694 /* FirebaseCore */ = {
521+
isa = XCSwiftPackageProductDependency;
522+
package = 8D7951A92D28AF6D000FD694 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
523+
productName = FirebaseCore;
524+
};
525+
8D7951AF2D28AF88000FD694 /* FirebaseDatabase */ = {
526+
isa = XCSwiftPackageProductDependency;
527+
package = 8D7951A92D28AF6D000FD694 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
528+
productName = FirebaseDatabase;
529+
};
530+
8D7951B12D28AFF4000FD694 /* FirebaseAnalytics */ = {
531+
isa = XCSwiftPackageProductDependency;
532+
package = 8D7951A92D28AF6D000FD694 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
533+
productName = FirebaseAnalytics;
534+
};
535+
8D7951B32D28AFF4000FD694 /* FirebaseCore */ = {
536+
isa = XCSwiftPackageProductDependency;
537+
package = 8D7951A92D28AF6D000FD694 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
538+
productName = FirebaseCore;
539+
};
540+
8D7951B52D28B003000FD694 /* FirebaseDatabase */ = {
541+
isa = XCSwiftPackageProductDependency;
542+
package = 8D7951A92D28AF6D000FD694 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
543+
productName = FirebaseDatabase;
544+
};
545+
/* End XCSwiftPackageProductDependency section */
469546
};
470547
rootObject = EFEC9D571E01BF310021BDF9 /* Project object */;
471548
}

‎firoptions/FiroptionConfiguration/AppDelegate.swift‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
//
1616

1717
import UIKit
18-
import Firebase
18+
import FirebaseCore
19+
import FirebaseDatabase
1920

2021
@UIApplicationMain
2122
class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -53,11 +54,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
5354
// The other options are not mandatory, but may be required
5455
// for specific Firebase products.
5556
secondaryOptions.bundleID = "com.google.firebase.devrel.FiroptionConfiguration"
56-
secondaryOptions.trackingID = "UA-12345678-1"
5757
secondaryOptions.clientID = "27992087142-ola6qe637ulk8780vl8mo5vogegkm23n.apps.googleusercontent.com"
5858
secondaryOptions.databaseURL = "https://myproject.firebaseio.com"
5959
secondaryOptions.storageBucket = "myproject.appspot.com"
60-
secondaryOptions.androidClientID = "12345.apps.googleusercontent.com"
6160
secondaryOptions.deepLinkURLScheme = "myapp://"
6261
secondaryOptions.storageBucket = "projectid-12345.appspot.com"
6362
secondaryOptions.appGroupID = nil

‎firoptions/Podfile‎

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

0 commit comments

Comments
 (0)