Merge "Successful podspec build!"

Author: asciimike

FirebaseUI.podspec

@@ -1,50 +1,52 @@
 Pod::Spec.new do |s|
   s.name         = 'FirebaseUI'
-  s.version      = '1.0.0'
+  s.version      = '0.4.0'
   s.summary      = 'UI binding libraries for Firebase.'
   s.homepage     = 'https://github.com/firebase/FirebaseUI-iOS'
   s.license      = { :type => 'Apache License, Version 2.0', :file => 'LICENSE' }
   s.author       = { 'Firebase' => '[email protected]' }
-  s.source       = {
-    :git => 'https://github.com/firebase/FirebaseUI-iOS.git',
-    :tag => "v#{s.version}"}
+  s.source       = { :http => 'https://storage.googleapis.com/gcpstatic/FirebaseUIFrameworks.zip' }
   s.platform = :ios
   s.ios.deployment_target = '7.0'
   s.ios.framework = 'UIKit'
   s.requires_arc = true
-  s.default_subspecs = 'Database'
+  s.default_subspecs = 'All'
+
+  s.subspec 'All' do |all|
+    all.dependency 'FirebaseUI/Database'
+    all.dependency 'FirebaseUI/Auth'
+  end
 
   s.subspec 'Database' do |database|
-    database.source_files = "FirebaseUI/{Database,Util}/**/*.{h,m}"
+    database.vendored_frameworks = ["FirebaseUIFrameworks/Database/Frameworks/FirebaseDatabaseUI.framework"]
     database.dependency 'Firebase/Database', '~> 3.0'
-    database.ios.framework = 'FirebaseDatabase'
-    database.xcconfig  = { 'FRAMEWORK_SEARCH_PATHS' => '"${PODS_ROOT}/FirebaseDatabase/Frameworks"' }
   end
 
   s.subspec 'Auth' do |auth|
+    auth.dependency 'FirebaseUI/AuthBase'
     auth.dependency 'FirebaseUI/Facebook'
     auth.dependency 'FirebaseUI/Google'
   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.vendored_frameworks = ["FirebaseUIFrameworks/Auth/Frameworks/FirebaseAuthUI.framework"]
+    authbase.resources = ["FirebaseUIFrameworks/Auth/Resources/FirebaseAuthUIBundle.bundle"]
     authbase.dependency 'Firebase/Analytics', '~> 3.0'
     authbase.dependency 'Firebase/Auth', '~> 3.0'
-    authbase.xcconfig  = { 'FRAMEWORK_SEARCH_PATHS' => '"${PODS_ROOT}/FirebaseAuth/Frameworks"' }
   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.vendored_frameworks = ["FirebaseUIFrameworks/Facebook/Frameworks/FirebaseFacebookAuthUI.framework"]
+    facebook.resources = ["FirebaseUIFrameworks/Facebook/Resources/FirebaseFacebookAuthUI.bundle"]
     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.vendored_frameworks = ["FirebaseUIFrameworks/Google/Frameworks/FirebaseGoogleAuthUI.framework"]
+    google.resources = ["FirebaseUIFrameworks/Google/Resources/FirebaseGoogleAuthUI.bundle"]
     google.dependency 'FirebaseUI/AuthBase'
     google.dependency 'GoogleSignIn', '~> 4.0'
   end
+
 end

FirebaseUI.xcodeproj/project.pbxproj

@@ -19,10 +19,11 @@
 // clang-format on
 
 #import <Foundation/Foundation.h>
-#import <FirebaseUI/XCodeMacros.h>
 
 #import "FirebaseArrayDelegate.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @class FIRDatabaseQuery;
 @class FIRDatabaseReference;
 @class FIRDataSnapshot;
@@ -48,7 +49,7 @@
 /**
  * The delegate object that array changes are surfaced to.
  */
-@property(strong, nonatomic) NSMutableArray __GENERIC(FIRDataSnapshot *) * snapshots;
+@property(strong, nonatomic) NSMutableArray<FIRDataSnapshot *> * snapshots;
 
 #pragma mark -
 #pragma mark Initializer methods
@@ -118,3 +119,5 @@
 - (NSUInteger)indexForKey:(NSString *)key;
 
 @end
+
+NS_ASSUME_NONNULL_END