Skip to content

Commit 64fe7e3

Browse files
morganchen12morganchen12
committed
fix travis issues
1 parent 0628b13 commit 64fe7e3

File tree

5 files changed

+143
-85
lines changed

5 files changed

+143
-85
lines changed

‎FirebaseFacebookAuthUI/FUIFacebookAuth.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616

1717
#import "FUIFacebookAuth.h"
1818

19-
#import <FirebaseAuth/FIRFacebookAuthProvider.h>
20-
#import <FirebaseAuth/FIRUserInfo.h>
19+
#import <FirebaseAuth/FirebaseAuth.h>
2120
#import <FBSDKCoreKit/FBSDKCoreKit.h>
2221
#import <FBSDKLoginKit/FBSDKLoginKit.h>
2322
#import <FirebaseAuthUI/FUIAuthErrorUtils.h>

‎FirebaseUI.xcodeproj/project.pbxproj

Lines changed: 48 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -2418,11 +2418,9 @@
24182418
CLANG_WARN_SUSPICIOUS_MOVES = YES;
24192419
FRAMEWORK_SEARCH_PATHS = (
24202420
"$(inherited)",
2421-
"\"${PODS_ROOT}/FirebaseAnalytics/Frameworks/frameworks\"",
2422-
"\"${PODS_ROOT}/FirebaseInstanceID/Frameworks/frameworks\"",
2423-
"\"${PODS_ROOT}/GoogleInterchangeUtilities/Frameworks\"",
2424-
"\"${PODS_ROOT}/GoogleSymbolUtilities/Frameworks\"",
2425-
"\"${PODS_ROOT}/FirebaseStorage/Frameworks/frameworks\"",
2421+
"\"${PODS_ROOT}/FirebaseAnalytics/Frameworks\"",
2422+
"\"${PODS_ROOT}/FirebaseInstanceID/Frameworks\"",
2423+
"\"${PODS_ROOT}/FirebaseStorage/Frameworks\"",
24262424
);
24272425
INFOPLIST_FILE = FirebaseStorageUITests/Info.plist;
24282426
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -2442,11 +2440,9 @@
24422440
CLANG_WARN_SUSPICIOUS_MOVES = YES;
24432441
FRAMEWORK_SEARCH_PATHS = (
24442442
"$(inherited)",
2445-
"\"${PODS_ROOT}/FirebaseAnalytics/Frameworks/frameworks\"",
2446-
"\"${PODS_ROOT}/FirebaseInstanceID/Frameworks/frameworks\"",
2447-
"\"${PODS_ROOT}/GoogleInterchangeUtilities/Frameworks\"",
2448-
"\"${PODS_ROOT}/GoogleSymbolUtilities/Frameworks\"",
2449-
"\"${PODS_ROOT}/FirebaseStorage/Frameworks/frameworks\"",
2443+
"\"${PODS_ROOT}/FirebaseAnalytics/Frameworks\"",
2444+
"\"${PODS_ROOT}/FirebaseInstanceID/Frameworks\"",
2445+
"\"${PODS_ROOT}/FirebaseStorage/Frameworks\"",
24502446
);
24512447
INFOPLIST_FILE = FirebaseStorageUITests/Info.plist;
24522448
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -2614,11 +2610,9 @@
26142610
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
26152611
FRAMEWORK_SEARCH_PATHS = (
26162612
"$(inherited)",
2617-
"\"${PODS_ROOT}/FirebaseAnalytics/Frameworks/frameworks\"",
2613+
"\"${PODS_ROOT}/FirebaseAnalytics/Frameworks\"",
26182614
"\"${PODS_ROOT}/FirebaseDatabase/Frameworks\"",
2619-
"\"${PODS_ROOT}/FirebaseInstanceID/Frameworks/frameworks\"",
2620-
"\"${PODS_ROOT}/GoogleInterchangeUtilities/Frameworks\"",
2621-
"\"${PODS_ROOT}/GoogleSymbolUtilities/Frameworks\"",
2615+
"\"${PODS_ROOT}/FirebaseInstanceID/Frameworks\"",
26222616
);
26232617
INFOPLIST_FILE = FirebaseDatabaseUITests/Info.plist;
26242618
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -2635,11 +2629,9 @@
26352629
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
26362630
FRAMEWORK_SEARCH_PATHS = (
26372631
"$(inherited)",
2638-
"\"${PODS_ROOT}/FirebaseAnalytics/Frameworks/frameworks\"",
2632+
"\"${PODS_ROOT}/FirebaseAnalytics/Frameworks\"",
26392633
"\"${PODS_ROOT}/FirebaseDatabase/Frameworks\"",
2640-
"\"${PODS_ROOT}/FirebaseInstanceID/Frameworks/frameworks\"",
2641-
"\"${PODS_ROOT}/GoogleInterchangeUtilities/Frameworks\"",
2642-
"\"${PODS_ROOT}/GoogleSymbolUtilities/Frameworks\"",
2634+
"\"${PODS_ROOT}/FirebaseInstanceID/Frameworks\"",
26432635
);
26442636
INFOPLIST_FILE = FirebaseDatabaseUITests/Info.plist;
26452637
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -2701,12 +2693,10 @@
27012693
buildSettings = {
27022694
FRAMEWORK_SEARCH_PATHS = (
27032695
"$(inherited)",
2704-
"\"${PODS_ROOT}/FirebaseAnalytics/Frameworks/frameworks\"",
2696+
"\"${PODS_ROOT}/FirebaseAnalytics/Frameworks\"",
27052697
"\"${PODS_ROOT}/FirebaseCore/Frameworks\"",
2706-
"\"${PODS_ROOT}/FirebaseInstanceID/Frameworks/frameworks\"",
2707-
"\"${PODS_ROOT}/GoogleInterchangeUtilities/Frameworks/frameworks\"",
2708-
"\"${PODS_ROOT}/GoogleSymbolUtilities/Frameworks/frameworks\"",
2709-
"\"${PODS_ROOT}/FirebaseAuth/Frameworks/frameworks\"",
2698+
"\"${PODS_ROOT}/FirebaseInstanceID/Frameworks\"",
2699+
"\"${PODS_ROOT}/FirebaseAuth/Frameworks\"",
27102700
);
27112701
INFOPLIST_FILE = FirebaseAuthUITests/Info.plist;
27122702
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -2722,12 +2712,10 @@
27222712
buildSettings = {
27232713
FRAMEWORK_SEARCH_PATHS = (
27242714
"$(inherited)",
2725-
"\"${PODS_ROOT}/FirebaseAnalytics/Frameworks/frameworks\"",
2715+
"\"${PODS_ROOT}/FirebaseAnalytics/Frameworks\"",
27262716
"\"${PODS_ROOT}/FirebaseCore/Frameworks\"",
2727-
"\"${PODS_ROOT}/FirebaseInstanceID/Frameworks/frameworks\"",
2728-
"\"${PODS_ROOT}/GoogleInterchangeUtilities/Frameworks/frameworks\"",
2729-
"\"${PODS_ROOT}/GoogleSymbolUtilities/Frameworks/frameworks\"",
2730-
"\"${PODS_ROOT}/FirebaseAuth/Frameworks/frameworks\"",
2717+
"\"${PODS_ROOT}/FirebaseInstanceID/Frameworks\"",
2718+
"\"${PODS_ROOT}/FirebaseAuth/Frameworks\"",
27312719
);
27322720
INFOPLIST_FILE = FirebaseAuthUITests/Info.plist;
27332721
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -2748,7 +2736,7 @@
27482736
DYLIB_INSTALL_NAME_BASE = "@rpath";
27492737
FRAMEWORK_SEARCH_PATHS = (
27502738
"$(inherited)",
2751-
"\"${PODS_ROOT}/FirebaseAuth/Frameworks/frameworks\"",
2739+
"\"${PODS_ROOT}/FirebaseAuth/Frameworks\"",
27522740
"\"${PODS_CONFIGURATION_BUILD_DIR}/GTMOAuth2-framework\"",
27532741
);
27542742
INFOPLIST_FILE = FirebaseFacebookAuthUI/Info.plist;
@@ -2777,7 +2765,7 @@
27772765
DYLIB_INSTALL_NAME_BASE = "@rpath";
27782766
FRAMEWORK_SEARCH_PATHS = (
27792767
"$(inherited)",
2780-
"\"${PODS_ROOT}/FirebaseAuth/Frameworks/frameworks\"",
2768+
"\"${PODS_ROOT}/FirebaseAuth/Frameworks\"",
27812769
"\"${PODS_CONFIGURATION_BUILD_DIR}/GTMOAuth2-framework\"",
27822770
);
27832771
INFOPLIST_FILE = FirebaseFacebookAuthUI/Info.plist;
@@ -2801,11 +2789,9 @@
28012789
buildSettings = {
28022790
FRAMEWORK_SEARCH_PATHS = (
28032791
"$(inherited)",
2804-
"\"${PODS_ROOT}/FirebaseAnalytics/Frameworks/frameworks\"",
2805-
"\"${PODS_ROOT}/FirebaseInstanceID/Frameworks/frameworks\"",
2806-
"\"${PODS_ROOT}/GoogleInterchangeUtilities/Frameworks\"",
2807-
"\"${PODS_ROOT}/GoogleSymbolUtilities/Frameworks\"",
2808-
"\"${PODS_ROOT}/FirebaseAuth/Frameworks/frameworks\"",
2792+
"\"${PODS_ROOT}/FirebaseAnalytics/Frameworks\"",
2793+
"\"${PODS_ROOT}/FirebaseInstanceID/Frameworks\"",
2794+
"\"${PODS_ROOT}/FirebaseAuth/Frameworks\"",
28092795
);
28102796
INFOPLIST_FILE = FirebaseFacebookAuthUITests/Info.plist;
28112797
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -2821,11 +2807,9 @@
28212807
buildSettings = {
28222808
FRAMEWORK_SEARCH_PATHS = (
28232809
"$(inherited)",
2824-
"\"${PODS_ROOT}/FirebaseAnalytics/Frameworks/frameworks\"",
2825-
"\"${PODS_ROOT}/FirebaseInstanceID/Frameworks/frameworks\"",
2826-
"\"${PODS_ROOT}/GoogleInterchangeUtilities/Frameworks\"",
2827-
"\"${PODS_ROOT}/GoogleSymbolUtilities/Frameworks\"",
2828-
"\"${PODS_ROOT}/FirebaseAuth/Frameworks/frameworks\"",
2810+
"\"${PODS_ROOT}/FirebaseAnalytics/Frameworks\"",
2811+
"\"${PODS_ROOT}/FirebaseInstanceID/Frameworks\"",
2812+
"\"${PODS_ROOT}/FirebaseAuth/Frameworks\"",
28292813
);
28302814
INFOPLIST_FILE = FirebaseFacebookAuthUITests/Info.plist;
28312815
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -2848,8 +2832,8 @@
28482832
"$(inherited)",
28492833
"\"${PODS_ROOT}/GoogleSignIn/Frameworks\"",
28502834
"\"${PODS_ROOT}/FirebaseCore/Frameworks\"",
2851-
"\"${PODS_ROOT}/FirebaseAnalytics/Frameworks/frameworks\"",
2852-
"\"${PODS_ROOT}/FirebaseAuth/Frameworks/frameworks\"",
2835+
"\"${PODS_ROOT}/FirebaseAnalytics/Frameworks\"",
2836+
"\"${PODS_ROOT}/FirebaseAuth/Frameworks\"",
28532837
);
28542838
HEADER_SEARCH_PATHS = "$(inherited)";
28552839
INFOPLIST_FILE = FirebaseGoogleAuthUI/Info.plist;
@@ -2880,8 +2864,8 @@
28802864
"$(inherited)",
28812865
"\"${PODS_ROOT}/GoogleSignIn/Frameworks\"",
28822866
"\"${PODS_ROOT}/FirebaseCore/Frameworks\"",
2883-
"\"${PODS_ROOT}/FirebaseAnalytics/Frameworks/frameworks\"",
2884-
"\"${PODS_ROOT}/FirebaseAuth/Frameworks/frameworks\"",
2867+
"\"${PODS_ROOT}/FirebaseAnalytics/Frameworks\"",
2868+
"\"${PODS_ROOT}/FirebaseAuth/Frameworks\"",
28852869
);
28862870
HEADER_SEARCH_PATHS = "$(inherited)";
28872871
INFOPLIST_FILE = FirebaseGoogleAuthUI/Info.plist;
@@ -2905,7 +2889,7 @@
29052889
buildSettings = {
29062890
FRAMEWORK_SEARCH_PATHS = (
29072891
"$(inherited)",
2908-
"\"${PODS_ROOT}/FirebaseAuth/Frameworks/frameworks\"",
2892+
"\"${PODS_ROOT}/FirebaseAuth/Frameworks\"",
29092893
"\"${PODS_ROOT}/GoogleSignIn/Frameworks\"",
29102894
);
29112895
HEADER_SEARCH_PATHS = "$(inherited)";
@@ -2934,7 +2918,7 @@
29342918
buildSettings = {
29352919
FRAMEWORK_SEARCH_PATHS = (
29362920
"$(inherited)",
2937-
"\"${PODS_ROOT}/FirebaseAuth/Frameworks/frameworks\"",
2921+
"\"${PODS_ROOT}/FirebaseAuth/Frameworks\"",
29382922
"\"${PODS_ROOT}/GoogleSignIn/Frameworks\"",
29392923
);
29402924
HEADER_SEARCH_PATHS = "$(inherited)";
@@ -2971,7 +2955,7 @@
29712955
"\"${PODS_ROOT}/Fabric/iOS\"",
29722956
"\"${PODS_ROOT}/TwitterCore/iOS\"",
29732957
"\"${PODS_ROOT}/TwitterKit/iOS\"",
2974-
"\"${PODS_ROOT}/FirebaseAuth/Frameworks/frameworks\"",
2958+
"\"${PODS_ROOT}/FirebaseAuth/Frameworks\"",
29752959
);
29762960
INFOPLIST_FILE = FirebaseTwitterAuthUI/Info.plist;
29772961
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -3040,7 +3024,7 @@
30403024
"\"${PODS_ROOT}/Fabric/iOS\"",
30413025
"\"${PODS_ROOT}/TwitterCore/iOS\"",
30423026
"\"${PODS_ROOT}/TwitterKit/iOS\"",
3043-
"\"${PODS_ROOT}/FirebaseAuth/Frameworks/frameworks\"",
3027+
"\"${PODS_ROOT}/FirebaseAuth/Frameworks\"",
30443028
);
30453029
INFOPLIST_FILE = FirebaseTwitterAuthUI/Info.plist;
30463030
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -3102,7 +3086,7 @@
31023086
FRAMEWORK_SEARCH_PATHS = (
31033087
"$(inherited)",
31043088
"\"${PODS_ROOT}/TwitterKit/iOS\"",
3105-
"\"${PODS_ROOT}/FirebaseAuth/Frameworks/frameworks\"",
3089+
"\"${PODS_ROOT}/FirebaseAuth/Frameworks\"",
31063090
"\"$(PODS_ROOT)/TwitterCore/iOS\"",
31073091
);
31083092
INFOPLIST_FILE = FirebaseTwitterAuthUITests/Info.plist;
@@ -3120,7 +3104,7 @@
31203104
FRAMEWORK_SEARCH_PATHS = (
31213105
"$(inherited)",
31223106
"\"${PODS_ROOT}/TwitterKit/iOS\"",
3123-
"\"${PODS_ROOT}/FirebaseAuth/Frameworks/frameworks\"",
3107+
"\"${PODS_ROOT}/FirebaseAuth/Frameworks\"",
31243108
"\"$(PODS_ROOT)/TwitterCore/iOS\"",
31253109
);
31263110
INFOPLIST_FILE = FirebaseTwitterAuthUITests/Info.plist;
@@ -3167,10 +3151,10 @@
31673151
ENABLE_BITCODE = NO;
31683152
FRAMEWORK_SEARCH_PATHS = (
31693153
"$(inherited)",
3170-
"\"${PODS_ROOT}/FirebaseAnalytics/Frameworks/frameworks\"",
3154+
"\"${PODS_ROOT}/FirebaseAnalytics/Frameworks\"",
31713155
"\"${PODS_ROOT}/FirebaseCore/Frameworks\"",
3172-
"\"${PODS_ROOT}/FirebaseAuth/Frameworks/frameworks\"",
3173-
"\"${PODS_ROOT}/FirebaseInstanceID/Frameworks/frameworks\"",
3156+
"\"${PODS_ROOT}/FirebaseAuth/Frameworks\"",
3157+
"\"${PODS_ROOT}/FirebaseInstanceID/Frameworks\"",
31743158
"$(PROJECT_DIR)/Pods/FirebaseCore/Frameworks",
31753159
);
31763160
INFOPLIST_FILE = FirebaseUISample/Info.plist;
@@ -3190,10 +3174,10 @@
31903174
ENABLE_BITCODE = NO;
31913175
FRAMEWORK_SEARCH_PATHS = (
31923176
"$(inherited)",
3193-
"\"${PODS_ROOT}/FirebaseAnalytics/Frameworks/frameworks\"",
3177+
"\"${PODS_ROOT}/FirebaseAnalytics/Frameworks\"",
31943178
"\"${PODS_ROOT}/FirebaseCore/Frameworks\"",
3195-
"\"${PODS_ROOT}/FirebaseAuth/Frameworks/frameworks\"",
3196-
"\"${PODS_ROOT}/FirebaseInstanceID/Frameworks/frameworks\"",
3179+
"\"${PODS_ROOT}/FirebaseAuth/Frameworks\"",
3180+
"\"${PODS_ROOT}/FirebaseInstanceID/Frameworks\"",
31973181
"$(PROJECT_DIR)/Pods/FirebaseCore/Frameworks",
31983182
);
31993183
INFOPLIST_FILE = FirebaseUISample/Info.plist;
@@ -3212,18 +3196,15 @@
32123196
FRAMEWORK_SEARCH_PATHS = (
32133197
"$(inherited)",
32143198
"\"${PODS_ROOT}/FirebaseCore/Frameworks\"",
3215-
"\"${PODS_ROOT}/FirebaseAuth/Frameworks/frameworks\"",
3199+
"\"${PODS_ROOT}/FirebaseAuth/Frameworks\"",
32163200
"\"$(PODS_CONFIGURATION_BUILD_DIR)/GTMOAuth2-framework\"",
32173201
"\"$(PODS_CONFIGURATION_BUILD_DIR)/GTMSessionFetcher.default-Core-framework\"",
32183202
"\"$(PODS_ROOT)/FirebaseDatabase/Frameworks\"",
32193203
"\"$(PODS_ROOT)/Fabric/iOS\"",
3220-
"\"$(PODS_ROOT)/FirebaseAnalytics/Frameworks/frameworks\"",
3221-
"\"$(PODS_ROOT)/FirebaseInstanceID/Frameworks/frameworks\"",
3222-
"\"$(PODS_ROOT)/FirebaseStorage/Frameworks/frameworks\"",
3223-
"\"$(PODS_ROOT)/GoogleAppUtilities/Frameworks/frameworks\"",
3224-
"\"$(PODS_ROOT)/GoogleInterchangeUtilities/Frameworks/frameworks\"",
3204+
"\"$(PODS_ROOT)/FirebaseAnalytics/Frameworks\"",
3205+
"\"$(PODS_ROOT)/FirebaseInstanceID/Frameworks\"",
3206+
"\"$(PODS_ROOT)/FirebaseStorage/Frameworks\"",
32253207
"\"$(PODS_ROOT)/GoogleSignIn/Frameworks\"",
3226-
"\"$(PODS_ROOT)/GoogleSymbolUtilities/Frameworks/frameworks\"",
32273208
"\"$(PODS_ROOT)/TwitterCore/iOS\"",
32283209
"\"$(PODS_ROOT)/TwitterKit/iOS\"",
32293210
);
@@ -3270,14 +3251,8 @@
32703251
"-framework",
32713252
"\"Foundation\"",
32723253
"-framework",
3273-
"\"GoogleAppUtilities\"",
3274-
"-framework",
3275-
"\"GoogleInterchangeUtilities\"",
3276-
"-framework",
32773254
"\"GoogleSignIn\"",
32783255
"-framework",
3279-
"\"GoogleSymbolUtilities\"",
3280-
"-framework",
32813256
"\"ImageIO\"",
32823257
"-framework",
32833258
"\"MobileCoreServices\"",
@@ -3336,18 +3311,15 @@
33363311
FRAMEWORK_SEARCH_PATHS = (
33373312
"$(inherited)",
33383313
"\"${PODS_ROOT}/FirebaseCore/Frameworks\"",
3339-
"\"${PODS_ROOT}/FirebaseAuth/Frameworks/frameworks\"",
3314+
"\"${PODS_ROOT}/FirebaseAuth/Frameworks\"",
33403315
"\"$(PODS_CONFIGURATION_BUILD_DIR)/GTMOAuth2-framework\"",
33413316
"\"$(PODS_CONFIGURATION_BUILD_DIR)/GTMSessionFetcher.default-Core-framework\"",
33423317
"\"$(PODS_ROOT)/FirebaseDatabase/Frameworks\"",
33433318
"\"$(PODS_ROOT)/Fabric/iOS\"",
3344-
"\"$(PODS_ROOT)/FirebaseAnalytics/Frameworks/frameworks\"",
3345-
"\"$(PODS_ROOT)/FirebaseInstanceID/Frameworks/frameworks\"",
3346-
"\"$(PODS_ROOT)/FirebaseStorage/Frameworks/frameworks\"",
3347-
"\"$(PODS_ROOT)/GoogleAppUtilities/Frameworks/frameworks\"",
3348-
"\"$(PODS_ROOT)/GoogleInterchangeUtilities/Frameworks/frameworks\"",
3319+
"\"$(PODS_ROOT)/FirebaseAnalytics/Frameworks\"",
3320+
"\"$(PODS_ROOT)/FirebaseInstanceID/Frameworks\"",
3321+
"\"$(PODS_ROOT)/FirebaseStorage/Frameworks\"",
33493322
"\"$(PODS_ROOT)/GoogleSignIn/Frameworks\"",
3350-
"\"$(PODS_ROOT)/GoogleSymbolUtilities/Frameworks/frameworks\"",
33513323
"\"$(PODS_ROOT)/TwitterCore/iOS\"",
33523324
"\"$(PODS_ROOT)/TwitterKit/iOS\"",
33533325
);
@@ -3394,14 +3366,8 @@
33943366
"-framework",
33953367
"\"Foundation\"",
33963368
"-framework",
3397-
"\"GoogleAppUtilities\"",
3398-
"-framework",
3399-
"\"GoogleInterchangeUtilities\"",
3400-
"-framework",
34013369
"\"GoogleSignIn\"",
34023370
"-framework",
3403-
"\"GoogleSymbolUtilities\"",
3404-
"-framework",
34053371
"\"ImageIO\"",
34063372
"-framework",
34073373
"\"MobileCoreServices\"",

‎FirebaseUISample/FUIViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
//
1616

1717
#import "FUIViewController.h"
18-
#import <FirebaseAuth/FIRAuth.h>
18+
#import <FirebaseAuth/FirebaseAuth.h>
1919
#import <FirebaseAuthUI/FirebaseAuthUI.h>
2020
#import <FirebaseCore/FIRApp.h>
2121
#import <FirebaseGoogleAuthUI/FirebaseGoogleAuthUI.h>

0 commit comments

Comments
 (0)