Skip to content

Commit 1ff247c

Browse files
committed
Revert "fix(ios, sdk): constrain transitive dependencies more tightly"
This reverts commit d03ab42. the cure was worse than the disease, see: #8127 If we constrain deps to <=, old deps may be used which is invalid If we constrain deps to =, then binary firestore-ios-sdk-frameworks does not resolve If we constrain deps to ~> like FlutterFire it may work However, we constrained this way for a long time without issue until one build break that prompted this commit, and the ~> suffered the build break as well in FlutterFire The break was fixed quickly and had a workaround, so revert appears to be the lesser of all evils
1 parent 5bda835 commit 1ff247c

File tree

17 files changed

+84
-84
lines changed

17 files changed

+84
-84
lines changed

packages/analytics/RNFBAnalytics.podspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ Pod::Spec.new do |s|
4141
# Firebase dependencies
4242
if defined?($RNFirebaseAnalyticsWithoutAdIdSupport) && ($RNFirebaseAnalyticsWithoutAdIdSupport == true)
4343
Pod::UI.puts "#{s.name}: Using Firebase/AnalyticsWithoutAdIdSupport pod in place of default Firebase/Analytics"
44-
s.dependency 'Firebase/AnalyticsWithoutAdIdSupport', "<= #{firebase_sdk_version}"
44+
s.dependency 'Firebase/AnalyticsWithoutAdIdSupport', firebase_sdk_version
4545
else
4646
if !defined?($RNFirebaseAnalyticsWithoutAdIdSupport)
4747
Pod::UI.puts "#{s.name}: Using default Firebase/Analytics with Ad Ids. May require App Tracking Transparency. Not allowed for Kids apps."
4848
Pod::UI.puts "#{s.name}: You may set variable `$RNFirebaseAnalyticsWithoutAdIdSupport=true` in Podfile to use analytics without ad ids."
4949
end
50-
s.dependency 'Firebase/Analytics', "<= #{firebase_sdk_version}"
50+
s.dependency 'Firebase/Analytics', firebase_sdk_version
5151

5252
# Special pod for on-device conversion
5353
if defined?($RNFirebaseAnalyticsEnableAdSupport) && ($RNFirebaseAnalyticsEnableAdSupport == true)
@@ -59,7 +59,7 @@ Pod::Spec.new do |s|
5959
# Special pod for on-device conversion
6060
if defined?($RNFirebaseAnalyticsGoogleAppMeasurementOnDeviceConversion) && ($RNFirebaseAnalyticsGoogleAppMeasurementOnDeviceConversion == true)
6161
Pod::UI.puts "#{s.name}: GoogleAppMeasurementOnDeviceConversion pod added"
62-
s.dependency 'GoogleAppMeasurementOnDeviceConversion', "<= #{firebase_sdk_version}"
62+
s.dependency 'GoogleAppMeasurementOnDeviceConversion', firebase_sdk_version
6363
end
6464

6565
if defined?($RNFirebaseAsStaticFramework)

packages/app-check/RNFBAppCheck.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Pod::Spec.new do |s|
3939
end
4040

4141
# Firebase dependencies
42-
s.dependency 'Firebase/AppCheck', "<= #{firebase_sdk_version}"
42+
s.dependency 'Firebase/AppCheck', firebase_sdk_version
4343

4444
if defined?($RNFirebaseAsStaticFramework)
4545
Pod::UI.puts "#{s.name}: Using overridden static_framework value of '#{$RNFirebaseAsStaticFramework}'"

packages/app-distribution/RNFBAppDistribution.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Pod::Spec.new do |s|
3737
end
3838

3939
# Firebase dependencies
40-
s.dependency 'Firebase/AppDistribution', "<= #{firebase_sdk_version}"
40+
s.dependency 'Firebase/AppDistribution', firebase_sdk_version
4141

4242
if defined?($RNFirebaseAsStaticFramework)
4343
Pod::UI.puts "#{s.name}: Using overridden static_framework value of '#{$RNFirebaseAsStaticFramework}'"

packages/app/RNFBApp.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Pod::Spec.new do |s|
3333
end
3434

3535
# Firebase dependencies
36-
s.dependency 'Firebase/CoreOnly', "<= #{firebase_sdk_version}"
36+
s.dependency 'Firebase/CoreOnly', firebase_sdk_version
3737

3838
if defined?($RNFirebaseAsStaticFramework)
3939
Pod::UI.puts "#{s.name}: Using overridden static_framework value of '#{$RNFirebaseAsStaticFramework}'"

packages/auth/RNFBAuth.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Pod::Spec.new do |s|
3939
end
4040

4141
# Firebase dependencies
42-
s.dependency 'Firebase/Auth', "<= #{firebase_sdk_version}"
42+
s.dependency 'Firebase/Auth', firebase_sdk_version
4343

4444
if defined?($RNFirebaseAsStaticFramework)
4545
Pod::UI.puts "#{s.name}: Using overridden static_framework value of '#{$RNFirebaseAsStaticFramework}'"

packages/crashlytics/RNFBCrashlytics.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ Pod::Spec.new do |s|
4141
end
4242

4343
# Firebase dependencies
44-
s.dependency 'Firebase/Crashlytics', "<= #{firebase_sdk_version}"
45-
s.dependency 'FirebaseCoreExtension', "<= #{firebase_sdk_version}"
44+
s.dependency 'Firebase/Crashlytics', firebase_sdk_version
45+
s.dependency 'FirebaseCoreExtension'
4646

4747
if defined?($RNFirebaseAsStaticFramework)
4848
Pod::UI.puts "#{s.name}: Using overridden static_framework value of '#{$RNFirebaseAsStaticFramework}'"

packages/database/RNFBDatabase.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Pod::Spec.new do |s|
4040
end
4141

4242
# Firebase dependencies
43-
s.dependency 'Firebase/Database', "<= #{firebase_sdk_version}"
43+
s.dependency 'Firebase/Database', firebase_sdk_version
4444

4545
if defined?($RNFirebaseAsStaticFramework)
4646
Pod::UI.puts "#{s.name}: Using overridden static_framework value of '#{$RNFirebaseAsStaticFramework}'"

packages/dynamic-links/RNFBDynamicLinks.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Pod::Spec.new do |s|
3737
end
3838

3939
# Firebase dependencies
40-
s.dependency 'Firebase/DynamicLinks', "<= #{firebase_sdk_version}"
40+
s.dependency 'Firebase/DynamicLinks', firebase_sdk_version
4141
s.dependency 'GoogleUtilities/AppDelegateSwizzler'
4242

4343
if defined?($RNFirebaseAsStaticFramework)

packages/firestore/RNFBFirestore.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Pod::Spec.new do |s|
3939
end
4040

4141
# Firebase dependencies
42-
s.dependency 'Firebase/Firestore', "<= #{firebase_sdk_version}"
42+
s.dependency 'Firebase/Firestore', firebase_sdk_version
4343

4444
if defined?($RNFirebaseAsStaticFramework)
4545
Pod::UI.puts "#{s.name}: Using overridden static_framework value of '#{$RNFirebaseAsStaticFramework}'"

packages/functions/RNFBFunctions.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Pod::Spec.new do |s|
3939
end
4040

4141
# Firebase dependencies
42-
s.dependency 'Firebase/Functions', "<= #{firebase_sdk_version}"
42+
s.dependency 'Firebase/Functions', firebase_sdk_version
4343

4444
if defined?($RNFirebaseAsStaticFramework)
4545
Pod::UI.puts "#{s.name}: Using overridden static_framework value of '#{$RNFirebaseAsStaticFramework}'"

0 commit comments

Comments
 (0)