diff --git a/.travis.yml b/.travis.yml index 0e28d6225c1..0a23f1c7c42 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,12 +4,11 @@ xcode_workspace: FirebaseUI.xcworkspace xcode_scheme: FirebaseUITests script: xcodebuild -workspace FirebaseUI.xcworkspace - -scheme FirebaseUITests + -scheme FirebaseUI -sdk iphonesimulator - -destination 'platform=iOS Simulator,name=iPhone 6s' - build + -destination 'platform=iOS Simulator,name=iPhone 6s' test - ONLY_ACTIVE_ARCH=NO + ONLY_ACTIVE_ARCH=YES CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO diff --git a/FirebaseUI/Auth/AuthUI/Source/FIRAuthPickerViewController.h b/FirebaseAuthUI/FIRAuthPickerViewController.h similarity index 100% rename from FirebaseUI/Auth/AuthUI/Source/FIRAuthPickerViewController.h rename to FirebaseAuthUI/FIRAuthPickerViewController.h diff --git a/FirebaseUI/Auth/AuthUI/Source/FIRAuthPickerViewController.m b/FirebaseAuthUI/FIRAuthPickerViewController.m similarity index 100% rename from FirebaseUI/Auth/AuthUI/Source/FIRAuthPickerViewController.m rename to FirebaseAuthUI/FIRAuthPickerViewController.m diff --git a/FirebaseUI/Auth/AuthUI/Source/FIRAuthPickerViewController.xib b/FirebaseAuthUI/FIRAuthPickerViewController.xib similarity index 87% rename from FirebaseUI/Auth/AuthUI/Source/FIRAuthPickerViewController.xib rename to FirebaseAuthUI/FIRAuthPickerViewController.xib index e4cb689120c..81eb874a77f 100644 --- a/FirebaseUI/Auth/AuthUI/Source/FIRAuthPickerViewController.xib +++ b/FirebaseAuthUI/FIRAuthPickerViewController.xib @@ -1,6 +1,7 @@ + @@ -13,7 +14,7 @@ - + diff --git a/FirebaseUI/Auth/AuthUI/Source/FIRAuthProviderUI.h b/FirebaseAuthUI/FIRAuthProviderUI.h similarity index 100% rename from FirebaseUI/Auth/AuthUI/Source/FIRAuthProviderUI.h rename to FirebaseAuthUI/FIRAuthProviderUI.h diff --git a/FirebaseUI/Auth/AuthUI/Source/FIRAuthUI.h b/FirebaseAuthUI/FIRAuthUI.h similarity index 100% rename from FirebaseUI/Auth/AuthUI/Source/FIRAuthUI.h rename to FirebaseAuthUI/FIRAuthUI.h diff --git a/FirebaseUI/Auth/AuthUI/Source/FIRAuthUI.m b/FirebaseAuthUI/FIRAuthUI.m similarity index 100% rename from FirebaseUI/Auth/AuthUI/Source/FIRAuthUI.m rename to FirebaseAuthUI/FIRAuthUI.m diff --git a/FirebaseUI/Auth/AuthUI/Source/FIRAuthUIBaseViewController.h b/FirebaseAuthUI/FIRAuthUIBaseViewController.h similarity index 100% rename from FirebaseUI/Auth/AuthUI/Source/FIRAuthUIBaseViewController.h rename to FirebaseAuthUI/FIRAuthUIBaseViewController.h diff --git a/FirebaseUI/Auth/AuthUI/Source/FIRAuthUIBaseViewController.m b/FirebaseAuthUI/FIRAuthUIBaseViewController.m similarity index 99% rename from FirebaseUI/Auth/AuthUI/Source/FIRAuthUIBaseViewController.m rename to FirebaseAuthUI/FIRAuthUIBaseViewController.m index 8fd2b7a2a8e..d1d81016a16 100644 --- a/FirebaseUI/Auth/AuthUI/Source/FIRAuthUIBaseViewController.m +++ b/FirebaseAuthUI/FIRAuthUIBaseViewController.m @@ -261,7 +261,7 @@ - (void)incrementActivity { // Delay the display of acitivty indiactor for a short period of time. dispatch_after(dispatch_time(DISPATCH_TIME_NOW, - (int64_t)(kActivityIndiactorAnimationDelay * NSEC_PER_SEC)), + (int64_t)(kActivityIndiactorAnimationDelay * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ if (_activityCount > 0) { [_activityIndicator startAnimating]; diff --git a/FirebaseUI/Auth/AuthUI/Source/FIRAuthUIErrorUtils.h b/FirebaseAuthUI/FIRAuthUIErrorUtils.h similarity index 100% rename from FirebaseUI/Auth/AuthUI/Source/FIRAuthUIErrorUtils.h rename to FirebaseAuthUI/FIRAuthUIErrorUtils.h diff --git a/FirebaseUI/Auth/AuthUI/Source/FIRAuthUIErrorUtils.m b/FirebaseAuthUI/FIRAuthUIErrorUtils.m similarity index 100% rename from FirebaseUI/Auth/AuthUI/Source/FIRAuthUIErrorUtils.m rename to FirebaseAuthUI/FIRAuthUIErrorUtils.m diff --git a/FirebaseUI/Auth/AuthUI/Source/FIRAuthUIErrors.h b/FirebaseAuthUI/FIRAuthUIErrors.h similarity index 100% rename from FirebaseUI/Auth/AuthUI/Source/FIRAuthUIErrors.h rename to FirebaseAuthUI/FIRAuthUIErrors.h diff --git a/FirebaseUI/Auth/AuthUI/Source/FIRAuthUIErrors.m b/FirebaseAuthUI/FIRAuthUIErrors.m similarity index 100% rename from FirebaseUI/Auth/AuthUI/Source/FIRAuthUIErrors.m rename to FirebaseAuthUI/FIRAuthUIErrors.m diff --git a/FirebaseUI/Auth/AuthUI/Source/FIRAuthUISignInButton.h b/FirebaseAuthUI/FIRAuthUISignInButton.h similarity index 100% rename from FirebaseUI/Auth/AuthUI/Source/FIRAuthUISignInButton.h rename to FirebaseAuthUI/FIRAuthUISignInButton.h diff --git a/FirebaseUI/Auth/AuthUI/Source/FIRAuthUISignInButton.m b/FirebaseAuthUI/FIRAuthUISignInButton.m similarity index 100% rename from FirebaseUI/Auth/AuthUI/Source/FIRAuthUISignInButton.m rename to FirebaseAuthUI/FIRAuthUISignInButton.m diff --git a/FirebaseUI/Auth/AuthUI/Source/FIRAuthUIStrings.h b/FirebaseAuthUI/FIRAuthUIStrings.h similarity index 100% rename from FirebaseUI/Auth/AuthUI/Source/FIRAuthUIStrings.h rename to FirebaseAuthUI/FIRAuthUIStrings.h diff --git a/FirebaseUI/Auth/AuthUI/Source/FIRAuthUIStrings.m b/FirebaseAuthUI/FIRAuthUIStrings.m similarity index 100% rename from FirebaseUI/Auth/AuthUI/Source/FIRAuthUIStrings.m rename to FirebaseAuthUI/FIRAuthUIStrings.m diff --git a/FirebaseUI/Auth/AuthUI/Source/FIRAuthUITableHeaderView.h b/FirebaseAuthUI/FIRAuthUITableHeaderView.h similarity index 100% rename from FirebaseUI/Auth/AuthUI/Source/FIRAuthUITableHeaderView.h rename to FirebaseAuthUI/FIRAuthUITableHeaderView.h diff --git a/FirebaseUI/Auth/AuthUI/Source/FIRAuthUITableHeaderView.m b/FirebaseAuthUI/FIRAuthUITableHeaderView.m similarity index 100% rename from FirebaseUI/Auth/AuthUI/Source/FIRAuthUITableHeaderView.m rename to FirebaseAuthUI/FIRAuthUITableHeaderView.m diff --git a/FirebaseUI/Auth/AuthUI/Source/FIRAuthUITableViewCell.h b/FirebaseAuthUI/FIRAuthUITableViewCell.h similarity index 100% rename from FirebaseUI/Auth/AuthUI/Source/FIRAuthUITableViewCell.h rename to FirebaseAuthUI/FIRAuthUITableViewCell.h diff --git a/FirebaseUI/Auth/AuthUI/Source/FIRAuthUITableViewCell.m b/FirebaseAuthUI/FIRAuthUITableViewCell.m similarity index 100% rename from FirebaseUI/Auth/AuthUI/Source/FIRAuthUITableViewCell.m rename to FirebaseAuthUI/FIRAuthUITableViewCell.m diff --git a/FirebaseUI/Auth/AuthUI/Source/FIRAuthUITableViewCell.xib b/FirebaseAuthUI/FIRAuthUITableViewCell.xib similarity index 98% rename from FirebaseUI/Auth/AuthUI/Source/FIRAuthUITableViewCell.xib rename to FirebaseAuthUI/FIRAuthUITableViewCell.xib index 6bcd4ac0e5f..4e7925f5081 100644 --- a/FirebaseUI/Auth/AuthUI/Source/FIRAuthUITableViewCell.xib +++ b/FirebaseAuthUI/FIRAuthUITableViewCell.xib @@ -1,5 +1,5 @@ - + diff --git a/FirebaseUI/Auth/AuthUI/Source/FIRAuthUIUtils.h b/FirebaseAuthUI/FIRAuthUIUtils.h similarity index 100% rename from FirebaseUI/Auth/AuthUI/Source/FIRAuthUIUtils.h rename to FirebaseAuthUI/FIRAuthUIUtils.h diff --git a/FirebaseUI/Auth/AuthUI/Source/FIRAuthUIUtils.m b/FirebaseAuthUI/FIRAuthUIUtils.m similarity index 100% rename from FirebaseUI/Auth/AuthUI/Source/FIRAuthUIUtils.m rename to FirebaseAuthUI/FIRAuthUIUtils.m diff --git a/FirebaseUI/Auth/AuthUI/Source/FIRAuthUI_Internal.h b/FirebaseAuthUI/FIRAuthUI_Internal.h similarity index 100% rename from FirebaseUI/Auth/AuthUI/Source/FIRAuthUI_Internal.h rename to FirebaseAuthUI/FIRAuthUI_Internal.h diff --git a/FirebaseUI/Auth/AuthUI/Source/FIREmailEntryViewController.h b/FirebaseAuthUI/FIREmailEntryViewController.h similarity index 100% rename from FirebaseUI/Auth/AuthUI/Source/FIREmailEntryViewController.h rename to FirebaseAuthUI/FIREmailEntryViewController.h diff --git a/FirebaseUI/Auth/AuthUI/Source/FIREmailEntryViewController.m b/FirebaseAuthUI/FIREmailEntryViewController.m similarity index 100% rename from FirebaseUI/Auth/AuthUI/Source/FIREmailEntryViewController.m rename to FirebaseAuthUI/FIREmailEntryViewController.m diff --git a/FirebaseUI/Auth/AuthUI/Source/FIREmailEntryViewController.xib b/FirebaseAuthUI/FIREmailEntryViewController.xib similarity index 96% rename from FirebaseUI/Auth/AuthUI/Source/FIREmailEntryViewController.xib rename to FirebaseAuthUI/FIREmailEntryViewController.xib index f40c81a15b6..e236309ccc8 100644 --- a/FirebaseUI/Auth/AuthUI/Source/FIREmailEntryViewController.xib +++ b/FirebaseAuthUI/FIREmailEntryViewController.xib @@ -1,5 +1,5 @@ - + diff --git a/FirebaseUI/Auth/AuthUI/Source/FIRPasswordRecoveryViewController.h b/FirebaseAuthUI/FIRPasswordRecoveryViewController.h similarity index 100% rename from FirebaseUI/Auth/AuthUI/Source/FIRPasswordRecoveryViewController.h rename to FirebaseAuthUI/FIRPasswordRecoveryViewController.h diff --git a/FirebaseUI/Auth/AuthUI/Source/FIRPasswordRecoveryViewController.m b/FirebaseAuthUI/FIRPasswordRecoveryViewController.m similarity index 100% rename from FirebaseUI/Auth/AuthUI/Source/FIRPasswordRecoveryViewController.m rename to FirebaseAuthUI/FIRPasswordRecoveryViewController.m diff --git a/FirebaseUI/Auth/AuthUI/Source/FIRPasswordRecoveryViewController.xib b/FirebaseAuthUI/FIRPasswordRecoveryViewController.xib similarity index 91% rename from FirebaseUI/Auth/AuthUI/Source/FIRPasswordRecoveryViewController.xib rename to FirebaseAuthUI/FIRPasswordRecoveryViewController.xib index db956fe569b..e6b0989fa8b 100644 --- a/FirebaseUI/Auth/AuthUI/Source/FIRPasswordRecoveryViewController.xib +++ b/FirebaseAuthUI/FIRPasswordRecoveryViewController.xib @@ -1,5 +1,5 @@ - + @@ -15,7 +15,7 @@ - + diff --git a/FirebaseUI/Auth/AuthUI/Source/FIRPasswordSignInViewController.h b/FirebaseAuthUI/FIRPasswordSignInViewController.h similarity index 100% rename from FirebaseUI/Auth/AuthUI/Source/FIRPasswordSignInViewController.h rename to FirebaseAuthUI/FIRPasswordSignInViewController.h diff --git a/FirebaseUI/Auth/AuthUI/Source/FIRPasswordSignInViewController.m b/FirebaseAuthUI/FIRPasswordSignInViewController.m similarity index 100% rename from FirebaseUI/Auth/AuthUI/Source/FIRPasswordSignInViewController.m rename to FirebaseAuthUI/FIRPasswordSignInViewController.m diff --git a/FirebaseUI/Auth/AuthUI/Source/FIRPasswordSignInViewController.xib b/FirebaseAuthUI/FIRPasswordSignInViewController.xib similarity index 94% rename from FirebaseUI/Auth/AuthUI/Source/FIRPasswordSignInViewController.xib rename to FirebaseAuthUI/FIRPasswordSignInViewController.xib index ac467f98e90..801252fab5b 100644 --- a/FirebaseUI/Auth/AuthUI/Source/FIRPasswordSignInViewController.xib +++ b/FirebaseAuthUI/FIRPasswordSignInViewController.xib @@ -1,5 +1,5 @@ - + @@ -16,7 +16,7 @@