From 747a78e274ece47baa2952782969a512e13d2216 Mon Sep 17 00:00:00 2001 From: Morgan Chen Date: Thu, 31 Jan 2019 13:52:11 -0800 Subject: [PATCH 1/2] Fix OTP not being available when targeting lower versions of the iOS SDK --- PhoneAuth/FirebasePhoneAuthUI/FUICodeField.m | 4 ---- 1 file changed, 4 deletions(-) diff --git a/PhoneAuth/FirebasePhoneAuthUI/FUICodeField.m b/PhoneAuth/FirebasePhoneAuthUI/FUICodeField.m index 227b54591ec..b5110c267ab 100644 --- a/PhoneAuth/FirebasePhoneAuthUI/FUICodeField.m +++ b/PhoneAuth/FirebasePhoneAuthUI/FUICodeField.m @@ -59,11 +59,9 @@ - (void)setUpFromNib { UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; self.inputField.userInteractionEnabled = YES; -#if __IPHONE_OS_MIN_VERSION_REQUIRED > __IPHONE_12_0 if (@available(iOS 12.0, *)) { self.inputField.textContentType = UITextContentTypeOneTimeCode; } -#endif // __IPHONE_OS_MIN_VERSION_REQUIRED > __IPHONE_12_0 // Initialization code _codeEntry = [NSMutableString string]; @@ -175,11 +173,9 @@ - (CGSize)intrinsicContentSize { } - (UITextContentType _Null_unspecified)textContentType { -#if __IPHONE_OS_MIN_VERSION_REQUIRED > __IPHONE_12_0 if (@available(iOS 12.0, *)) { return UITextContentTypeOneTimeCode; } -#endif // __IPHONE_OS_MIN_VERSION_REQUIRED > __IPHONE_12_0 return nil; } From 64d4bdb32ea0f854fa6be3ceafe94d2346f46572 Mon Sep 17 00:00:00 2001 From: Morgan Chen Date: Tue, 5 Feb 2019 13:46:33 -0800 Subject: [PATCH 2/2] enable clang warning --- UITests/FirebaseUISample.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/UITests/FirebaseUISample.xcodeproj/project.pbxproj b/UITests/FirebaseUISample.xcodeproj/project.pbxproj index e0603103bc8..09fe5c0f10f 100644 --- a/UITests/FirebaseUISample.xcodeproj/project.pbxproj +++ b/UITests/FirebaseUISample.xcodeproj/project.pbxproj @@ -600,6 +600,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -659,6 +660,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";