Skip to content

Commit 0e65c14

Browse files
morganchen12morganchen12
authored
Merge pull request #596 from morganchen12/master
Fix missing headers in EmailAuth
2 parents 79908f6 + bc49d1e commit 0e65c14

20 files changed

+45
-25
lines changed

‎Auth/FirebaseAuthUI/FUIAuthStrings.m‎

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

17-
@import FirebaseCore;
17+
#import <FirebaseCore/FirebaseCore.h>
1818

1919
#import "FUIAuthStrings.h"
2020

‎EmailAuth/FirebaseEmailAuthUI.xcodeproj/project.pbxproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@
1111
8D69E37421DD623F00CFA49B /* FirebaseEmailAuthUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D69E37321DD623F00CFA49B /* FirebaseEmailAuthUITests.m */; };
1212
8D69E37621DD623F00CFA49B /* FirebaseEmailAuthUI.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D69E36821DD623F00CFA49B /* FirebaseEmailAuthUI.h */; settings = {ATTRIBUTES = (Public, ); }; };
1313
8D69E38F21DD63B300CFA49B /* FUIPasswordSignInViewController_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D69E37F21DD63B200CFA49B /* FUIPasswordSignInViewController_Internal.h */; };
14-
8D69E39021DD63B300CFA49B /* FUIPasswordSignUpViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D69E38021DD63B200CFA49B /* FUIPasswordSignUpViewController.h */; };
14+
8D69E39021DD63B300CFA49B /* FUIPasswordSignUpViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D69E38021DD63B200CFA49B /* FUIPasswordSignUpViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
1515
8D69E39121DD63B300CFA49B /* FUIEmailAuth.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D69E38121DD63B200CFA49B /* FUIEmailAuth.h */; settings = {ATTRIBUTES = (Public, ); }; };
1616
8D69E39221DD63B300CFA49B /* FUIEmailEntryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D69E38221DD63B200CFA49B /* FUIEmailEntryViewController.m */; };
17-
8D69E39321DD63B300CFA49B /* FUIPasswordVerificationViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D69E38321DD63B200CFA49B /* FUIPasswordVerificationViewController.h */; };
17+
8D69E39321DD63B300CFA49B /* FUIPasswordVerificationViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D69E38321DD63B200CFA49B /* FUIPasswordVerificationViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
1818
8D69E39421DD63B300CFA49B /* FUIEmailAuthStrings.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D69E38421DD63B200CFA49B /* FUIEmailAuthStrings.h */; };
1919
8D69E39521DD63B300CFA49B /* FUIEmailAuth_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D69E38521DD63B200CFA49B /* FUIEmailAuth_Internal.h */; };
2020
8D69E39621DD63B300CFA49B /* FUIPasswordSignUpViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D69E38621DD63B200CFA49B /* FUIPasswordSignUpViewController.m */; };
2121
8D69E39721DD63B300CFA49B /* FUIPasswordVerificationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D69E38721DD63B200CFA49B /* FUIPasswordVerificationViewController.m */; };
22-
8D69E39821DD63B300CFA49B /* FUIEmailEntryViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D69E38821DD63B200CFA49B /* FUIEmailEntryViewController.h */; };
22+
8D69E39821DD63B300CFA49B /* FUIEmailEntryViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D69E38821DD63B200CFA49B /* FUIEmailEntryViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
2323
8D69E39921DD63B300CFA49B /* FUIEmailAuthStrings.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D69E38921DD63B300CFA49B /* FUIEmailAuthStrings.m */; };
24-
8D69E39A21DD63B300CFA49B /* FUIPasswordSignInViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D69E38A21DD63B300CFA49B /* FUIPasswordSignInViewController.h */; };
25-
8D69E39B21DD63B300CFA49B /* FUIPasswordRecoveryViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D69E38B21DD63B300CFA49B /* FUIPasswordRecoveryViewController.h */; };
24+
8D69E39A21DD63B300CFA49B /* FUIPasswordSignInViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D69E38A21DD63B300CFA49B /* FUIPasswordSignInViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
25+
8D69E39B21DD63B300CFA49B /* FUIPasswordRecoveryViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D69E38B21DD63B300CFA49B /* FUIPasswordRecoveryViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
2626
8D69E39C21DD63B300CFA49B /* FUIPasswordRecoveryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D69E38C21DD63B300CFA49B /* FUIPasswordRecoveryViewController.m */; };
2727
8D69E39D21DD63B300CFA49B /* FUIPasswordSignInViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D69E38D21DD63B300CFA49B /* FUIPasswordSignInViewController.m */; };
2828
8D69E39E21DD63B300CFA49B /* FUIEmailAuth.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D69E38E21DD63B300CFA49B /* FUIEmailAuth.m */; };

‎EmailAuth/FirebaseEmailAuthUI/FirebaseEmailAuthUI.h‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,8 @@ FOUNDATION_EXPORT double FirebaseEmailAuthUIVersionNumber;
2323
FOUNDATION_EXPORT const unsigned char FirebaseEmailAuthUIVersionString[];
2424

2525
#import "FUIEmailAuth.h"
26-
26+
#import "FUIEmailEntryViewController.h"
27+
#import "FUIPasswordRecoveryViewController.h"
28+
#import "FUIPasswordVerificationViewController.h"
29+
#import "FUIPasswordSignInViewController.h"
30+
#import "FUIPasswordSignUpViewController.h"

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

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@
327327
D81A05E81B86A78700498183 /* Project object */ = {
328328
isa = PBXProject;
329329
attributes = {
330-
LastUpgradeCheck = 0830;
330+
LastUpgradeCheck = 1010;
331331
ORGANIZATIONNAME = "Firebase, Inc.";
332332
TargetAttributes = {
333333
D81A05EF1B86A78700498183 = {
@@ -597,14 +597,22 @@
597597
CLANG_CXX_LIBRARY = "libc++";
598598
CLANG_ENABLE_MODULES = YES;
599599
CLANG_ENABLE_OBJC_ARC = YES;
600+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
600601
CLANG_WARN_BOOL_CONVERSION = YES;
602+
CLANG_WARN_COMMA = YES;
601603
CLANG_WARN_CONSTANT_CONVERSION = YES;
604+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
602605
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
603606
CLANG_WARN_EMPTY_BODY = YES;
604607
CLANG_WARN_ENUM_CONVERSION = YES;
605608
CLANG_WARN_INFINITE_RECURSION = YES;
606609
CLANG_WARN_INT_CONVERSION = YES;
610+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
611+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
612+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
607613
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
614+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
615+
CLANG_WARN_STRICT_PROTOTYPES = YES;
608616
CLANG_WARN_SUSPICIOUS_MOVE = YES;
609617
CLANG_WARN_UNREACHABLE_CODE = YES;
610618
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -644,14 +652,22 @@
644652
CLANG_CXX_LIBRARY = "libc++";
645653
CLANG_ENABLE_MODULES = YES;
646654
CLANG_ENABLE_OBJC_ARC = YES;
655+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
647656
CLANG_WARN_BOOL_CONVERSION = YES;
657+
CLANG_WARN_COMMA = YES;
648658
CLANG_WARN_CONSTANT_CONVERSION = YES;
659+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
649660
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
650661
CLANG_WARN_EMPTY_BODY = YES;
651662
CLANG_WARN_ENUM_CONVERSION = YES;
652663
CLANG_WARN_INFINITE_RECURSION = YES;
653664
CLANG_WARN_INT_CONVERSION = YES;
665+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
666+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
667+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
654668
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
669+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
670+
CLANG_WARN_STRICT_PROTOTYPES = YES;
655671
CLANG_WARN_SUSPICIOUS_MOVE = YES;
656672
CLANG_WARN_UNREACHABLE_CODE = YES;
657673
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

‎samples/objc/FirebaseUI-demo-objc.xcodeproj/xcshareddata/xcschemes/FirebaseUI-demo-objc.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 = "0830"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎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;
20+
#import <FirebaseUI/FirebaseUI.h>
2121
#import <GTMSessionFetcher/GTMSessionFetcherLogging.h>
2222
#import <TwitterKit/TWTRTwitter.h>
2323

‎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;
19+
#import <FirebaseUI/FirebaseUI.h>
2020

2121
#import "FUISamplesViewController.h"
2222

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

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

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

2222
#import "FUIAuthViewController.h"
2323
#import "FUIAppDelegate.h"

‎samples/objc/FirebaseUI-demo-objc/Samples/Auth/FUICustomAuthDelegate.h‎

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;
19+
#import <FirebaseUI/FirebaseUI.h>
2020

2121
@interface FUICustomAuthDelegate : NSObject <FUIAuthDelegate>
2222

‎samples/objc/FirebaseUI-demo-objc/Samples/Auth/FUICustomAuthPickerViewController.h‎

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;
19+
#import <FirebaseUI/FirebaseUI.h>
2020

2121
@interface FUICustomAuthPickerViewController : FUIAuthPickerViewController
2222

0 commit comments

Comments
 (0)