Skip to content

Commit 7457a9f

Browse files
asciimikeasciimike
committed
Fixes pertaining to #22 and #23:
 1. setup.sh now has "current" version of Facebook sdk (Google doesn't have current, so just updated to 2.4.0) 2. FirebaseUI pod is now split into /Code and /Auth 3. No more FirebaseUI.h, as it doesn't make sense with subspecs (so a single import no longer does everything) These are technically all breaking changes, but given that things are still in development, we won't be sticking too strictly to semver.
1 parent 537e28b commit 7457a9f

File tree

7 files changed

+32
-91
lines changed

7 files changed

+32
-91
lines changed

‎FirebaseUI.podspec

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,23 @@ Pod::Spec.new do |s|
77
s.author = { "Firebase" => "[email protected]" }
88
s.social_media_url = "https://twitter.com/firebase"
99
s.source = { :git => "https://github.com/firebase/FirebaseUI-iOS.git", :tag => 'v0.3.1' }
10-
s.source_files = "FirebaseUI/**/*.{h,m}"
11-
s.resources = "FirebaseUI/**/Resources/*"
12-
s.dependency "Firebase", "~>2.2"
13-
s.dependency "FBSDKCoreKit"
14-
s.dependency "FBSDKLoginKit"
15-
s.dependency "Google/SignIn"
1610
s.platform = :ios
1711
s.ios.deployment_target = "8.0"
18-
s.ios.framework = "UIKit", "Accounts"
12+
s.dependency "Firebase", "~>2.2"
13+
s.ios.framework = "UIKit"
1914
s.xcconfig = { 'FRAMEWORK_SEARCH_PATHS' => '"$(PODS_ROOT)/Firebase"' }
2015
s.requires_arc = true
21-
end
16+
17+
s.subspec 'Core' do |core|
18+
core.source_files = "FirebaseUI/{Core,Util}/**/*.{h,m}"
19+
end
20+
21+
s.subspec 'Auth' do |auth|
22+
auth.source_files = "FirebaseUI/Auth/**/*.{h,m}"
23+
auth.resources = "FirebaseUI/Auth/Resources/*"
24+
auth.dependency "FBSDKCoreKit"
25+
auth.dependency "FBSDKLoginKit"
26+
auth.dependency "Google/SignIn"
27+
auth.ios.framework = "Accounts"
28+
end
29+
end

‎FirebaseUI.xcodeproj/project.pbxproj

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -40,29 +40,27 @@
4040
BBF6D4161BA19CDF00C644A7 /* FirebaseFacebookAuthProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = BB6AC2131BA06AC300A10461 /* FirebaseFacebookAuthProvider.h */; settings = {ATTRIBUTES = (Public, ); }; };
4141
BBF6D41B1BA1FFAD00C644A7 /* FirebaseGoogleAuthProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = BBF6D41A1BA1FFAD00C644A7 /* FirebaseGoogleAuthProvider.m */; };
4242
BBF6D5771BA345E600C644A7 /* FirebaseAuthProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = BBF6D5761BA33AC300C644A7 /* FirebaseAuthProvider.h */; settings = {ATTRIBUTES = (Public, ); }; };
43-
D809A11E1BF67095000257AA /* FirebaseAuthConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = D809A11D1BF67095000257AA /* FirebaseAuthConstants.m */; settings = {ASSET_TAGS = (); }; };
43+
D809A11E1BF67095000257AA /* FirebaseAuthConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = D809A11D1BF67095000257AA /* FirebaseAuthConstants.m */; };
4444
D809A1271BF6FF6C000257AA /* FirebaseLoginViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = D809A1241BF6FF6C000257AA /* FirebaseLoginViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
45-
D809A1311BF7ECB0000257AA /* FirebaseLoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D809A1301BF7ECB0000257AA /* FirebaseLoginViewController.m */; settings = {ASSET_TAGS = (); }; };
46-
D809A1661BFBAC7F000257AA /* FirebaseLoginViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D809A1651BFBAC7F000257AA /* FirebaseLoginViewController.xib */; settings = {ASSET_TAGS = (); }; };
47-
D809A16A1BFBAECA000257AA /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D809A1691BFBAECA000257AA /* Assets.xcassets */; settings = {ASSET_TAGS = (); }; };
45+
D809A1311BF7ECB0000257AA /* FirebaseLoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D809A1301BF7ECB0000257AA /* FirebaseLoginViewController.m */; };
46+
D809A1661BFBAC7F000257AA /* FirebaseLoginViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D809A1651BFBAC7F000257AA /* FirebaseLoginViewController.xib */; };
47+
D809A16A1BFBAECA000257AA /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D809A1691BFBAECA000257AA /* Assets.xcassets */; };
4848
D809A16D1BFBE242000257AA /* FirebaseLoginButton.h in Headers */ = {isa = PBXBuildFile; fileRef = D809A16B1BFBE242000257AA /* FirebaseLoginButton.h */; settings = {ATTRIBUTES = (Public, ); }; };
49-
D809A1701BFBE5F9000257AA /* FirebaseLoginButton.m in Sources */ = {isa = PBXBuildFile; fileRef = D809A16F1BFBE5F9000257AA /* FirebaseLoginButton.m */; settings = {ASSET_TAGS = (); }; };
49+
D809A1701BFBE5F9000257AA /* FirebaseLoginButton.m in Sources */ = {isa = PBXBuildFile; fileRef = D809A16F1BFBE5F9000257AA /* FirebaseLoginButton.m */; };
5050
D809A1721BFCF23B000257AA /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D809A1711BFCF23B000257AA /* Accounts.framework */; };
5151
D8124F441B72C94E003441AD /* Firebase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8124F401B72A90C003441AD /* Firebase.framework */; };
5252
D81495F11BF5AF280099AE10 /* FirebaseArray.h in Headers */ = {isa = PBXBuildFile; fileRef = D81495EB1BF5AF280099AE10 /* FirebaseArray.h */; settings = {ATTRIBUTES = (Public, ); }; };
5353
D81495F21BF5AF280099AE10 /* FirebaseArrayDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = D81495EC1BF5AF280099AE10 /* FirebaseArrayDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
5454
D81495F31BF5AF280099AE10 /* FirebaseCollectionViewDataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = D81495ED1BF5AF280099AE10 /* FirebaseCollectionViewDataSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
5555
D81495F41BF5AF280099AE10 /* FirebaseDataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = D81495EE1BF5AF280099AE10 /* FirebaseDataSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
5656
D81495F51BF5AF280099AE10 /* FirebaseTableViewDataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = D81495EF1BF5AF280099AE10 /* FirebaseTableViewDataSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
57-
D81495F61BF5AF280099AE10 /* FirebaseUI.h in Headers */ = {isa = PBXBuildFile; fileRef = D81495F01BF5AF280099AE10 /* FirebaseUI.h */; settings = {ATTRIBUTES = (Public, ); }; };
58-
D81495FC1BF5AF460099AE10 /* FirebaseArray.m in Sources */ = {isa = PBXBuildFile; fileRef = D81495F71BF5AF460099AE10 /* FirebaseArray.m */; settings = {ASSET_TAGS = (); }; };
59-
D81495FD1BF5AF460099AE10 /* FirebaseCollectionViewDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = D81495F81BF5AF460099AE10 /* FirebaseCollectionViewDataSource.m */; settings = {ASSET_TAGS = (); }; };
60-
D81495FE1BF5AF460099AE10 /* FirebaseDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = D81495F91BF5AF460099AE10 /* FirebaseDataSource.m */; settings = {ASSET_TAGS = (); }; };
61-
D81495FF1BF5AF460099AE10 /* FirebaseTableViewDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = D81495FA1BF5AF460099AE10 /* FirebaseTableViewDataSource.m */; settings = {ASSET_TAGS = (); }; };
62-
D81496001BF5AF460099AE10 /* FirebaseUI.m in Sources */ = {isa = PBXBuildFile; fileRef = D81495FB1BF5AF460099AE10 /* FirebaseUI.m */; settings = {ASSET_TAGS = (); }; };
63-
D81496061BF5B92C0099AE10 /* FirebasePasswordAuthProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = D81496051BF5B92C0099AE10 /* FirebasePasswordAuthProvider.m */; settings = {ASSET_TAGS = (); }; };
57+
D81495FC1BF5AF460099AE10 /* FirebaseArray.m in Sources */ = {isa = PBXBuildFile; fileRef = D81495F71BF5AF460099AE10 /* FirebaseArray.m */; };
58+
D81495FD1BF5AF460099AE10 /* FirebaseCollectionViewDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = D81495F81BF5AF460099AE10 /* FirebaseCollectionViewDataSource.m */; };
59+
D81495FE1BF5AF460099AE10 /* FirebaseDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = D81495F91BF5AF460099AE10 /* FirebaseDataSource.m */; };
60+
D81495FF1BF5AF460099AE10 /* FirebaseTableViewDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = D81495FA1BF5AF460099AE10 /* FirebaseTableViewDataSource.m */; };
61+
D81496061BF5B92C0099AE10 /* FirebasePasswordAuthProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = D81496051BF5B92C0099AE10 /* FirebasePasswordAuthProvider.m */; };
6462
D81496071BF5B9BE0099AE10 /* FirebasePasswordAuthProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = D81496041BF5B9110099AE10 /* FirebasePasswordAuthProvider.h */; settings = {ATTRIBUTES = (Public, ); }; };
65-
D8680D901C0631FD001987EB /* FirebaseAuthDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = D8680D8F1C0631FD001987EB /* FirebaseAuthDelegate.h */; settings = {ASSET_TAGS = (); }; };
63+
D8680D901C0631FD001987EB /* FirebaseAuthDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = D8680D8F1C0631FD001987EB /* FirebaseAuthDelegate.h */; };
6664
D87943371BF51FF000525DFD /* FirebaseAuthProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = D87943361BF51FF000525DFD /* FirebaseAuthProvider.m */; };
6765
D87943461BF59E1F00525DFD /* FirebaseAuthConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = D879433E1BF5654000525DFD /* FirebaseAuthConstants.h */; settings = {ATTRIBUTES = (Public, ); }; };
6866
D87943471BF59E4F00525DFD /* TwitterAuthDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = D879433D1BF5593800525DFD /* TwitterAuthDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -127,12 +125,10 @@
127125
D81495ED1BF5AF280099AE10 /* FirebaseCollectionViewDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FirebaseCollectionViewDataSource.h; path = Core/API/FirebaseCollectionViewDataSource.h; sourceTree = "<group>"; };
128126
D81495EE1BF5AF280099AE10 /* FirebaseDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FirebaseDataSource.h; path = Core/API/FirebaseDataSource.h; sourceTree = "<group>"; };
129127
D81495EF1BF5AF280099AE10 /* FirebaseTableViewDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FirebaseTableViewDataSource.h; path = Core/API/FirebaseTableViewDataSource.h; sourceTree = "<group>"; };
130-
D81495F01BF5AF280099AE10 /* FirebaseUI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FirebaseUI.h; path = Core/API/FirebaseUI.h; sourceTree = "<group>"; };
131128
D81495F71BF5AF460099AE10 /* FirebaseArray.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FirebaseArray.m; path = Core/Implementation/FirebaseArray.m; sourceTree = "<group>"; };
132129
D81495F81BF5AF460099AE10 /* FirebaseCollectionViewDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FirebaseCollectionViewDataSource.m; path = Core/Implementation/FirebaseCollectionViewDataSource.m; sourceTree = "<group>"; };
133130
D81495F91BF5AF460099AE10 /* FirebaseDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FirebaseDataSource.m; path = Core/Implementation/FirebaseDataSource.m; sourceTree = "<group>"; };
134131
D81495FA1BF5AF460099AE10 /* FirebaseTableViewDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FirebaseTableViewDataSource.m; path = Core/Implementation/FirebaseTableViewDataSource.m; sourceTree = "<group>"; };
135-
D81495FB1BF5AF460099AE10 /* FirebaseUI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FirebaseUI.m; path = Core/Implementation/FirebaseUI.m; sourceTree = "<group>"; };
136132
D81496041BF5B9110099AE10 /* FirebasePasswordAuthProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FirebasePasswordAuthProvider.h; path = Auth/API/FirebasePasswordAuthProvider.h; sourceTree = "<group>"; };
137133
D81496051BF5B92C0099AE10 /* FirebasePasswordAuthProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FirebasePasswordAuthProvider.m; path = Auth/Implementation/FirebasePasswordAuthProvider.m; sourceTree = "<group>"; };
138134
D8680D8F1C0631FD001987EB /* FirebaseAuthDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FirebaseAuthDelegate.h; path = Auth/API/FirebaseAuthDelegate.h; sourceTree = "<group>"; };
@@ -287,7 +283,6 @@
287283
D81495ED1BF5AF280099AE10 /* FirebaseCollectionViewDataSource.h */,
288284
D81495EE1BF5AF280099AE10 /* FirebaseDataSource.h */,
289285
D81495EF1BF5AF280099AE10 /* FirebaseTableViewDataSource.h */,
290-
D81495F01BF5AF280099AE10 /* FirebaseUI.h */,
291286
);
292287
name = API;
293288
sourceTree = "<group>";
@@ -299,7 +294,6 @@
299294
D81495F81BF5AF460099AE10 /* FirebaseCollectionViewDataSource.m */,
300295
D81495F91BF5AF460099AE10 /* FirebaseDataSource.m */,
301296
D81495FA1BF5AF460099AE10 /* FirebaseTableViewDataSource.m */,
302-
D81495FB1BF5AF460099AE10 /* FirebaseUI.m */,
303297
);
304298
name = Implementation;
305299
sourceTree = "<group>";
@@ -350,7 +344,6 @@
350344
D87943471BF59E4F00525DFD /* TwitterAuthDelegate.h in Headers */,
351345
BB48779D1BA8A0D600FD3D4D /* GGLContext.h in Headers */,
352346
D87943461BF59E1F00525DFD /* FirebaseAuthConstants.h in Headers */,
353-
D81495F61BF5AF280099AE10 /* FirebaseUI.h in Headers */,
354347
BB62DD7A1BA6F84C001BD539 /* FirebaseAppDelegate.h in Headers */,
355348
D81495F41BF5AF280099AE10 /* FirebaseDataSource.h in Headers */,
356349
D81495F51BF5AF280099AE10 /* FirebaseTableViewDataSource.h in Headers */,
@@ -493,7 +486,6 @@
493486
D81495FF1BF5AF460099AE10 /* FirebaseTableViewDataSource.m in Sources */,
494487
D809A11E1BF67095000257AA /* FirebaseAuthConstants.m in Sources */,
495488
BBF6D41B1BA1FFAD00C644A7 /* FirebaseGoogleAuthProvider.m in Sources */,
496-
D81496001BF5AF460099AE10 /* FirebaseUI.m in Sources */,
497489
);
498490
runOnlyForDeploymentPostprocessing = 0;
499491
};

‎FirebaseUI/Core/API/FirebaseUI.h

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎FirebaseUI/Core/Implementation/FirebaseUI.m

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎examples/FirebaseUIChat/FirebaseUIChat/AppDelegate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88

99
#import <UIKit/UIKit.h>
10-
#import <FirebaseUI/FirebaseUI.h>
10+
#import <FirebaseUI/FirebaseAppDelegate.h>
1111

1212
@interface AppDelegate : FirebaseAppDelegate
1313

‎examples/FirebaseUIChat/FirebaseUIChat/ViewController.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
#import <UIKit/UIKit.h>
1010
#import <Firebase/Firebase.h>
11-
#import <FirebaseUI/FirebaseUI.h>
11+
#import <FirebaseUI/FirebaseTableViewDataSource.h>
12+
#import <FirebaseUI/FirebaseLoginViewController.h>
1213

1314
@interface ViewController : UIViewController <UITableViewDelegate, UITextFieldDelegate>
1415

‎setup.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ set -e
44

55
# SDK URLs
66
FIREBASE_SDK_URL="https://cdn.firebase.com/ObjC/Firebase.framework-LATEST.zip"
7-
GOOGLE_SDK_URL="https://developers.google.com/identity/sign-in/ios/sdk/google_signin_sdk_2_2_0.zip"
7+
GOOGLE_SDK_URL="https://developers.google.com/identity/sign-in/ios/sdk/google_signin_sdk_2_4_0.zip"
88
GOOGLE_CORE_SDK_URL="https://www.gstatic.com/cpdc/02468137448ba914-Google-1.0.7.zip"
9-
FACEBOOK_SDK_URL="http://fb.me/FacebookSDKs-iOS-20151111.zip"
9+
FACEBOOK_SDK_URL="https://origincache.facebook.com/developers/resources/?id=facebook-ios-sdk-current.zip"
1010

1111
# Script directories
1212
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

0 commit comments

Comments
 (0)