Merge pull request #126 from morganchen12/builds

continue to build static targets for now

Author: morganchen12

FirebaseAuthUI/FIRAuthPickerViewController.xib

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>

FirebaseAuthUI/FirebaseAuthUI.h

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

FirebaseFacebookAuthUI/FIRFacebookAuthUI.h

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

FirebaseFacebookAuthUI/FIRFacebookAuthUI.m

@@ -20,7 +20,7 @@
 #import <FirebaseAuth/FIRUserInfo.h>
 #import <FBSDKCoreKit/FBSDKCoreKit.h>
 #import <FBSDKLoginKit/FBSDKLoginKit.h>
-#import <FIRAuthUIErrorUtils.h>
+#import <FirebaseAuthUI/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 <FIRAuthUI.h>
+#import <FirebaseAuthUI/FIRAuthUI.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

FirebaseGoogleAuthUI/FIRGoogleAuthUI.m

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

FirebaseUI.podspec

@@ -1,13 +1,13 @@
 Pod::Spec.new do |s|
   s.name         = 'FirebaseUI'
-  s.version      = '0.5.3'
+  s.version      = '0.5.4'
   s.summary      = 'UI binding libraries for Firebase.'
   s.homepage     = 'https://github.com/firebase/FirebaseUI-iOS'
   s.license      = { :type => 'Apache 2.0', :file => 'FirebaseUIFrameworks/LICENSE' }
   s.author       = 'Firebase'
-  s.source       = { :http => 'https://github.com/firebase/FirebaseUI-iOS/releases/download/0.5.3/FirebaseUIFrameworks.zip' }
+  s.source       = { :http => 'https://github.com/firebase/FirebaseUI-iOS/releases/download/0.5.4/FirebaseUIFrameworks.zip' }
   s.platform = :ios
-  s.ios.deployment_target = '8.0'
+  s.ios.deployment_target = '7.0'
   s.ios.framework = 'UIKit'
   s.requires_arc = true
   s.default_subspecs = 'All'

FirebaseUI.xcodeproj/project.pbxproj

@@ -51,3 +51,24 @@ target 'FirebaseGoogleAuthUI' do
   end
 end
 
+target 'Database' do
+  # Pods for Database
+  pod 'Firebase/Database'
+end
+
+target 'Auth' do
+  # Pods for Auth
+  pod 'Firebase/Auth'
+end
+
+target 'Facebook' do
+  # Pods for Facebook Auth
+  pod 'Firebase/Auth'
+  pod 'FBSDKLoginKit', '~> 4.0'
+end
+
+target 'Google' do
+  # Pods for Google Auth
+  pod 'Firebase/Auth'
+  pod 'GoogleSignIn', '~> 4.0'
+end

Podfile

@@ -102,6 +102,13 @@ let schemes = [
   "FirebaseGoogleAuthUI",
 ]
 
+let staticLibs = [
+  "Database": "FirebaseDatabaseUI",
+  "Auth"    : "FirebaseAuthUI",
+  "Facebook": "FirebaseFacebookAuthUI",
+  "Google"  : "FirebaseGoogleAuthUI",
+]
+
 // make folder structure for built products
 schemes.forEach { scheme in
   let schemeDir = BuiltProductsDir + scheme
@@ -110,9 +117,23 @@ schemes.forEach { scheme in
 }
 
 // Invoke xcodebuild, building each scheme in
-// release for each target sdk
-let builds = sdks.flatMap { sdk in
-  return schemes.map { scheme in
+// release for each target sdk. Building
+// dynamic frameworks so we don't have to do
+// the asset bundling and folder structures manually,
+// at the costs of lots of duplication. Not sure if ideal.
+let builds =  schemes.map { scheme in
+  return Build([
+    "-workspace"      : "FirebaseUI.xcworkspace",
+    "-scheme"         : scheme,
+    "-configuration"  : "Release",
+    "-sdk"            : sdks[0],
+    "-derivedDataPath": DerivedDataDir,
+  ])
+}
+
+let staticBuilds: [Build] = sdks.flatMap { sdk -> [Build] in
+  let schemeNames = Array(staticLibs.keys)
+  return schemeNames.map { scheme -> Build in
     return Build([
       "-workspace"      : "FirebaseUI.xcworkspace",
       "-scheme"         : scheme,
@@ -124,6 +145,7 @@ let builds = sdks.flatMap { sdk in
 }
 
 builds.forEach { $0.launch() }
+staticBuilds.forEach { $0.launch() }
 
 // Copy frameworks into built products dir. Don't really
 // care about sdk here since we're gonna lipo everything later
@@ -161,16 +183,16 @@ let productsPaths = sdks.map {
 }
 
 // create lipo tasks from built products
-let lipos: [Lipo] = schemes.map { scheme in
-  let framework = "\(scheme).framework"
-  let binary = scheme
+let lipos: [Lipo] = Array(staticLibs.keys).map { scheme in
+  let product = staticLibs[scheme]!
+  let framework = "\(product).framework"
+  let binary = "lib\(scheme).a"
 
-  let lib = "\(scheme).framework/\(scheme)"
   let chunks = productsPaths.map { path in
-    return path + lib
+    return path + binary
   }
 
-  let output = "\(BuiltProductsDir)\(scheme)/Frameworks/\(framework)/\(binary)"
+  let output = "\(BuiltProductsDir)\(product)/Frameworks/\(framework)/\(product)"
   return Lipo(inputs: chunks, output: output)
 }