Skip to content

Commit 0794bcc

Browse files
authored
Merge pull request #52 from hansemannn/feature/firebase-latest
feat(ios): update firebase to latest
2 parents aa7e28c + 9a69c09 commit 0794bcc

File tree

113 files changed

+7997
-7763
lines changed

Some content is hidden

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

113 files changed

+7997
-7763
lines changed

ios/Cartfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json"
2+
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseProtobufBinary.json"

ios/Cartfile.resolved

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" "6.29.0"
2+
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseProtobufBinary.json" "6.29.0"

ios/Classes/FirebaseCoreModule.m

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
#import <FirebaseCore/FirebaseCore.h>
9-
#import <FirebaseInstanceId/FIRInstanceID.h>
9+
#import <FirebaseInstanceId/FirebaseInstanceId.h>
1010

1111
#import "FirebaseCoreModule.h"
1212
#import "TiBase.h"
@@ -27,14 +27,6 @@ - (NSString *)moduleId
2727
return @"firebase.core";
2828
}
2929

30-
#pragma mark Lifecycle
31-
32-
- (void)startup
33-
{
34-
[super startup];
35-
NSLog(@"[DEBUG] %@ loaded", self);
36-
}
37-
3830
#pragma Public APIs
3931

4032
#define ADD_TO_OPTIONS_IF_SET(payload, property, options) \

ios/platform/Firebase.framework/Headers/Firebase.h

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,39 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#import <FirebaseCore/FirebaseCore.h>
15+
// The module qualified imports are for CocoaPods and the simple file names
16+
// for Swift Package Manager.
1617

1718
#if !defined(__has_include)
1819
#error "Firebase.h won't import anything if your compiler doesn't support __has_include. Please \
1920
import the headers individually."
2021
#else
22+
#if __has_include(<FirebaseCore/FirebaseCore.h>)
23+
#import <FirebaseCore/FirebaseCore.h>
24+
#elif __has_include("FirebaseCore.h")
25+
#import "FirebaseCore.h"
26+
#endif
27+
2128
#if __has_include(<FirebaseAnalytics/FirebaseAnalytics.h>)
2229
#import <FirebaseAnalytics/FirebaseAnalytics.h>
2330
#endif
2431
2532
#if __has_include(<FirebaseAuth/FirebaseAuth.h>)
2633
#import <FirebaseAuth/FirebaseAuth.h>
34+
#elif __has_include("FirebaseAuth.h")
35+
#import "FirebaseAuth.h"
2736
#endif
2837
2938
#if __has_include(<FirebaseCrashlytics/FirebaseCrashlytics.h>)
3039
#import <FirebaseCrashlytics/FirebaseCrashlytics.h>
40+
#elif __has_include("FirebaseCrashlytics.h")
41+
#import "FirebaseCrashlytics.h"
3142
#endif
3243
3344
#if __has_include(<FirebaseDatabase/FirebaseDatabase.h>)
3445
#import <FirebaseDatabase/FirebaseDatabase.h>
46+
#elif __has_include("FirebaseDatabase.h")
47+
#import "FirebaseDatabase.h"
3548
#endif
3649
3750
#if __has_include(<FirebaseDynamicLinks/FirebaseDynamicLinks.h>)
@@ -43,14 +56,20 @@
4356
Firebase Dynamic Links works as intended."
4457
#endif // #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
4558
#endif
59+
#elif __has_include("FirebaseDynamicLinks.h")
60+
#import "FirebaseDynamicLinks.h"
4661
#endif
4762
4863
#if __has_include(<FirebaseFirestore/FirebaseFirestore.h>)
4964
#import <FirebaseFirestore/FirebaseFirestore.h>
65+
#elif __has_include("FirebaseFirestore.h")
66+
#import "FirebaseFirestore.h"
5067
#endif
5168
5269
#if __has_include(<FirebaseFunctions/FirebaseFunctions.h>)
5370
#import <FirebaseFunctions/FirebaseFunctions.h>
71+
#elif __has_include("FirebaseFunctions.h")
72+
#import "FirebaseFunctions.h"
5473
#endif
5574
5675
#if __has_include(<FirebaseInAppMessaging/FirebaseInAppMessaging.h>)
@@ -62,6 +81,8 @@ Firebase Dynamic Links works as intended."
6281
Firebase In App Messaging works as intended."
6382
#endif // #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
6483
#endif
84+
#elif __has_include("FirebaseInAppMessaging.h")
85+
#import "FirebaseInAppMessaging.h"
6586
#endif
6687
6788
#if __has_include(<FirebaseInstanceID/FirebaseInstanceID.h>)
@@ -77,7 +98,9 @@ Firebase In App Messaging works as intended."
7798
Firebase Messaging works as intended."
7899
#endif // #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
79100
#endif
80-
#endif
101+
#elif __has_include("FirebaseMessaging.h")
102+
#import "FirebaseMessaging.h"
103+
#endif
81104
82105
#if __has_include(<FirebaseMLCommon/FirebaseMLCommon.h>)
83106
#import <FirebaseMLCommon/FirebaseMLCommon.h>
@@ -151,10 +174,14 @@ Firebase Performance works as intended."
151174
Firebase Remote Config works as intended."
152175
#endif // #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
153176
#endif
177+
#elif __has_include("FirebaseRemoteConfig.h")
178+
#import "FirebaseRemoteConfig.h"
154179
#endif
155180
156181
#if __has_include(<FirebaseStorage/FirebaseStorage.h>)
157182
#import <FirebaseStorage/FirebaseStorage.h>
183+
#elif __has_include("FirebaseStorage.h")
184+
#import "FirebaseStorage.h"
158185
#endif
159186
160187
#if __has_include(<GoogleMobileAds/GoogleMobileAds.h>)

ios/platform/Firebase.framework/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<key>CFBundleExecutable</key>
66
<string>Firebase</string>
77
<key>CFBundleIdentifier</key>
8-
<string>com.firebase.Firebase</string>
8+
<string>com.firebase.Firebase-Firebase</string>
99
<key>CFBundleInfoDictionaryVersion</key>
1010
<string>6.0</string>
1111
<key>CFBundleName</key>
Binary file not shown.

ios/platform/FirebaseCore.framework/Headers/FIRApp.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,23 +47,23 @@ NS_SWIFT_NAME(FirebaseApp)
4747
/**
4848
* Configures a default Firebase app. Raises an exception if any configuration step fails. The
4949
* default app is named "__FIRAPP_DEFAULT". This method should be called after the app is launched
50-
* and before using Firebase services. This method is thread safe and contains synchronous file I/O
51-
* (reading GoogleService-Info.plist from disk).
50+
* and before using Firebase services. This method should be called from the main thread and
51+
* contains synchronous file I/O (reading GoogleService-Info.plist from disk).
5252
*/
5353
+ (void)configure;
5454

5555
/**
5656
* Configures the default Firebase app with the provided options. The default app is named
57-
* "__FIRAPP_DEFAULT". Raises an exception if any configuration step fails. This method is thread
58-
* safe.
57+
* "__FIRAPP_DEFAULT". Raises an exception if any configuration step fails. This method should be
58+
* called from the main thread.
5959
*
6060
* @param options The Firebase application options used to configure the service.
6161
*/
6262
+ (void)configureWithOptions:(FIROptions *)options NS_SWIFT_NAME(configure(options:));
6363

6464
/**
6565
* Configures a Firebase app with the given name and options. Raises an exception if any
66-
* configuration step fails. This method is thread safe.
66+
* configuration step fails. This method should be called from the main thread.
6767
*
6868
* @param name The application's name given by the developer. The name should should only contain
6969
Letters, Numbers and Underscore.

ios/platform/FirebaseCore.framework/Headers/FIRConfiguration.h

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/FIRLoggerLevel.h>
19+
#import "FIRLoggerLevel.h"
2020

2121
NS_ASSUME_NONNULL_BEGIN
2222

ios/platform/FirebaseCore.framework/Headers/FirebaseCore-umbrella.h

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

ios/platform/FirebaseCore.framework/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<key>CFBundleExecutable</key>
66
<string>FirebaseCore</string>
77
<key>CFBundleIdentifier</key>
8-
<string>com.firebase.Firebase</string>
8+
<string>com.firebase.Firebase-FirebaseCore</string>
99
<key>CFBundleInfoDictionaryVersion</key>
1010
<string>6.0</string>
1111
<key>CFBundleName</key>

0 commit comments

Comments
 (0)