Skip to content

Commit 916d170

Browse files
paulb777paulb777
committed
Split FirebaseUtilities from FirebaseCore
1 parent 8b703e3 commit 916d170

File tree

71 files changed

+98
-2751
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+98
-2751
lines changed

‎.travis.yml

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -52,50 +52,60 @@ jobs:
5252
- stage: test
5353
env:
5454
- PROJECT=Firebase PLATFORM=iOS METHOD=pod-lib-lint
55+
# Set ALT_SOURCES like the following to continue lint testing until release when Utilities
56+
# or Core APIs change. FirebaseUtilities.podspec and FirebaseCore.podspec should be
57+
# manually pushed to a temporary Specs repo. See
58+
# https://guides.cocoapods.org/making/private-cocoapods.
59+
# ALT_SOURCES="[email protected]:paulb777/Specs.git,https://github.com/CocoaPods/Specs.git"
60+
- ALT_SOURCES="--sources=https://github.com/paulb777/Specs.git,https://github.com/CocoaPods/Specs.git"
5561
before_install:
5662
- ./scripts/if_changed.sh ./scripts/install_prereqs.sh
5763
script:
58-
- ./scripts/if_changed.sh bundle exec pod lib lint FirebaseCore.podspec
59-
- ./scripts/if_changed.sh bundle exec pod lib lint FirebaseAuth.podspec
60-
- ./scripts/if_changed.sh bundle exec pod lib lint FirebaseDatabase.podspec
61-
- ./scripts/if_changed.sh bundle exec pod lib lint FirebaseMessaging.podspec
62-
- ./scripts/if_changed.sh bundle exec pod lib lint FirebaseStorage.podspec
63-
- ./scripts/if_changed.sh bundle exec pod lib lint FirebaseFunctions.podspec
64+
- ./scripts/if_changed.sh bundle exec pod lib lint FirebaseUtilities.podspec
65+
- ./scripts/if_changed.sh bundle exec pod lib lint FirebaseCore.podspec $ALT_SOURCES
66+
- ./scripts/if_changed.sh bundle exec pod lib lint FirebaseAuth.podspec $ALT_SOURCES
67+
- ./scripts/if_changed.sh bundle exec pod lib lint FirebaseDatabase.podspec $ALT_SOURCES
68+
- ./scripts/if_changed.sh bundle exec pod lib lint FirebaseMessaging.podspec $ALT_SOURCES
69+
- ./scripts/if_changed.sh bundle exec pod lib lint FirebaseStorage.podspec $ALT_SOURCES
70+
- ./scripts/if_changed.sh bundle exec pod lib lint FirebaseFunctions.podspec $ALT_SOURCES
6471

6572
- stage: test
6673
env:
6774
- PROJECT=Firestore PLATFORM=iOS METHOD=pod-lib-lint
75+
- ALT_SOURCES="--sources=https://github.com/paulb777/Specs.git,https://github.com/CocoaPods/Specs.git"
6876
before_install:
6977
- ./scripts/if_changed.sh ./scripts/install_prereqs.sh
7078
script:
7179
# Eliminate the one warning from BoringSSL when CocoaPods 1.6.0 is available.
7280
# The travis_wait is necessary because the command takes more than 10 minutes.
73-
- travis_wait ./scripts/if_changed.sh bundle exec pod lib lint FirebaseFirestore.podspec --allow-warnings --no-subspecs
81+
- travis_wait ./scripts/if_changed.sh bundle exec pod lib lint FirebaseFirestore.podspec --allow-warnings --no-subspecs $ALT_SOURCES
7482

7583
# pod lib lint to check build and warnings for static library build - only on cron jobs
7684
- stage: test
7785
env:
7886
- PROJECT=Firebase PLATFORM=iOS METHOD=pod-lib-lint
87+
- ALT_SOURCES="--sources=https://github.com/paulb777/Specs.git,https://github.com/CocoaPods/Specs.git"
7988
before_install:
8089
- ./scripts/if_cron.sh ./scripts/install_prereqs.sh
8190
script:
82-
- ./scripts/if_cron.sh bundle exec pod lib lint FirebaseCore.podspec --use-libraries
83-
- ./scripts/if_cron.sh bundle exec pod lib lint FirebaseAuth.podspec --use-libraries
84-
- ./scripts/if_cron.sh bundle exec pod lib lint FirebaseDatabase.podspec --use-libraries
91+
- ./scripts/if_cron.sh bundle exec pod lib lint FirebaseCore.podspec --use-libraries $ALT_SOURCES
92+
- ./scripts/if_cron.sh bundle exec pod lib lint FirebaseAuth.podspec --use-libraries $ALT_SOURCES
93+
- ./scripts/if_cron.sh bundle exec pod lib lint FirebaseDatabase.podspec --use-libraries $ALT_SOURCES
8594
# The Protobuf dependency of FirebaseMessaging has warnings with --use-libraries
86-
- ./scripts/if_cron.sh bundle exec pod lib lint FirebaseMessaging.podspec --use-libraries --allow-warnings
87-
- ./scripts/if_cron.sh bundle exec pod lib lint FirebaseStorage.podspec --use-libraries
88-
- ./scripts/if_cron.sh bundle exec pod lib lint FirebaseFunctions.podspec --use-libraries
95+
- ./scripts/if_cron.sh bundle exec pod lib lint FirebaseMessaging.podspec --use-libraries --allow-warnings $ALT_SOURCES
96+
- ./scripts/if_cron.sh bundle exec pod lib lint FirebaseStorage.podspec --use-libraries $ALT_SOURCES
97+
- ./scripts/if_cron.sh bundle exec pod lib lint FirebaseFunctions.podspec --use-libraries $ALT_SOURCES
8998

9099
- stage: test
91100
env:
92101
- PROJECT=Firestore PLATFORM=iOS METHOD=pod-lib-lint
102+
- ALT_SOURCES="--sources=https://github.com/paulb777/Specs.git,https://github.com/CocoaPods/Specs.git"
93103
before_install:
94104
- ./scripts/if_cron.sh ./scripts/install_prereqs.sh
95105
script:
96106
# TBD - non-portable path warnings
97107
# The travis_wait is necessary because the command takes more than 10 minutes.
98-
- travis_wait ./scripts/if_cron.sh bundle exec pod lib lint FirebaseFirestore.podspec --use-libraries --allow-warnings --no-subspecs
108+
- travis_wait ./scripts/if_cron.sh bundle exec pod lib lint FirebaseFirestore.podspec --use-libraries --allow-warnings --no-subspecs $ALT_SOURCES
99109

100110
# Alternative platforms
101111

‎Example/Auth/Sample/ApplicationDelegate.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#import "ApplicationDelegate.h"
1818

1919
#import <FirebaseCore/FIRApp.h>
20-
#import <FirebaseCore/FIRLogger.h>
20+
#import <FirebaseUtilities/FIRLogger.h>
2121

2222
#import "AuthProviders.h"
2323
#import "FirebaseAuth.h"

‎Example/Core/Tests/FIRAppEnvironmentUtilTest.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#import <Foundation/Foundation.h>
1616
#import <XCTest/XCTest.h>
1717

18-
#import <FirebaseCore/FIRAppEnvironmentUtil.h>
18+
#import <FirebaseUtilities/FIRAppEnvironmentUtil.h>
1919

2020
#import "FIRTestCase.h"
2121

‎Example/Core/Tests/FIRLoggerTest.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#import "FIRTestCase.h"
1919

20-
#import <FirebaseCore/FIRLogger.h>
20+
#import <FirebaseUtilities/FIRLogger.h>
2121

2222
#import <asl.h>
2323

‎Example/Core/Tests/FIRMutableDictionaryTest.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#import "FIRTestCase.h"
1616

17-
#import <FirebaseCore/FIRMutableDictionary.h>
17+
#import <FirebaseUtilities/FIRMutableDictionary.h>
1818

1919
const static NSString *const kKey = @"testKey1";
2020
const static NSString *const kValue = @"testValue1";

‎Example/Core/Tests/FIRNetworkTest.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
#import "GTMHTTPServer.h"
1818

19-
#import <FirebaseCore/FIRNetwork.h>
20-
#import <FirebaseCore/FIRReachabilityChecker.h>
19+
#import <FirebaseUtilities/FIRNetwork.h>
20+
#import <FirebaseUtilities/FIRReachabilityChecker.h>
2121
#import <GoogleToolboxForMac/GTMNSData+zlib.h>
2222

2323
@interface FIRNetwork ()

‎Example/Core/Tests/FIRReachabilityCheckerTest.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
#import "FIRTestCase.h"
1616

17-
#import <FirebaseCore/FIRReachabilityChecker+Internal.h>
18-
#import <FirebaseCore/FIRReachabilityChecker.h>
17+
#import <FirebaseUtilities/FIRReachabilityChecker+Internal.h>
18+
#import <FirebaseUtilities/FIRReachabilityChecker.h>
1919

2020
@interface FIRReachabilityCheckerTest : FIRTestCase <FIRReachabilityDelegate> {
2121
@private

‎Example/Database/Tests/Unit/FSyncPointTests.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#import <Foundation/Foundation.h>
1818

19-
#import <FirebaseCore/FIRLogger.h>
19+
#import <FirebaseUtilities/FIRLogger.h>
2020

2121
#import "FSyncPointTests.h"
2222
#import "FListenProvider.h"

‎Example/Messaging/Tests/FIRMessagingClientTest.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#import "FIRMessagingUtilities.h"
3232
#import "NSError+FIRMessaging.h"
3333

34-
#import <FirebaseCore/FIRReachabilityChecker.h>
34+
#import <FirebaseUtilities/FIRReachabilityChecker.h>
3535

3636
static NSString *const kFIRMessagingUserDefaultsSuite = @"FIRMessagingClientTestUserDefaultsSuite";
3737

‎Example/Podfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ target 'Core_Example_iOS' do
1616

1717
target 'Core_Tests_iOS' do
1818
inherit! :search_paths
19+
pod 'FirebaseUtilities', :path => '../'
1920
pod 'OCMock'
2021
end
2122
end
@@ -113,6 +114,7 @@ target 'Core_Example_macOS' do
113114

114115
target 'Core_Tests_macOS' do
115116
inherit! :search_paths
117+
pod 'FirebaseUtilities', :path => '../'
116118
pod 'OCMock'
117119
end
118120
end
@@ -164,6 +166,7 @@ target 'Core_Example_tvOS' do
164166
platform :tvos, '10.0'
165167

166168
target 'Core_Tests_tvOS' do
169+
pod 'FirebaseUtilities', :path => '../'
167170
inherit! :search_paths
168171
pod 'OCMock'
169172
end

‎Firebase/Auth/Source/AuthProviders/Phone/FIRPhoneAuthProvider.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#import "FIRPhoneAuthProvider.h"
1818

19-
#import <FirebaseCore/FIRLogger.h>
19+
#import <FirebaseUtilities/FIRLogger.h>
2020
#import "FIRPhoneAuthCredential_Internal.h"
2121
#import <FirebaseCore/FIRApp.h>
2222
#import "FIRAuthAPNSToken.h"

‎Firebase/Auth/Source/FIRAuth.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
#import "FIRAuth_Internal.h"
2020

2121
#import <FirebaseCore/FIRAppAssociationRegistration.h>
22-
#import <FirebaseCore/FIRAppEnvironmentUtil.h>
2322
#import <FirebaseCore/FIRAppInternal.h>
24-
#import <FirebaseCore/FIRLogger.h>
2523
#import <FirebaseCore/FIROptions.h>
24+
#import <FirebaseUtilities/FIRAppEnvironmentUtil.h>
25+
#import <FirebaseUtilities/FIRLogger.h>
2626

2727
#import "AuthProviders/EmailPassword/FIREmailPasswordAuthCredential.h"
2828
#import "FIRAdditionalUserInfo_Internal.h"

‎Firebase/Auth/Source/FIRAuthAPNSTokenManager.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#import "FIRAuthAPNSTokenManager.h"
1818

19-
#import <FirebaseCore/FIRLogger.h>
19+
#import <FirebaseUtilities/FIRLogger.h>
2020
#import "FIRAuthAPNSToken.h"
2121
#import "FIRAuthGlobalWorkQueue.h"
2222

‎Firebase/Auth/Source/FIRAuthAppDelegateProxy.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#import "FIRAuthAppDelegateProxy.h"
1818

19-
#import <FirebaseCore/FIRAppEnvironmentUtil.h>
19+
#import <FirebaseUtilities/FIRAppEnvironmentUtil.h>
2020

2121
#import <objc/runtime.h>
2222

‎Firebase/Auth/Source/FIRAuthDefaultUIDelegate.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#import "FIRAuthDefaultUIDelegate.h"
1818

19-
#import <FirebaseCore/FIRAppEnvironmentUtil.h>
19+
#import <FirebaseUtilities/FIRAppEnvironmentUtil.h>
2020

2121
NS_ASSUME_NONNULL_BEGIN
2222

‎Firebase/Auth/Source/FIRAuthNotificationManager.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#import "FIRAuthNotificationManager.h"
1818

19-
#import <FirebaseCore/FIRLogger.h>
19+
#import <FirebaseUtilities/FIRLogger.h>
2020
#import "FIRAuthAppCredential.h"
2121
#import "FIRAuthAppCredentialManager.h"
2222
#import "FIRAuthGlobalWorkQueue.h"

‎Firebase/Auth/Source/FIRUser.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#import "FIRGetAccountInfoResponse.h"
3939
#import "FIRGetOOBConfirmationCodeRequest.h"
4040
#import "FIRGetOOBConfirmationCodeResponse.h"
41-
#import <FirebaseCore/FIRLogger.h>
41+
#import <FirebaseUtilities/FIRLogger.h>
4242
#import "FIRSecureTokenService.h"
4343
#import "FIRSetAccountInfoRequest.h"
4444
#import "FIRSetAccountInfoResponse.h"

‎Firebase/Core/FIRApp.m

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@
1515
#include <sys/utsname.h>
1616

1717
#import "FIRApp.h"
18+
19+
#import <FirebaseUtilities/FIRLogger.h>
20+
1821
#import "FIRConfiguration.h"
1922
#import "Private/FIRAnalyticsConfiguration+Internal.h"
2023
#import "Private/FIRAppInternal.h"
2124
#import "Private/FIRBundleUtil.h"
22-
#import "Private/FIRLogger.h"
2325
#import "Private/FIROptionsInternal.h"
24-
#import "third_party/FIRAppEnvironmentUtil.h"
26+
#import "Private/FIRVersion.h"
2527

2628
NSString *const kFIRServiceAdMob = @"AdMob";
2729
NSString *const kFIRServiceAuth = @"Auth";
@@ -94,6 +96,7 @@ @implementation FIRApp
9496
static NSMutableDictionary *sLibraryVersions;
9597

9698
+ (void)configure {
99+
FIRLoggerRegisterVersion(FIRVersionString);
97100
FIROptions *options = [FIROptions defaultOptions];
98101
if (!options) {
99102
[[NSNotificationCenter defaultCenter]

0 commit comments

Comments
 (0)