Merge branch 'master' of github.com:firebase/FirebaseUI-iOS

Author: morganchen12

CONTRIBUTING.md

@@ -12,15 +12,26 @@ need to be sure of various other things—for instance that you'll tell us if yo
 know that your code infringes on other people's patents. You don't have to sign
 the CLA until after you've submitted your code for review and a member has
 approved it, but you must do it before we can put your code into our codebase.
+
+### Adding new features
+
 Before you start working on a larger contribution, you should get in touch with
 us first through the issue tracker with your idea so that we can help out and
 possibly guide you. Coordinating up front makes it much easier to avoid
 frustration later on.
 
+If this has been discussed in an issue, make sure to mention the issue number.
+If not, go file an issue about this to make sure this is a desirable change.
+
+If this is a new feature please co-ordinate with someone on [FirebaseUI-Android](https://github.com/firebase/FirebaseUI-Android)
+to make sure that we can implement this on both platforms and maintain feature parity.
+Feature parity (where it makes sense) is a strict requirement for feature development in FirebaseUI.
+
 ### Code reviews
 
 All submissions, including submissions by project members, require review. We
-use Github pull requests for this purpose.
+use Github pull requests for this purpose. We adhere to the
+[Google Objective-C style guide](https://google.github.io/styleguide/objcguide.xml).
 
 ### The small print
 

FirebaseAuthUI/FirebaseAuthUI.h

@@ -22,9 +22,9 @@ FOUNDATION_EXPORT double FirebaseAuthUIVersionNumber;
 //! Project version string for FirebaseAuthUI.
 FOUNDATION_EXPORT const unsigned char FirebaseAuthUIVersionString[];
 
-#import <FirebaseAuthUI/FIRAuthPickerViewController.h>
-#import <FirebaseAuthUI/FIRAuthProviderUI.h>
-#import <FirebaseAuthUI/FIRAuthUI.h>
-#import <FirebaseAuthUI/FIRAuthUIBaseViewController.h>
-#import <FirebaseAuthUI/FIRAuthUIErrorUtils.h>
+#import <FIRAuthPickerViewController.h>
+#import <FIRAuthProviderUI.h>
+#import <FIRAuthUI.h>
+#import <FIRAuthUIBaseViewController.h>
+#import <FIRAuthUIErrorUtils.h>
 

FirebaseFacebookAuthUI/FIRFacebookAuthUI.h

@@ -14,7 +14,7 @@
 //  limitations under the License.
 //
 
-@import FirebaseAuthUI;
+#import <FIRAuthUI.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

FirebaseFacebookAuthUI/FIRFacebookAuthUI.m

@@ -20,6 +20,7 @@
 #import <FirebaseAuth/FIRUserInfo.h>
 #import <FBSDKCoreKit/FBSDKCoreKit.h>
 #import <FBSDKLoginKit/FBSDKLoginKit.h>
+#import <FIRAuthUIErrorUtils.h>
 
 /** @var kBundleFileName
     @brief The name of the bundle containing Facebook auth provider assets/resources.

FirebaseGoogleAuthUI/FIRGoogleAuthUI.h

@@ -14,7 +14,7 @@
 //  limitations under the License.
 //
 
-@import FirebaseAuthUI;
+#import <FIRAuthUI.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

FirebaseGoogleAuthUI/FIRGoogleAuthUI.m

@@ -19,6 +19,7 @@
 #import <GoogleSignIn/GoogleSignIn.h>
 #import <FirebaseAuth/FIRGoogleAuthProvider.h>
 #import <FirebaseAuth/FIRUserInfo.h>
+#import <FIRAuthUIErrorUtils.h>
 
 /** @var kGoogleGamesScope
     @brief The OAuth scope string for the "Games" scope.

FirebaseUI_dev.podspec

@@ -18,7 +18,7 @@ Pod::Spec.new do |s|
   end
 
   s.subspec 'Database' do |database|
-    database.source_files = "FirebaseUI/{Database,Util}/**/*.{h,m}"
+    database.source_files = "FirebaseDatabaseUI/*.{h,m}"
     database.dependency 'Firebase/Database', '~> 3.0'
     database.ios.framework = 'FirebaseDatabase'
     database.xcconfig  = { 'FRAMEWORK_SEARCH_PATHS' => '"${PODS_ROOT}/FirebaseDatabase/Frameworks"','HEADER_SEARCH_PATHS' => '"${PODS_ROOT}/Firebase/**"' }
@@ -31,22 +31,22 @@ Pod::Spec.new do |s|
   end
 
   s.subspec 'AuthBase' do |authbase|
-    authbase.source_files = "FirebaseUI/Auth/AuthUI/Source/*.{h,m}"
-    authbase.resources = "FirebaseUI/Auth/AuthUI/{Resources,Strings}/*", "FirebaseUI/Auth/AuthUI/Source/*.xib"
+    authbase.source_files = "FirebaseAuthUI/*.{h,m}"
+    authbase.resources = "FirebaseAuthUI/{Resources,Strings}/*", "FirebaseAuthUI/*.xib"
     authbase.dependency 'Firebase/Analytics', '~> 3.0'
     authbase.dependency 'Firebase/Auth', '~> 3.0'
   end
 
   s.subspec 'Facebook' do |facebook|
-    facebook.source_files = "FirebaseUI/Auth/AuthProviderUI/Facebook/Source/*.{h,m}"
-    facebook.resources = "FirebaseUI/Auth/AuthProviderUI/Facebook/{Resources,Strings}/*", "FirebaseUI/Auth/AuthProviderUI/Facebook/Source/*.xib"
+    facebook.source_files = "FirebaseFacebookAuthUI/*.{h,m}"
+    facebook.resources = "FirebaseFacebookAuthUI/{Resources,Strings}/*", "FirebaseFacebookAuthUI/*.xib"
     facebook.dependency 'FirebaseUI/AuthBase'
     facebook.dependency 'FBSDKLoginKit', '~> 4.0'
   end
 
   s.subspec 'Google' do |google|
-    google.source_files = "FirebaseUI/Auth/AuthProviderUI/Google/Source/*.{h,m}"
-    google.resources = "FirebaseUI/Auth/AuthProviderUI/Google/{Resources,Strings}/*", "FirebaseUI/Auth/AuthProviderUI/Google/Source/*.xib"
+    google.source_files = "FirebaseGoogleAuthUI/*.{h,m}"
+    google.resources = "FirebaseGoogleAuthUI/{Resources,Strings}/*", "FirebaseGoogleAuthUI/*.xib"
     google.dependency 'FirebaseUI/AuthBase'
     google.dependency 'GoogleSignIn', '~> 4.0'
   end