Skip to content

Project fixes #403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 2, 2018
Merged

Project fixes #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
670cbad
make project compatible for non-module users
morganchen12 Feb 1, 2018
7eb864e
fix UI sample and tests, with jank
morganchen12 Feb 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions FirebaseAuthUI/FUIAuthStrings.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,9 @@
}
}
NSBundle *frameworkBundle = [FUIAuthUtils bundleNamed:bundleName];
if (frameworkBundle == nil) {
frameworkBundle = [NSBundle mainBundle];
}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is optional and can be omitted, but should have no negative effects.

return [frameworkBundle localizedStringForKey:key value:nil table:table];
}

Expand Down
4 changes: 4 additions & 0 deletions FirebaseAuthUI/FUIAuthUtils.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ + (NSBundle *)bundleNamed:(NSString *)bundleName {
NSBundle *frameworkBundle = nil;
if (bundleName) {
NSString *path = [[NSBundle mainBundle] pathForResource:bundleName ofType:@"bundle"];
if (path == nil) {
// Check framework resources if bundle isn't present in main bundle.
path = [[NSBundle mainBundle] pathForResource:bundleName ofType:@"framework"];
}
frameworkBundle = [NSBundle bundleWithPath:path];
} else {
frameworkBundle = [NSBundle bundleForClass:[self class]];
Expand Down
2 changes: 1 addition & 1 deletion FirebaseDatabaseUI/FUIArray.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

// clang-format on

@import FirebaseDatabase;
#import <FirebaseDatabase/FirebaseDatabase.h>

#import "FUICollection.h"

Expand Down
2 changes: 0 additions & 2 deletions FirebaseDatabaseUI/FUICollectionViewDataSource.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
#import "FUICollectionViewDataSource.h"
#import "FUIArray.h"

@import FirebaseDatabase;

@interface FUICollectionViewDataSource () <FUICollectionDelegate>

@property (nonatomic, readonly, nonnull) id<FUICollection> collection;
Expand Down
5 changes: 2 additions & 3 deletions FirebaseDatabaseUI/FUIIndexCollectionViewDataSource.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@
// limitations under the License.
//

@import UIKit;

@import FirebaseDatabase;
#import <FirebaseDatabase/FirebaseDatabase.h>
#import <UIKit/UIKit.h>

NS_ASSUME_NONNULL_BEGIN

Expand Down
5 changes: 2 additions & 3 deletions FirebaseDatabaseUI/FUIIndexTableViewDataSource.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@
// limitations under the License.
//

@import UIKit;

@import FirebaseDatabase;
#import <UIKit/UIKit.h>
#import <FirebaseDatabase/FirebaseDatabase.h>

NS_ASSUME_NONNULL_BEGIN

Expand Down
4 changes: 1 addition & 3 deletions FirebaseDatabaseUI/FUISortedArray.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@
// limitations under the License.
//

@import FirebaseDatabase;

#import "FirebaseDatabaseUI.h"
#import "FUIArray.h"

NS_ASSUME_NONNULL_BEGIN

Expand Down
2 changes: 0 additions & 2 deletions FirebaseDatabaseUI/FUITableViewDataSource.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
#import "FUIArray.h"
#import "FUITableViewDataSource.h"

@import FirebaseDatabase;

@interface FUITableViewDataSource () <FUICollectionDelegate>

@property (strong, nonatomic, readwrite) UITableViewCell *(^populateCell)
Expand Down
2 changes: 1 addition & 1 deletion FirebaseFirestoreUI/FUIBatchedArray.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
// limitations under the License.
//

@import FirebaseFirestore;
#import <FirebaseFirestore/FirebaseFirestore.h>

#import "FUISnapshotArrayDiff.h"

Expand Down
2 changes: 0 additions & 2 deletions FirebaseFirestoreUI/FUIFirestoreTableViewDataSource.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@

#import "FUIFirestoreTableViewDataSource.h"

@import FirebaseFirestore;

@interface FUIFirestoreTableViewDataSource () <FUIBatchedArrayDelegate>

@property (strong, nonatomic, readwrite) UITableViewCell *(^populateCell)
Expand Down
4 changes: 2 additions & 2 deletions FirebaseFirestoreUI/FUISnapshotArrayDiff.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
// limitations under the License.
//

#import "FUISnapshotArrayDiff.h"
#import <FirebaseFirestore/FirebaseFirestore.h>

@import FirebaseFirestore;
#import "FUISnapshotArrayDiff.h"

@interface FUIArraySlice ()

Expand Down
3 changes: 1 addition & 2 deletions FirebaseGoogleAuthUITests/FirebaseGoogleAuthUITests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@

#import <FirebaseAuth/FirebaseAuth.h>
#import <FirebaseAuthUI/FUIAuthErrorUtils.h>
#import <FirebaseAuthUI/FUIAuthUtils.h>
#import "FUIAuthUtils.h"
#import <FirebaseAuthUI/FUIAuth.h>
#import <FirebaseCore/FirebaseCore.h>
#import <FirebaseGoogleAuthUI/FirebaseGoogleAuthUI.h>
#import <GoogleSignIn/GoogleSignIn.h>
#import <OCMock/OCMock.h>
Expand Down
4 changes: 2 additions & 2 deletions FirebaseTwitterAuthUITests/FirebaseTwitterAuthUITests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
//



#import "FUITwitterAuth.h"
#import <FirebaseAuth/FirebaseAuth.h>
#import <FirebaseAuthUI/FUIAuthErrorUtils.h>
#import <FirebaseAuthUI/FUIAuthUtils.h>
#import "FUIAuthUtils.h"
#import <FirebaseAuthUI/FUIAuth.h>
#import <FirebaseCore/FirebaseCore.h>
#import <FirebaseTwitterAuthUI/FirebaseTwitterAuthUI.h>
#import <OCMock/OCMock.h>
#import <TwitterCore/TwitterCore.h>
Expand Down
380 changes: 139 additions & 241 deletions FirebaseUI.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions FirebaseUISample/Assets.xcassets/AppIcon.appiconset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@
"idiom" : "ipad",
"size" : "83.5x83.5",
"scale" : "2x"
},
{
"idiom" : "ios-marketing",
"size" : "1024x1024",
"scale" : "1x"
}
],
"info" : {
Expand Down
6 changes: 3 additions & 3 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

source 'https://rubygems.org'

gem 'cocoapods', :git => 'https://github.com/CocoaPods/CocoaPods.git'
gem 'cocoapods-core', :git => 'https://github.com/CocoaPods/Core.git'
gem 'xcodeproj', :git => 'https://github.com/CocoaPods/Xcodeproj.git'
gem 'cocoapods'
gem 'cocoapods-core'
gem 'xcodeproj'
71 changes: 28 additions & 43 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
GIT
remote: https://github.com/CocoaPods/CocoaPods.git
revision: f6a7d53286ccbc4c5e419c33f0eb3dbc320af2be
GEM
remote: https://rubygems.org/
specs:
cocoapods (1.4.0.beta.1)
CFPropertyList (2.3.6)
activesupport (4.2.10)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
claide (1.0.2)
cocoapods (1.4.0)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.4.0.beta.1)
cocoapods-deintegrate (>= 1.0.1, < 2.0)
cocoapods-core (= 1.4.0)
cocoapods-deintegrate (>= 1.0.2, < 2.0)
cocoapods-downloader (>= 1.1.3, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
Expand All @@ -17,41 +23,15 @@ GIT
escape (~> 0.0.4)
fourflusher (~> 2.0.1)
gh_inspector (~> 1.0)
molinillo (~> 0.6.1)
molinillo (~> 0.6.4)
nap (~> 1.0)
ruby-macho (~> 1.1)
xcodeproj (>= 1.5.2, < 2.0)

GIT
remote: https://github.com/CocoaPods/Core.git
revision: 3efa5e2f0dec56af6fdcfd98822156b65c888ef5
specs:
cocoapods-core (1.4.0.beta.1)
xcodeproj (>= 1.5.4, < 2.0)
cocoapods-core (1.4.0)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)

GIT
remote: https://github.com/CocoaPods/Xcodeproj.git
revision: 0b7414adf9a21efe139eeed9eda4c16eede431fd
specs:
xcodeproj (1.5.2)
CFPropertyList (~> 2.3.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.2.3)

GEM
remote: https://rubygems.org/
specs:
CFPropertyList (2.3.5)
activesupport (4.2.10)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
claide (1.0.2)
cocoapods-deintegrate (1.0.1)
cocoapods-deintegrate (1.0.2)
cocoapods-downloader (1.1.3)
cocoapods-plugins (1.0.0)
nap
Expand All @@ -67,25 +47,30 @@ GEM
fourflusher (2.0.1)
fuzzy_match (2.0.4)
gh_inspector (1.0.3)
i18n (0.9.0)
i18n (0.9.3)
concurrent-ruby (~> 1.0)
minitest (5.10.3)
molinillo (0.6.3)
minitest (5.11.3)
molinillo (0.6.4)
nanaimo (0.2.3)
nap (1.1.0)
netrc (0.11.0)
ruby-macho (1.1.0)
thread_safe (0.3.6)
tzinfo (1.2.3)
tzinfo (1.2.4)
thread_safe (~> 0.1)
xcodeproj (1.5.4)
CFPropertyList (~> 2.3.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.2.3)

PLATFORMS
ruby

DEPENDENCIES
cocoapods!
cocoapods-core!
xcodeproj!
cocoapods
cocoapods-core
xcodeproj

BUNDLED WITH
1.15.1
9 changes: 1 addition & 8 deletions Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,18 +156,11 @@ target 'Firestore' do
end

target 'FirebaseUISample' do
use_frameworks!
platform :ios, '9.0'

pod 'OCMock'

pod 'FirebaseAuthUI', :path => "FirebaseUI_dev_auth.podspec"
pod 'FirebaseDatabaseUI', :path => "FirebaseUI_dev_db.podspec"
pod 'FirebaseStorageUI', :path => "FirebaseUI_dev_storage.podspec"
pod 'FirebaseFacebookAuthUI', :path => "FirebaseUI_dev_fb.podspec"
pod 'FirebaseGoogleAuthUI', :path => "FirebaseUI_dev_ggl.podspec"
pod 'FirebasePhoneAuthUI', :path => "FirebaseUI_dev_phone.podspec"
pod 'FirebaseTwitterAuthUI', :path => "FirebaseUI_dev_tw.podspec"

target 'FirebaseUISampleUITests' do
inherit! :search_paths
end
Expand Down