diff --git a/.travis.yml b/.travis.yml
index 5f6a0ce973a..6196fa59c17 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,11 @@
-osx_image: xcode11
+osx_image: xcode11.3
 language: objective-c
 xcode_workspace: FirebaseUI.xcworkspace
 xcode_scheme: FirebaseUI
 
-rvm: 2.3.1
+rvm: 2.6.4
 before_install:
+  - gem update cocoapods
   - gem install bundler
   - bundle install
   - gem install xcpretty
diff --git a/PhoneAuth/FirebasePhoneAuthUI/FUICodeField.h b/PhoneAuth/FirebasePhoneAuthUI/FUICodeField.h
index 8b37845d8c8..858129e459b 100644
--- a/PhoneAuth/FirebasePhoneAuthUI/FUICodeField.h
+++ b/PhoneAuth/FirebasePhoneAuthUI/FUICodeField.h
@@ -39,6 +39,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, readonly) IBInspectable NSInteger codeLength;
 
+@property (null_unspecified, nonatomic, copy) UITextContentType textContentType;
+
 - (void)clearCodeInput;
 
 @end
diff --git a/PhoneAuth/FirebasePhoneAuthUI/FUICodeField.m b/PhoneAuth/FirebasePhoneAuthUI/FUICodeField.m
index ccf15768cb8..a5a3861fabd 100644
--- a/PhoneAuth/FirebasePhoneAuthUI/FUICodeField.m
+++ b/PhoneAuth/FirebasePhoneAuthUI/FUICodeField.m
@@ -59,6 +59,13 @@ - (void)setUpFromNib {
       UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
   self.inputField.userInteractionEnabled = YES;
 
+  if (@available(iOS 12.0, *)) {
+    if ([self.inputField respondsToSelector:@selector(setTextContentType:)]) {
+      id<UITextInputTraits> inputField = (id<UITextInputTraits>)self.inputField;
+      inputField.textContentType = UITextContentTypeOneTimeCode;
+    }
+  }
+
   // Initialization code
   _codeEntry = [NSMutableString string];
 
@@ -179,6 +186,10 @@ - (UITextContentType _Null_unspecified)textContentType {
   return nil;
 }
 
+- (void)setTextContentType:(_Null_unspecified UITextContentType)textContentType {
+  // do nothing
+}
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/PhoneAuth/Podfile.lock b/PhoneAuth/Podfile.lock
index 3043c9c28b4..9bc75172921 100644
--- a/PhoneAuth/Podfile.lock
+++ b/PhoneAuth/Podfile.lock
@@ -23,7 +23,7 @@ PODS:
     - GoogleUtilities/Logger (~> 6.5)
     - nanopb (~> 0.3.901)
   - FirebaseCoreDiagnosticsInterop (1.2.0)
-  - FirebaseUI/Auth (8.4.0):
+  - FirebaseUI/Auth (8.4.1):
     - Firebase/Auth (~> 6.0)
     - GoogleUtilities/UserDefaults
   - GoogleDataTransport (3.3.0)
@@ -84,7 +84,7 @@ SPEC CHECKSUMS:
   FirebaseCore: 4aeb81ff53dcd9a3634ca725dc1fb8c2a4622046
   FirebaseCoreDiagnostics: 5e78803ab276bc5b50340e3c539c06c3de35c649
   FirebaseCoreDiagnosticsInterop: 296e2c5f5314500a850ad0b83e9e7c10b011a850
-  FirebaseUI: 433550cb9e3d03ec7ee2c25f87493f76358d9b68
+  FirebaseUI: 69f7e480265758a9a9ea39915694b0949bcab23f
   GoogleDataTransport: 574a983e829327d7c18f2627f65d9e80164ea8a4
   GoogleDataTransportCCTSupport: cad3cd6cdbdbad6b5c2c9206ec413402755faaaa
   GoogleUtilities: f8de7ddf8c706f58e9b405d53e38bbdaa2731e5a
diff --git a/samples/swift/Podfile.lock b/samples/swift/Podfile.lock
index 356eded48cb..1a89664cd9b 100644
--- a/samples/swift/Podfile.lock
+++ b/samples/swift/Podfile.lock
@@ -233,39 +233,39 @@ PODS:
     - FirebaseAuthInterop (~> 1.0)
     - FirebaseCore (~> 6.0)
     - GTMSessionFetcher/Core (~> 1.1)
-  - FirebaseUI (8.4.0):
-    - FirebaseUI/Anonymous (= 8.4.0)
-    - FirebaseUI/Auth (= 8.4.0)
-    - FirebaseUI/Database (= 8.4.0)
-    - FirebaseUI/Email (= 8.4.0)
-    - FirebaseUI/Facebook (= 8.4.0)
-    - FirebaseUI/Firestore (= 8.4.0)
-    - FirebaseUI/Google (= 8.4.0)
-    - FirebaseUI/OAuth (= 8.4.0)
-    - FirebaseUI/Phone (= 8.4.0)
-    - FirebaseUI/Storage (= 8.4.0)
-  - FirebaseUI/Anonymous (8.4.0):
+  - FirebaseUI (8.4.1):
+    - FirebaseUI/Anonymous (= 8.4.1)
+    - FirebaseUI/Auth (= 8.4.1)
+    - FirebaseUI/Database (= 8.4.1)
+    - FirebaseUI/Email (= 8.4.1)
+    - FirebaseUI/Facebook (= 8.4.1)
+    - FirebaseUI/Firestore (= 8.4.1)
+    - FirebaseUI/Google (= 8.4.1)
+    - FirebaseUI/OAuth (= 8.4.1)
+    - FirebaseUI/Phone (= 8.4.1)
+    - FirebaseUI/Storage (= 8.4.1)
+  - FirebaseUI/Anonymous (8.4.1):
     - FirebaseUI/Auth
-  - FirebaseUI/Auth (8.4.0):
+  - FirebaseUI/Auth (8.4.1):
     - Firebase/Auth (~> 6.0)
     - GoogleUtilities/UserDefaults
-  - FirebaseUI/Database (8.4.0):
+  - FirebaseUI/Database (8.4.1):
     - Firebase/Database (~> 6.0)
-  - FirebaseUI/Email (8.4.0):
+  - FirebaseUI/Email (8.4.1):
     - FirebaseUI/Auth
-  - FirebaseUI/Facebook (8.4.0):
+  - FirebaseUI/Facebook (8.4.1):
     - FBSDKLoginKit (~> 5.0)
     - FirebaseUI/Auth
-  - FirebaseUI/Firestore (8.4.0):
+  - FirebaseUI/Firestore (8.4.1):
     - Firebase/Firestore
-  - FirebaseUI/Google (8.4.0):
+  - FirebaseUI/Google (8.4.1):
     - FirebaseUI/Auth
     - GoogleSignIn (~> 5.0)
-  - FirebaseUI/OAuth (8.4.0):
+  - FirebaseUI/OAuth (8.4.1):
     - FirebaseUI/Auth
-  - FirebaseUI/Phone (8.4.0):
+  - FirebaseUI/Phone (8.4.1):
     - FirebaseUI/Auth
-  - FirebaseUI/Storage (8.4.0):
+  - FirebaseUI/Storage (8.4.1):
     - Firebase/Storage (~> 6.0)
     - SDWebImage (~> 5.0)
   - GoogleDataTransport (3.3.0)
@@ -376,7 +376,7 @@ SPEC CHECKSUMS:
   FirebaseDatabase: 0144e0706a4761f1b0e8679572eba8095ddb59be
   FirebaseFirestore: b7e6adda31974dbd259fc25b541e8850420c92ed
   FirebaseStorage: 6c5263796af3b1be82ed173598aade47535fe125
-  FirebaseUI: 433550cb9e3d03ec7ee2c25f87493f76358d9b68
+  FirebaseUI: 69f7e480265758a9a9ea39915694b0949bcab23f
   GoogleDataTransport: 574a983e829327d7c18f2627f65d9e80164ea8a4
   GoogleDataTransportCCTSupport: cad3cd6cdbdbad6b5c2c9206ec413402755faaaa
   GoogleSignIn: 7137d297ddc022a7e0aa4619c86d72c909fa7213