Skip to content

Commit 83e898a

Browse files
paulb777paulb777
authored
One Firebase version (#6634)
1 parent 6c84675 commit 83e898a

File tree

78 files changed

+220
-675
lines changed

Some content is hidden

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

78 files changed

+220
-675
lines changed

‎.github/workflows/database.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,11 @@ jobs:
8181
# Only build the unit tests on Catalyst. Test stopped working when GHA moved to Xcode 11.4.1.
8282
run: scripts/test_catalyst.sh FirebaseDatabase build FirebaseDatabase-Unit-unit
8383

84+
# Restore when FirebaseUI works with Firebase 7 (#6646)
8485
quickstart:
8586
# Don't run on private repo unless it is a PR.
86-
if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
87+
if: false
88+
#if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
8789
env:
8890
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
8991
signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}

‎.github/workflows/firestore.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,11 @@ jobs:
225225
- name: Swift Build
226226
run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseFirestoreSwift ${{ matrix.target }} spmbuildonly
227227

228+
# Restore when FirebaseUI works with Firebase 7 (#6646)
228229
quickstart:
229230
# Don't run on private repo unless it is a PR.
230-
if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
231+
if: false
232+
#if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
231233
env:
232234
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
233235
signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}

‎.github/workflows/functions.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,11 @@ jobs:
4343
- name: Unit Tests
4444
run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseFunctions ${{ matrix.target }} spmbuildonly
4545

46+
# Restore when FirebaseUI works with Firebase 7 (#6646)
4647
quickstart:
4748
# Don't run on private repo unless it is a PR.
48-
if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
49-
49+
if: false
50+
#if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
5051
env:
5152
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
5253
signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}

‎Crashlytics/Crashlytics/FIRCrashlytics.m‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,7 @@ - (instancetype)initWithApp:(FIRApp *)app
147147
}
148148

149149
+ (void)load {
150-
[FIRApp registerInternalLibrary:(Class<FIRLibrary>)self
151-
withName:@"firebase-crashlytics"
152-
withVersion:@CLS_SDK_DISPLAY_VERSION];
150+
[FIRApp registerInternalLibrary:(Class<FIRLibrary>)self withName:@"firebase-crashlytics"];
153151
}
154152

155153
+ (NSArray<FIRComponent *> *)componentsToRegister {

‎Example/InstanceID/Tests/FIRInstanceIDCheckinStoreTest.m‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#import "Firebase/InstanceID/FIRInstanceIDCheckinStore.h"
2727
#import "Firebase/InstanceID/FIRInstanceIDStore.h"
2828
#import "Firebase/InstanceID/FIRInstanceIDUtilities.h"
29-
#import "Firebase/InstanceID/FIRInstanceIDVersionUtilities.h"
3029
#import "Firebase/InstanceID/Private/FIRInstanceIDCheckinPreferences.h"
3130

3231
static const NSTimeInterval kExpectationTimeout = 12;

‎Firebase.podspec‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'Firebase'
3-
s.version = '6.34.0'
3+
s.version = '7.0.0'
44
s.summary = 'Firebase'
55

66
s.description = <<-DESC
@@ -31,12 +31,12 @@ Simplify your app development, grow your user base, and monetize more effectivel
3131
s.default_subspec = 'Core'
3232

3333
s.subspec 'Core' do |ss|
34-
ss.ios.dependency 'FirebaseAnalytics', '6.9.0'
34+
ss.ios.dependency 'FirebaseAnalytics', '7.0.0'
3535
ss.dependency 'Firebase/CoreOnly'
3636
end
3737

3838
s.subspec 'CoreOnly' do |ss|
39-
ss.dependency 'FirebaseCore', '6.10.4'
39+
ss.dependency 'FirebaseCore', '7.0.0'
4040
ss.source_files = 'CoreOnly/Sources/Firebase.h'
4141
ss.preserve_paths = 'CoreOnly/Sources/module.modulemap'
4242
if ENV['FIREBASE_POD_REPO_FOR_DEV_POD'] then
@@ -62,23 +62,23 @@ Simplify your app development, grow your user base, and monetize more effectivel
6262

6363
s.subspec 'ABTesting' do |ss|
6464
ss.dependency 'Firebase/CoreOnly'
65-
ss.dependency 'FirebaseABTesting', '~> 4.2.0'
65+
ss.dependency 'FirebaseABTesting', '~> 7.0.0'
6666
end
6767

6868
s.subspec 'AdMob' do |ss|
6969
ss.dependency 'Firebase/CoreOnly'
7070
ss.ios.deployment_target = '9.0'
71-
ss.ios.dependency 'Google-Mobile-Ads-SDK', '~> 7.63'
71+
ss.ios.dependency 'Google-Mobile-Ads-SDK', '~> 7.66'
7272
end
7373

7474
s.subspec 'AppDistribution' do |ss|
7575
ss.dependency 'Firebase/CoreOnly'
76-
ss.ios.dependency 'FirebaseAppDistribution', '~> 0.9.3'
76+
ss.ios.dependency 'FirebaseAppDistribution', '~> 7.0.0-beta'
7777
end
7878

7979
s.subspec 'Auth' do |ss|
8080
ss.dependency 'Firebase/CoreOnly'
81-
ss.dependency 'FirebaseAuth', '~> 6.9.2'
81+
ss.dependency 'FirebaseAuth', '~> 7.0.0'
8282
# Standard platforms PLUS watchOS.
8383
ss.ios.deployment_target = '10.0'
8484
ss.osx.deployment_target = '10.12'
@@ -88,7 +88,7 @@ Simplify your app development, grow your user base, and monetize more effectivel
8888

8989
s.subspec 'Crashlytics' do |ss|
9090
ss.dependency 'Firebase/CoreOnly'
91-
ss.dependency 'FirebaseCrashlytics', '~> 4.6.2'
91+
ss.dependency 'FirebaseCrashlytics', '~> 7.0.0'
9292
# Standard platforms PLUS watchOS.
9393
ss.ios.deployment_target = '10.0'
9494
ss.osx.deployment_target = '10.12'
@@ -98,32 +98,32 @@ Simplify your app development, grow your user base, and monetize more effectivel
9898

9999
s.subspec 'Database' do |ss|
100100
ss.dependency 'Firebase/CoreOnly'
101-
ss.dependency 'FirebaseDatabase', '~> 6.6.0'
101+
ss.dependency 'FirebaseDatabase', '~> 7.0.0'
102102
end
103103

104104
s.subspec 'DynamicLinks' do |ss|
105105
ss.dependency 'Firebase/CoreOnly'
106-
ss.ios.dependency 'FirebaseDynamicLinks', '~> 4.3.1'
106+
ss.ios.dependency 'FirebaseDynamicLinks', '~> 7.0.0'
107107
end
108108

109109
s.subspec 'Firestore' do |ss|
110110
ss.dependency 'Firebase/CoreOnly'
111-
ss.dependency 'FirebaseFirestore', '~> 1.19.0'
111+
ss.dependency 'FirebaseFirestore', '~> 7.0.0'
112112
end
113113

114114
s.subspec 'Functions' do |ss|
115115
ss.dependency 'Firebase/CoreOnly'
116-
ss.dependency 'FirebaseFunctions', '~> 2.9.0'
116+
ss.dependency 'FirebaseFunctions', '~> 7.0.0'
117117
end
118118

119119
s.subspec 'InAppMessaging' do |ss|
120120
ss.dependency 'Firebase/CoreOnly'
121-
ss.ios.dependency 'FirebaseInAppMessaging', '~> 0.24.0'
121+
ss.ios.dependency 'FirebaseInAppMessaging', '~> 7.0.0-beta'
122122
end
123123

124124
s.subspec 'Messaging' do |ss|
125125
ss.dependency 'Firebase/CoreOnly'
126-
ss.dependency 'FirebaseMessaging', '~> 4.7.1'
126+
ss.dependency 'FirebaseMessaging', '~> 7.0.0'
127127
# Standard platforms PLUS watchOS.
128128
ss.ios.deployment_target = '10.0'
129129
ss.osx.deployment_target = '10.12'
@@ -133,17 +133,17 @@ Simplify your app development, grow your user base, and monetize more effectivel
133133

134134
s.subspec 'Performance' do |ss|
135135
ss.dependency 'Firebase/CoreOnly'
136-
ss.ios.dependency 'FirebasePerformance', '~> 3.3.1'
136+
ss.ios.dependency 'FirebasePerformance', '~> 7.0.0'
137137
end
138138

139139
s.subspec 'RemoteConfig' do |ss|
140140
ss.dependency 'Firebase/CoreOnly'
141-
ss.dependency 'FirebaseRemoteConfig', '~> 4.9.1'
141+
ss.dependency 'FirebaseRemoteConfig', '~> 7.0.0'
142142
end
143143

144144
s.subspec 'Storage' do |ss|
145145
ss.dependency 'Firebase/CoreOnly'
146-
ss.dependency 'FirebaseStorage', '~> 3.9.1'
146+
ss.dependency 'FirebaseStorage', '~> 7.0.0'
147147
# Standard platforms PLUS watchOS.
148148
ss.ios.deployment_target = '10.0'
149149
ss.osx.deployment_target = '10.12'
@@ -153,17 +153,17 @@ Simplify your app development, grow your user base, and monetize more effectivel
153153

154154
s.subspec 'MLCommon' do |ss|
155155
ss.dependency 'Firebase/CoreOnly'
156-
ss.ios.dependency 'FirebaseMLCommon', '~> 0.21.0'
156+
ss.ios.dependency 'FirebaseMLCommon', '~> 7.0.0-beta'
157157
end
158158

159159
s.subspec 'MLModelInterpreter' do |ss|
160160
ss.dependency 'Firebase/CoreOnly'
161-
ss.ios.dependency 'FirebaseMLModelInterpreter', '~> 0.22.0'
161+
ss.ios.dependency 'FirebaseMLModelInterpreter', '~> 7.0.0-beta'
162162
end
163163

164164
s.subspec 'MLVision' do |ss|
165165
ss.dependency 'Firebase/CoreOnly'
166-
ss.ios.dependency 'FirebaseMLVision', '~> 0.21.0'
166+
ss.ios.dependency 'FirebaseMLVision', '~> 7.0.0-beta'
167167
end
168168

169169
end

‎Firebase/InstanceID/FIRInstanceID.m‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#import "Firebase/InstanceID/FIRInstanceIDTokenInfo.h"
3030
#import "Firebase/InstanceID/FIRInstanceIDTokenManager.h"
3131
#import "Firebase/InstanceID/FIRInstanceIDUtilities.h"
32-
#import "Firebase/InstanceID/FIRInstanceIDVersionUtilities.h"
3332
#import "Firebase/InstanceID/NSError+FIRInstanceID.h"
3433
#import "Firebase/InstanceID/Private/FIRInstanceID+Private.h"
3534
#import "Firebase/InstanceID/Private/FIRInstanceIDCheckinPreferences.h"
@@ -584,9 +583,7 @@ - (NSString *)versionInfo {
584583
#pragma mark - Config
585584

586585
+ (void)load {
587-
[FIRApp registerInternalLibrary:(Class<FIRLibrary>)self
588-
withName:@"fire-iid"
589-
withVersion:FIRInstanceIDCurrentLibraryVersion()];
586+
[FIRApp registerInternalLibrary:(Class<FIRLibrary>)self withName:@"fire-iid"];
590587
}
591588

592589
+ (nonnull NSArray<FIRComponent *> *)componentsToRegister {

‎Firebase/InstanceID/FIRInstanceIDCheckinStore.m‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#import "Firebase/InstanceID/FIRInstanceIDCheckinService.h"
2424
#import "Firebase/InstanceID/FIRInstanceIDLogger.h"
2525
#import "Firebase/InstanceID/FIRInstanceIDUtilities.h"
26-
#import "Firebase/InstanceID/FIRInstanceIDVersionUtilities.h"
2726
#import "Firebase/InstanceID/NSError+FIRInstanceID.h"
2827

2928
static NSString *const kFIRInstanceIDCheckinKeychainGeneric = @"com.google.iid";

‎Firebase/InstanceID/FIRInstanceIDStore.m‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#import "Firebase/InstanceID/FIRInstanceIDConstants.h"
2121
#import "Firebase/InstanceID/FIRInstanceIDLogger.h"
2222
#import "Firebase/InstanceID/FIRInstanceIDTokenStore.h"
23-
#import "Firebase/InstanceID/FIRInstanceIDVersionUtilities.h"
2423
#import "Firebase/InstanceID/Private/FIRInstanceIDCheckinPreferences.h"
2524

2625
// NOTE: These values should be in sync with what InstanceID saves in as.

‎Firebase/InstanceID/FIRInstanceIDUtilities.m‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
#import "Firebase/InstanceID/Public/FIRInstanceID.h"
2828
#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
2929

30-
// Convert the macro to a string
31-
#define STR_EXPAND(x) #x
32-
#define STR(x) STR_EXPAND(x)
33-
3430
static NSString *const kFIRInstanceIDAPNSSandboxPrefix = @"s_";
3531
static NSString *const kFIRInstanceIDAPNSProdPrefix = @"p_";
3632

0 commit comments

Comments
 (0)