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)
 }
 

build.swift

@@ -7,8 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		433E703692A371C84E532086 /* Pods_uidemoTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 45B7A43C757A128633BBDAFF /* Pods_uidemoTests.framework */; };
-		6001626D469756A781BC0C1D /* Pods_uidemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0B23F4C2DB9A671802E1E31 /* Pods_uidemo.framework */; };
 		8D16073E1D492B200069E4F5 /* AuthViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D16073D1D492B200069E4F5 /* AuthViewController.swift */; };
 		8DABC9891D3D82D600453807 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DABC9881D3D82D600453807 /* AppDelegate.swift */; };
 		8DABC98B1D3D82D600453807 /* MenuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DABC98A1D3D82D600453807 /* MenuViewController.swift */; };
@@ -19,6 +17,7 @@
 		8DABC9A91D3D872C00453807 /* Sample.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DABC9A81D3D872C00453807 /* Sample.swift */; };
 		8DABC9AB1D3D947300453807 /* SampleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DABC9AA1D3D947300453807 /* SampleCell.swift */; };
 		8DABC9AD1D3D9EAF00453807 /* ChatViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DABC9AC1D3D9EAF00453807 /* ChatViewController.swift */; };
+		8DD51E371D873B0D00E2CA51 /* UIStoryboardExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DD51E361D873B0D00E2CA51 /* UIStoryboardExtension.swift */; };
 		8DDF1AE51D3FF67D001F1160 /* ChatCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DDF1AE41D3FF67D001F1160 /* ChatCollectionViewCell.swift */; };
 		C3F23ECD1D80F3300020509F /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C3F23ECC1D80F3300020509F /* GoogleService-Info.plist */; };
 /* End PBXBuildFile section */
@@ -34,10 +33,6 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		45B7A43C757A128633BBDAFF /* Pods_uidemoTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_uidemoTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		4C4F100F73AB7282D3071228 /* Pods-uidemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-uidemo.release.xcconfig"; path = "Pods/Target Support Files/Pods-uidemo/Pods-uidemo.release.xcconfig"; sourceTree = "<group>"; };
-		74B1CFAE0F3BD0D456DFCC76 /* Pods-uidemoTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-uidemoTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-uidemoTests/Pods-uidemoTests.debug.xcconfig"; sourceTree = "<group>"; };
-		8C5E1A3D7FD94BB28A092EBC /* Pods-uidemoTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-uidemoTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-uidemoTests/Pods-uidemoTests.release.xcconfig"; sourceTree = "<group>"; };
 		8D16073D1D492B200069E4F5 /* AuthViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AuthViewController.swift; sourceTree = "<group>"; };
 		8DABC9851D3D82D600453807 /* uidemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = uidemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		8DABC9881D3D82D600453807 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -52,26 +47,23 @@
 		8DABC9A81D3D872C00453807 /* Sample.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Sample.swift; sourceTree = "<group>"; };
 		8DABC9AA1D3D947300453807 /* SampleCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SampleCell.swift; sourceTree = "<group>"; };
 		8DABC9AC1D3D9EAF00453807 /* ChatViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatViewController.swift; sourceTree = "<group>"; };
+		8DD51E361D873B0D00E2CA51 /* UIStoryboardExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIStoryboardExtension.swift; sourceTree = "<group>"; };
 		8DDF1AE41D3FF67D001F1160 /* ChatCollectionViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatCollectionViewCell.swift; sourceTree = "<group>"; };
-		C0B23F4C2DB9A671802E1E31 /* Pods_uidemo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_uidemo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		C3F23ECC1D80F3300020509F /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
-		CB9DA206245B6BEB7500A66A /* Pods-uidemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-uidemo.debug.xcconfig"; path = "Pods/Target Support Files/Pods-uidemo/Pods-uidemo.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		8DABC9821D3D82D600453807 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6001626D469756A781BC0C1D /* Pods_uidemo.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		8DABC9961D3D82D600453807 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				433E703692A371C84E532086 /* Pods_uidemoTests.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -94,8 +86,6 @@
 				8DABC9871D3D82D600453807 /* uidemo */,
 				8DABC99C1D3D82D600453807 /* uidemoTests */,
 				8DABC9861D3D82D600453807 /* Products */,
-				94250E737FC3C4C5C6F2681A /* Pods */,
-				F6DBA04B6C438DF62F38F922 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -115,6 +105,7 @@
 				8DABC98A1D3D82D600453807 /* MenuViewController.swift */,
 				8DABC9AA1D3D947300453807 /* SampleCell.swift */,
 				8DABC9A81D3D872C00453807 /* Sample.swift */,
+				8DD51E361D873B0D00E2CA51 /* UIStoryboardExtension.swift */,
 				8DD17C951D4BCC6500E850E4 /* AuthSample */,
 				8D643F0F1D4827F10081F979 /* ChatSample */,
 				8DABC98C1D3D82D600453807 /* Main.storyboard */,
@@ -142,26 +133,6 @@
 			name = AuthSample;
 			sourceTree = "<group>";
 		};
-		94250E737FC3C4C5C6F2681A /* Pods */ = {
-			isa = PBXGroup;
-			children = (
-				CB9DA206245B6BEB7500A66A /* Pods-uidemo.debug.xcconfig */,
-				4C4F100F73AB7282D3071228 /* Pods-uidemo.release.xcconfig */,
-				74B1CFAE0F3BD0D456DFCC76 /* Pods-uidemoTests.debug.xcconfig */,
-				8C5E1A3D7FD94BB28A092EBC /* Pods-uidemoTests.release.xcconfig */,
-			);
-			name = Pods;
-			sourceTree = "<group>";
-		};
-		F6DBA04B6C438DF62F38F922 /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				C0B23F4C2DB9A671802E1E31 /* Pods_uidemo.framework */,
-				45B7A43C757A128633BBDAFF /* Pods_uidemoTests.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -365,6 +336,7 @@
 			files = (
 				8DABC98B1D3D82D600453807 /* MenuViewController.swift in Sources */,
 				8DABC9AB1D3D947300453807 /* SampleCell.swift in Sources */,
+				8DD51E371D873B0D00E2CA51 /* UIStoryboardExtension.swift in Sources */,
 				8DABC9A91D3D872C00453807 /* Sample.swift in Sources */,
 				8D16073E1D492B200069E4F5 /* AuthViewController.swift in Sources */,
 				8DABC9AD1D3D9EAF00453807 /* ChatViewController.swift in Sources */,
@@ -415,6 +387,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				BITCODE_GENERATION_MODE = bitcode;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -461,6 +434,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				BITCODE_GENERATION_MODE = bitcode;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -498,9 +472,9 @@
 		};
 		8DABC9A31D3D82D600453807 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = CB9DA206245B6BEB7500A66A /* Pods-uidemo.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				BITCODE_GENERATION_MODE = "";
 				CLANG_ENABLE_MODULES = YES;
 				INFOPLIST_FILE = uidemo/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -513,9 +487,9 @@
 		};
 		8DABC9A41D3D82D600453807 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 4C4F100F73AB7282D3071228 /* Pods-uidemo.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				BITCODE_GENERATION_MODE = "";
 				CLANG_ENABLE_MODULES = YES;
 				INFOPLIST_FILE = uidemo/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -527,7 +501,6 @@
 		};
 		8DABC9A61D3D82D600453807 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 74B1CFAE0F3BD0D456DFCC76 /* Pods-uidemoTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				INFOPLIST_FILE = uidemoTests/Info.plist;
@@ -540,7 +513,6 @@
 		};
 		8DABC9A71D3D82D600453807 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 8C5E1A3D7FD94BB28A092EBC /* Pods-uidemoTests.release.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				INFOPLIST_FILE = uidemoTests/Info.plist;