Skip to content

Commit 0a84b0d

Browse files
morganchen12morganchen12
committed
Update objc sample
1 parent 37f0461 commit 0a84b0d

21 files changed

+37
-141
lines changed

‎FirebaseEmailAuthUI.podspec‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Pod::Spec.new do |s|
2020
s.dependency 'FirebaseAuthUI'
2121
s.dependency 'FirebaseAuth'
2222
s.dependency 'FirebaseCore'
23+
s.dependency 'GoogleUtilities/UserDefaults'
2324
s.resource_bundle = {
2425
'FirebaseEmailAuthUI' => ['FirebaseEmailAuthUI/Sources/Resources/*.{xib,png}']
2526
}

‎FirebaseFacebookAuthUI.podspec‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ Pod::Spec.new do |s|
2222
s.dependency 'FirebaseAuthUI'
2323
s.dependency 'FirebaseAuth'
2424
s.dependency 'FirebaseCore'
25+
s.dependency 'GoogleUtilities/UserDefaults'
2526
s.dependency 'FBSDKLoginKit', '~> 9.0'
27+
s.dependency 'FBSDKCoreKit'
2628
s.resource_bundle = {
2729
'FirebaseFacebookAuthUI' => ['FirebaseFacebookAuthUI/Sources/{Resources,Strings}/*.{png,lproj}']
2830
}

‎FirebaseGoogleAuthUI.podspec‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Pod::Spec.new do |s|
2222
s.dependency 'GoogleSignIn', '~> 5.0'
2323
s.dependency 'FirebaseAuth'
2424
s.dependency 'FirebaseCore'
25+
s.dependency 'GoogleUtilities/UserDefaults'
2526
s.resource_bundle = {
2627
'FirebaseGoogleAuthUI' => ['FirebaseGoogleAuthUI/Sources/{Resources,Strings}/*.{png,lproj}']
2728
}

‎FirebaseOAuthUI.podspec‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Pod::Spec.new do |s|
2020
s.dependency 'FirebaseAuthUI'
2121
s.dependency 'FirebaseAuth'
2222
s.dependency 'FirebaseCore'
23+
s.dependency 'GoogleUtilities/UserDefaults'
2324
s.resource_bundle = {
2425
'FirebaseOAuthUI' => ['FirebaseOAuthUI/Sources/{Resources,Strings}/*.{png,lproj}']
2526
}

‎FirebasePhoneAuthUI.podspec‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Pod::Spec.new do |s|
2020
s.dependency 'FirebaseAuthUI'
2121
s.dependency 'FirebaseAuth'
2222
s.dependency 'FirebaseCore'
23+
s.dependency 'GoogleUtilities/UserDefaults'
2324
s.resource_bundle = {
2425
'FirebasePhoneAuthUI' => ['FirebasePhoneAuthUI/Sources/{Resources,Strings}/*.{xib,json,lproj,png}']
2526
}

‎samples/objc/FirebaseUI-demo-objc.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
/* Begin PBXBuildFile section */
1010
8D7D5DC11D9D9536006C1857 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8D7D5DC01D9D9536006C1857 /* GoogleService-Info.plist */; };
1111
8D7F86B51D9DAA0100C2A122 /* FUIStorageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D7F86B41D9DAA0100C2A122 /* FUIStorageViewController.m */; };
12-
A3498C9A8EF8B3D544E09F59 /* Pods_FirebaseUI_demo_objc.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3298169364375FC4122D9EE0 /* Pods_FirebaseUI_demo_objc.framework */; };
1312
C30AEB0A1ED610740084E328 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C30AEB071ED610740084E328 /* Main.storyboard */; };
1413
C30AEB0B1ED610780084E328 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = C30AEB0D1ED610780084E328 /* Localizable.strings */; };
1514
C329B1B21DAD6E5100059A13 /* FUICustomEmailEntryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C329B1B01DAD6E5100059A13 /* FUICustomEmailEntryViewController.m */; };
@@ -39,8 +38,6 @@
3938
/* End PBXBuildFile section */
4039

4140
/* Begin PBXFileReference section */
42-
3298169364375FC4122D9EE0 /* Pods_FirebaseUI_demo_objc.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseUI_demo_objc.framework; sourceTree = BUILT_PRODUCTS_DIR; };
43-
52029D38B5FB35D3DB458C13 /* Pods-FirebaseUI-demo-objc.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseUI-demo-objc.release.xcconfig"; path = "Target Support Files/Pods-FirebaseUI-demo-objc/Pods-FirebaseUI-demo-objc.release.xcconfig"; sourceTree = "<group>"; };
4441
8D7D5DC01D9D9536006C1857 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
4542
8D7F86B31D9DAA0100C2A122 /* FUIStorageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FUIStorageViewController.h; path = Storage/FUIStorageViewController.h; sourceTree = "<group>"; };
4643
8D7F86B41D9DAA0100C2A122 /* FUIStorageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FUIStorageViewController.m; path = Storage/FUIStorageViewController.m; sourceTree = "<group>"; };
@@ -171,34 +168,22 @@
171168
D81A05F71B86A78700498183 /* FUIAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUIAppDelegate.h; sourceTree = "<group>"; };
172169
D81A05F81B86A78700498183 /* FUIAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUIAppDelegate.m; sourceTree = "<group>"; };
173170
D81A06001B86A78700498183 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
174-
FF10243BE9A2CCF97664CCAE /* Pods-FirebaseUI-demo-objc.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseUI-demo-objc.debug.xcconfig"; path = "Target Support Files/Pods-FirebaseUI-demo-objc/Pods-FirebaseUI-demo-objc.debug.xcconfig"; sourceTree = "<group>"; };
175171
/* End PBXFileReference section */
176172

177173
/* Begin PBXFrameworksBuildPhase section */
178174
D81A05ED1B86A78700498183 /* Frameworks */ = {
179175
isa = PBXFrameworksBuildPhase;
180176
buildActionMask = 2147483647;
181177
files = (
182-
A3498C9A8EF8B3D544E09F59 /* Pods_FirebaseUI_demo_objc.framework in Frameworks */,
183178
);
184179
runOnlyForDeploymentPostprocessing = 0;
185180
};
186181
/* End PBXFrameworksBuildPhase section */
187182

188183
/* Begin PBXGroup section */
189-
3CF2E5DEA9EC50D43BCD6311 /* Frameworks */ = {
190-
isa = PBXGroup;
191-
children = (
192-
3298169364375FC4122D9EE0 /* Pods_FirebaseUI_demo_objc.framework */,
193-
);
194-
name = Frameworks;
195-
sourceTree = "<group>";
196-
};
197184
54B9F7E49B62231ABC826A36 /* Pods */ = {
198185
isa = PBXGroup;
199186
children = (
200-
FF10243BE9A2CCF97664CCAE /* Pods-FirebaseUI-demo-objc.debug.xcconfig */,
201-
52029D38B5FB35D3DB458C13 /* Pods-FirebaseUI-demo-objc.release.xcconfig */,
202187
);
203188
path = Pods;
204189
sourceTree = "<group>";
@@ -283,7 +268,6 @@
283268
D81A05F21B86A78700498183 /* FirebaseUI-demo-objc */,
284269
D81A05F11B86A78700498183 /* Products */,
285270
54B9F7E49B62231ABC826A36 /* Pods */,
286-
3CF2E5DEA9EC50D43BCD6311 /* Frameworks */,
287271
);
288272
sourceTree = "<group>";
289273
};
@@ -329,12 +313,9 @@
329313
isa = PBXNativeTarget;
330314
buildConfigurationList = D81A06131B86A78700498183 /* Build configuration list for PBXNativeTarget "FirebaseUI-demo-objc" */;
331315
buildPhases = (
332-
18927A3F8154C0B20F776C18 /* [CP] Check Pods Manifest.lock */,
333316
D81A05EC1B86A78700498183 /* Sources */,
334317
D81A05ED1B86A78700498183 /* Frameworks */,
335318
D81A05EE1B86A78700498183 /* Resources */,
336-
272BDE4293A6219883B6BBAF /* [CP] Embed Pods Frameworks */,
337-
481663CE6E96789CEF2FB43E /* [CP] Copy Pods Resources */,
338319
);
339320
buildRules = (
340321
);
@@ -490,107 +471,6 @@
490471
};
491472
/* End PBXResourcesBuildPhase section */
492473

493-
/* Begin PBXShellScriptBuildPhase section */
494-
18927A3F8154C0B20F776C18 /* [CP] Check Pods Manifest.lock */ = {
495-
isa = PBXShellScriptBuildPhase;
496-
buildActionMask = 2147483647;
497-
files = (
498-
);
499-
inputFileListPaths = (
500-
);
501-
inputPaths = (
502-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
503-
"${PODS_ROOT}/Manifest.lock",
504-
);
505-
name = "[CP] Check Pods Manifest.lock";
506-
outputFileListPaths = (
507-
);
508-
outputPaths = (
509-
"$(DERIVED_FILE_DIR)/Pods-FirebaseUI-demo-objc-checkManifestLockResult.txt",
510-
);
511-
runOnlyForDeploymentPostprocessing = 0;
512-
shellPath = /bin/sh;
513-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
514-
showEnvVarsInLog = 0;
515-
};
516-
272BDE4293A6219883B6BBAF /* [CP] Embed Pods Frameworks */ = {
517-
isa = PBXShellScriptBuildPhase;
518-
buildActionMask = 2147483647;
519-
files = (
520-
);
521-
inputPaths = (
522-
"${PODS_ROOT}/Target Support Files/Pods-FirebaseUI-demo-objc/Pods-FirebaseUI-demo-objc-frameworks.sh",
523-
"${BUILT_PRODUCTS_DIR}/AppAuth/AppAuth.framework",
524-
"${BUILT_PRODUCTS_DIR}/BoringSSL-GRPC/openssl_grpc.framework",
525-
"${BUILT_PRODUCTS_DIR}/FBSDKCoreKit/FBSDKCoreKit.framework",
526-
"${BUILT_PRODUCTS_DIR}/FBSDKLoginKit/FBSDKLoginKit.framework",
527-
"${BUILT_PRODUCTS_DIR}/GTMAppAuth/GTMAppAuth.framework",
528-
"${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework",
529-
"${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework",
530-
"${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework",
531-
"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
532-
"${BUILT_PRODUCTS_DIR}/abseil/absl.framework",
533-
"${BUILT_PRODUCTS_DIR}/gRPC-C++/grpcpp.framework",
534-
"${BUILT_PRODUCTS_DIR}/gRPC-Core/grpc.framework",
535-
"${BUILT_PRODUCTS_DIR}/leveldb-library/leveldb.framework",
536-
"${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework",
537-
);
538-
name = "[CP] Embed Pods Frameworks";
539-
outputPaths = (
540-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AppAuth.framework",
541-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl_grpc.framework",
542-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSDKCoreKit.framework",
543-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSDKLoginKit.framework",
544-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMAppAuth.framework",
545-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework",
546-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework",
547-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework",
548-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
549-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/absl.framework",
550-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/grpcpp.framework",
551-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/grpc.framework",
552-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/leveldb.framework",
553-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework",
554-
);
555-
runOnlyForDeploymentPostprocessing = 0;
556-
shellPath = /bin/sh;
557-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FirebaseUI-demo-objc/Pods-FirebaseUI-demo-objc-frameworks.sh\"\n";
558-
showEnvVarsInLog = 0;
559-
};
560-
481663CE6E96789CEF2FB43E /* [CP] Copy Pods Resources */ = {
561-
isa = PBXShellScriptBuildPhase;
562-
buildActionMask = 2147483647;
563-
files = (
564-
);
565-
inputPaths = (
566-
"${PODS_ROOT}/Target Support Files/Pods-FirebaseUI-demo-objc/Pods-FirebaseUI-demo-objc-resources.sh",
567-
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseAnonymousAuthUI.bundle",
568-
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseAuthUI.bundle",
569-
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseEmailAuthUI.bundle",
570-
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseFacebookAuthUI.bundle",
571-
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseGoogleAuthUI.bundle",
572-
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseOAuthUI.bundle",
573-
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebasePhoneAuthUI.bundle",
574-
"${PODS_ROOT}/GoogleSignIn/Resources/GoogleSignIn.bundle",
575-
);
576-
name = "[CP] Copy Pods Resources";
577-
outputPaths = (
578-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseAnonymousAuthUI.bundle",
579-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseAuthUI.bundle",
580-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseEmailAuthUI.bundle",
581-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseFacebookAuthUI.bundle",
582-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseGoogleAuthUI.bundle",
583-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseOAuthUI.bundle",
584-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebasePhoneAuthUI.bundle",
585-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleSignIn.bundle",
586-
);
587-
runOnlyForDeploymentPostprocessing = 0;
588-
shellPath = /bin/sh;
589-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FirebaseUI-demo-objc/Pods-FirebaseUI-demo-objc-resources.sh\"\n";
590-
showEnvVarsInLog = 0;
591-
};
592-
/* End PBXShellScriptBuildPhase section */
593-
594474
/* Begin PBXSourcesBuildPhase section */
595475
D81A05EC1B86A78700498183 /* Sources */ = {
596476
isa = PBXSourcesBuildPhase;
@@ -818,7 +698,6 @@
818698
};
819699
D81A06141B86A78700498183 /* Debug */ = {
820700
isa = XCBuildConfiguration;
821-
baseConfigurationReference = FF10243BE9A2CCF97664CCAE /* Pods-FirebaseUI-demo-objc.debug.xcconfig */;
822701
buildSettings = {
823702
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
824703
CODE_SIGN_ENTITLEMENTS = "FirebaseUI-demo-objc/FirebaseUI-demo-objc.entitlements";
@@ -852,7 +731,6 @@
852731
};
853732
D81A06151B86A78700498183 /* Release */ = {
854733
isa = XCBuildConfiguration;
855-
baseConfigurationReference = 52029D38B5FB35D3DB458C13 /* Pods-FirebaseUI-demo-objc.release.xcconfig */;
856734
buildSettings = {
857735
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
858736
CODE_SIGN_ENTITLEMENTS = "FirebaseUI-demo-objc/FirebaseUI-demo-objc.entitlements";

‎samples/objc/FirebaseUI-demo-objc.xcodeproj/xcshareddata/xcschemes/FirebaseUI-demo-objc.xcscheme‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30-
<Testables>
31-
</Testables>
3230
<MacroExpansion>
3331
<BuildableReference
3432
BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
3836
ReferencedContainer = "container:FirebaseUI-demo-objc.xcodeproj">
3937
</BuildableReference>
4038
</MacroExpansion>
41-
<AdditionalOptions>
42-
</AdditionalOptions>
39+
<Testables>
40+
</Testables>
4341
</TestAction>
4442
<LaunchAction
4543
buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
6159
ReferencedContainer = "container:FirebaseUI-demo-objc.xcodeproj">
6260
</BuildableReference>
6361
</BuildableProductRunnable>
64-
<AdditionalOptions>
65-
</AdditionalOptions>
6662
</LaunchAction>
6763
<ProfileAction
6864
buildConfiguration = "Release"

‎samples/objc/FirebaseUI-demo-objc/FUIAppDelegate.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#import "FUIAppDelegate.h"
1818

1919
@import Firebase;
20-
#import <FirebaseUI/FirebaseUI.h>
20+
@import FirebaseAuthUI;
2121
#import <GTMSessionFetcher/GTMSessionFetcherLogging.h>
2222

2323
@implementation FUIAppDelegate

‎samples/objc/FirebaseUI-demo-objc/FUISamplesViewController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// limitations under the License.
1717
//
1818

19-
#import <FirebaseUI/FirebaseUI.h>
19+
@import UIKit;
2020

2121
#import "FUISamplesViewController.h"
2222

‎samples/objc/FirebaseUI-demo-objc/Samples/Auth/FUIAuthViewController.m‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,12 @@
1717
//
1818

1919
@import Firebase;
20-
#import <FirebaseUI/FirebaseUI.h>
20+
@import FirebaseOAuthUI;
21+
@import FirebaseEmailAuthUI;
22+
@import FirebaseAnonymousAuthUI;
23+
@import FirebaseGoogleAuthUI;
24+
@import FirebaseFacebookAuthUI;
25+
@import FirebasePhoneAuthUI;
2126

2227
#import "FUIAuthViewController.h"
2328
#import "FUIAppDelegate.h"

0 commit comments

Comments
 (0)