chore(ios): harmonize dependencies and version handling

mikehardy · mikehardy · commit 39ffe50e2bc9 · 2020-12-04T15:36:00.000-05:00
- depend on firebase_core in preference to Firebase/Core (or CoreOnly)
- do not specify override versions where unnecessary
- include Firebase SDK version override logic in all podspecs
diff --git a/packages/cloud_firestore/cloud_firestore/example/ios/Podfile b/packages/cloud_firestore/cloud_firestore/example/ios/Podfile
@@ -29,8 +29,20 @@ flutter_ios_podfile_setup
 
 target 'Runner' do
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
-  
-  pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => '6.33.0'
+
+  if defined?($FirebaseSDKVersion)
+    Pod::UI.puts "#{pubspec['name']}: Using user specified Firebase SDK version for FirebaseFirestore framwork: '#{$FirebaseSDKVersion}'"
+    firebase_sdk_version = $FirebaseSDKVersion
+  else
+    firebase_core_script = File.join(File.expand_path('..', File.expand_path('..', File.expand_path('..', File.dirname(__FILE__)))), 'firebase_core/ios/firebase_sdk_version.rb')
+    if File.exist?(firebase_core_script)
+      require firebase_core_script
+      firebase_sdk_version = firebase_sdk_version!
+      Pod::UI.puts "#{pubspec['name']}: Using Firebase SDK version '#{firebase_sdk_version}' defined in 'firebase_core for FirebaseFirestore framework'"
+    end
+  end
+
+  pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => $firebase_sdk_version
 end
 
 post_install do |installer|
diff --git a/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore.podspec b/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore.podspec
@@ -3,7 +3,6 @@ require 'yaml'
 pubspec = YAML.load_file(File.join('..', 'pubspec.yaml'))
 library_version = pubspec['version'].gsub('+', '-')
 
-firebase_sdk_version = '6.33.0'
 if defined?($FirebaseSDKVersion)
   Pod::UI.puts "#{pubspec['name']}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
   firebase_sdk_version = $FirebaseSDKVersion
@@ -34,8 +33,7 @@ Pod::Spec.new do |s|
   s.dependency 'Flutter'
 
   s.dependency 'firebase_core'
-  s.dependency 'Firebase/CoreOnly', "~> #{firebase_sdk_version}"
-  s.dependency 'Firebase/Firestore', "~> #{firebase_sdk_version}"
+  s.dependency 'Firebase/Firestore', firebase_sdk_version
   
   s.static_framework = true
   s.pod_target_xcconfig = {
diff --git a/packages/cloud_functions/cloud_functions/ios/cloud_functions.podspec b/packages/cloud_functions/cloud_functions/ios/cloud_functions.podspec
@@ -2,7 +2,6 @@ require 'yaml'
 pubspec = YAML.load_file(File.join('..', 'pubspec.yaml'))
 library_version = pubspec['version'].gsub('+', '-')
 
-firebase_sdk_version = '6.33.0'
 if defined?($FirebaseSDKVersion)
   Pod::UI.puts "#{pubspec['name']}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
   firebase_sdk_version = $FirebaseSDKVersion
@@ -34,8 +33,7 @@ Pod::Spec.new do |s|
 
   # Firebase dependencies
   s.dependency 'firebase_core'
-  s.dependency 'Firebase/CoreOnly', "~> #{firebase_sdk_version}"
-  s.dependency 'Firebase/Functions', "~> #{firebase_sdk_version}"
+  s.dependency 'Firebase/Functions', firebase_sdk_version
 
   s.static_framework = true
   s.pod_target_xcconfig = {
diff --git a/packages/firebase_admob/ios/firebase_admob.podspec b/packages/firebase_admob/ios/firebase_admob.podspec
@@ -6,19 +6,6 @@ require 'yaml'
 pubspec = YAML.load_file(File.join('..', 'pubspec.yaml'))
 library_version = pubspec['version'].gsub('+', '-')
 
-firebase_sdk_version = '6.33.0'
-if defined?($FirebaseSDKVersion)
-  Pod::UI.puts "#{pubspec['name']}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
-  firebase_sdk_version = $FirebaseSDKVersion
-else
-  firebase_core_script = File.join(File.expand_path('..', File.expand_path('..', File.dirname(__FILE__))), 'firebase_core/ios/firebase_sdk_version.rb')
-  if File.exist?(firebase_core_script)
-    require firebase_core_script
-    firebase_sdk_version = firebase_sdk_version!
-    Pod::UI.puts "#{pubspec['name']}: Using Firebase SDK version '#{firebase_sdk_version}' defined in 'firebase_core'"
-  end
-end
-
 Pod::Spec.new do |s|
   s.name             = pubspec['name']
   s.version          = library_version
@@ -32,7 +19,6 @@ Pod::Spec.new do |s|
   s.public_header_files = 'Classes/**/*.h'
   s.dependency 'Flutter'
   s.dependency 'firebase_core'
-  s.dependency 'Firebase/CoreOnly', "~> #{firebase_sdk_version}"
   s.dependency 'Google-Mobile-Ads-SDK'
 
   s.ios.deployment_target = '8.0'
diff --git a/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics.podspec b/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics.podspec
@@ -3,7 +3,6 @@ require 'yaml'
 pubspec = YAML.load_file(File.join('..', 'pubspec.yaml'))
 library_version = pubspec['version'].gsub('+', '-')
 
-firebase_sdk_version = '6.33.0'
 if defined?($FirebaseSDKVersion)
   Pod::UI.puts "#{pubspec['name']}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
   firebase_sdk_version = $FirebaseSDKVersion
@@ -34,8 +33,7 @@ Pod::Spec.new do |s|
   s.dependency 'Flutter'
 
   s.dependency 'firebase_core'
-  s.dependency 'Firebase/CoreOnly', "~> #{firebase_sdk_version}"
-  s.dependency 'Firebase/Analytics', "~> #{firebase_sdk_version}"
+  s.dependency 'Firebase/Analytics', firebase_sdk_version
   
   s.static_framework = true
   s.pod_target_xcconfig = { 
diff --git a/packages/firebase_auth/firebase_auth/ios/firebase_auth.podspec b/packages/firebase_auth/firebase_auth/ios/firebase_auth.podspec
@@ -3,7 +3,6 @@ require 'yaml'
 pubspec = YAML.load_file(File.join('..', 'pubspec.yaml'))
 library_version = pubspec['version'].gsub('+', '-')
 
-firebase_sdk_version = '6.33.0'
 if defined?($FirebaseSDKVersion)
   Pod::UI.puts "#{pubspec['name']}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
   firebase_sdk_version = $FirebaseSDKVersion
@@ -33,8 +32,7 @@ Pod::Spec.new do |s|
   s.dependency 'Flutter'
 
   s.dependency 'firebase_core'
-  s.dependency 'Firebase/CoreOnly', "~> #{firebase_sdk_version}"
-  s.dependency 'Firebase/Auth', "~> #{firebase_sdk_version}"
+  s.dependency 'Firebase/Auth', firebase_sdk_version
   
   s.static_framework = true
   s.pod_target_xcconfig = { 
diff --git a/packages/firebase_core/firebase_core/ios/firebase_core.podspec b/packages/firebase_core/firebase_core/ios/firebase_core.podspec
@@ -3,7 +3,6 @@ require 'yaml'
 pubspec = YAML.load_file(File.join('..', 'pubspec.yaml'))
 library_version = pubspec['version'].gsub('+', '-')
 
-firebase_sdk_version = '6.33.0'
 if defined?($FirebaseSDKVersion)
   Pod::UI.puts "#{pubspec['name']}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
   firebase_sdk_version = $FirebaseSDKVersion
@@ -34,7 +33,7 @@ Pod::Spec.new do |s|
   s.dependency 'Flutter'
   
   # Firebase dependencies
-  s.dependency 'Firebase/CoreOnly', "~> #{firebase_sdk_version}"
+  s.dependency 'Firebase/CoreOnly', firebase_sdk_version
    
   s.static_framework = true
   s.pod_target_xcconfig = {
diff --git a/packages/firebase_crashlytics/firebase_crashlytics/ios/firebase_crashlytics.podspec b/packages/firebase_crashlytics/firebase_crashlytics/ios/firebase_crashlytics.podspec
@@ -3,7 +3,6 @@ require 'yaml'
 pubspec = YAML.load_file(File.join('..', 'pubspec.yaml'))
 library_version = pubspec['version'].gsub('+', '-')
 
-firebase_sdk_version = '6.33.0'
 if defined?($FirebaseSDKVersion)
   Pod::UI.puts "#{pubspec['name']}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
   firebase_sdk_version = $FirebaseSDKVersion
@@ -32,8 +31,7 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '8.0'
 
   s.dependency 'firebase_core'
-  s.dependency 'Firebase/CoreOnly', "~> #{firebase_sdk_version}"
-  s.dependency 'Firebase/Crashlytics', "~> #{firebase_sdk_version}"
+  s.dependency 'Firebase/Crashlytics', firebase_sdk_version
 
   s.static_framework = true
   s.pod_target_xcconfig = {
diff --git a/packages/firebase_database/ios/firebase_database.podspec b/packages/firebase_database/ios/firebase_database.podspec
@@ -3,7 +3,6 @@ require 'yaml'
 pubspec = YAML.load_file(File.join('..', 'pubspec.yaml'))
 library_version = pubspec['version'].gsub('+', '-')
 
-firebase_sdk_version = '6.33.0'
 if defined?($FirebaseSDKVersion)
   Pod::UI.puts "#{pubspec['name']}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
   firebase_sdk_version = $FirebaseSDKVersion
@@ -33,8 +32,7 @@ Pod::Spec.new do |s|
   s.dependency 'Flutter'
 
   s.dependency 'firebase_core'
-  s.dependency 'Firebase/CoreOnly', "~> #{firebase_sdk_version}"
-  s.dependency 'Firebase/Database', "~> #{firebase_sdk_version}"
+  s.dependency 'Firebase/Database', firebase_sdk_version
   
   s.static_framework = true
   s.pod_target_xcconfig = {
diff --git a/packages/firebase_dynamic_links/ios/firebase_dynamic_links.podspec b/packages/firebase_dynamic_links/ios/firebase_dynamic_links.podspec
@@ -3,7 +3,6 @@ require 'yaml'
 pubspec = YAML.load_file(File.join('..', 'pubspec.yaml'))
 library_version = pubspec['version'].gsub('+', '-')
 
-firebase_sdk_version = '6.33.0'
 if defined?($FirebaseSDKVersion)
   Pod::UI.puts "#{pubspec['name']}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
   firebase_sdk_version = $FirebaseSDKVersion
@@ -31,8 +30,7 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '8.0'
   s.static_framework = true
   s.dependency 'firebase_core'
-  s.dependency 'Firebase/CoreOnly', "~> #{firebase_sdk_version}"
-  s.dependency 'Firebase/DynamicLinks', "~> #{firebase_sdk_version}"
+  s.dependency 'Firebase/DynamicLinks', firebase_sdk_version
 
   s.pod_target_xcconfig = {
     'GCC_PREPROCESSOR_DEFINITIONS' => "LIBRARY_VERSION=\\@\\\"#{library_version}\\\" LIBRARY_NAME=\\@\\\"flutter-fire-dl\\\"",
diff --git a/packages/firebase_in_app_messaging/ios/firebase_in_app_messaging.podspec b/packages/firebase_in_app_messaging/ios/firebase_in_app_messaging.podspec
@@ -3,7 +3,6 @@ require 'yaml'
 pubspec = YAML.load_file(File.join('..', 'pubspec.yaml'))
 library_version = pubspec['version'].gsub('+', '-')
 
-firebase_sdk_version = '6.33.0'
 if defined?($FirebaseSDKVersion)
   Pod::UI.puts "#{pubspec['name']}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
   firebase_sdk_version = $FirebaseSDKVersion
@@ -29,8 +28,7 @@ Pod::Spec.new do |s|
   s.public_header_files = 'Classes/**/*.h'
   s.dependency 'Flutter'
   s.dependency 'firebase_core'
-  s.dependency 'Firebase/CoreOnly', "~> #{firebase_sdk_version}"
-  s.dependency 'Firebase/InAppMessaging', "~> #{firebase_sdk_version}"
+  s.dependency 'Firebase/InAppMessaging', firebase_sdk_version
   s.static_framework = true
 
   s.ios.deployment_target = '8.0'
diff --git a/packages/firebase_messaging/firebase_messaging/ios/firebase_messaging.podspec b/packages/firebase_messaging/firebase_messaging/ios/firebase_messaging.podspec
@@ -3,7 +3,6 @@ require 'yaml'
 pubspec = YAML.load_file(File.join('..', 'pubspec.yaml'))
 library_version = pubspec['version'].gsub('+', '-')
 
-firebase_sdk_version = '6.33.0'
 if defined?($FirebaseSDKVersion)
   Pod::UI.puts "#{pubspec['name']}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
   firebase_sdk_version = $FirebaseSDKVersion
@@ -34,8 +33,7 @@ Pod::Spec.new do |s|
   s.dependency 'Flutter'
 
   s.dependency 'firebase_core'
-  s.dependency 'Firebase/CoreOnly', "~> #{firebase_sdk_version}"
-  s.dependency 'Firebase/Messaging', "~> #{firebase_sdk_version}"
+  s.dependency 'Firebase/Messaging', firebase_sdk_version
   s.static_framework = true
   s.pod_target_xcconfig = {
     'GCC_PREPROCESSOR_DEFINITIONS' => "LIBRARY_VERSION=\\@\\\"#{library_version}\\\" LIBRARY_NAME=\\@\\\"flutter-fire-fcm\\\"",
diff --git a/packages/firebase_ml_custom/ios/firebase_ml_custom.podspec b/packages/firebase_ml_custom/ios/firebase_ml_custom.podspec
@@ -7,6 +7,18 @@ require 'yaml'
 pubspec = YAML.load_file(File.join('..', 'pubspec.yaml'))
 libraryVersion = pubspec['version'].gsub('+', '-')
 
+if defined?($FirebaseSDKVersion)
+  Pod::UI.puts "#{pubspec['name']}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
+  firebase_sdk_version = $FirebaseSDKVersion
+else
+  firebase_core_script = File.join(File.expand_path('..', File.expand_path('..', File.dirname(__FILE__))), 'firebase_core/ios/firebase_sdk_version.rb')
+  if File.exist?(firebase_core_script)
+    require firebase_core_script
+    firebase_sdk_version = firebase_sdk_version!
+    Pod::UI.puts "#{pubspec['name']}: Using Firebase SDK version '#{firebase_sdk_version}' defined in 'firebase_core'"
+  end
+end
+
 Pod::Spec.new do |s|
   s.name             = 'firebase_ml_custom'
   s.version          = '0.0.1'
@@ -21,7 +33,8 @@ A new Flutter plugin.
   s.source_files = 'Classes/**/*'
   s.public_header_files = 'Classes/**/*.h'
   s.dependency 'Flutter'
-  s.dependency 'Firebase/MLModelInterpreter', "~> 6.33.0"
+  s.dependency 'firebase_core'
+  s.dependency 'Firebase/MLModelInterpreter', firebase_sdk_version
   s.ios.deployment_target = '9.0'
   s.static_framework = true
 
diff --git a/packages/firebase_ml_vision/ios/firebase_ml_vision.podspec b/packages/firebase_ml_vision/ios/firebase_ml_vision.podspec
@@ -6,6 +6,18 @@ require 'yaml'
 pubspec = YAML.load_file(File.join('..', 'pubspec.yaml'))
 libraryVersion = pubspec['version'].gsub('+', '-')
 
+if defined?($FirebaseSDKVersion)
+  Pod::UI.puts "#{pubspec['name']}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
+  firebase_sdk_version = $FirebaseSDKVersion
+else
+  firebase_core_script = File.join(File.expand_path('..', File.expand_path('..', File.dirname(__FILE__))), 'firebase_core/ios/firebase_sdk_version.rb')
+  if File.exist?(firebase_core_script)
+    require firebase_core_script
+    firebase_sdk_version = firebase_sdk_version!
+    Pod::UI.puts "#{pubspec['name']}: Using Firebase SDK version '#{firebase_sdk_version}' defined in 'firebase_core'"
+  end
+end
+
 Pod::Spec.new do |s|
   s.name             = 'firebase_ml_vision'
   s.version          = '0.1.1'
@@ -21,8 +33,8 @@ An SDK that brings Google's machine learning expertise to Android and iOS apps i
   s.source_files = 'Classes/**/*'
   s.public_header_files = 'Classes/**/*.h'
   s.dependency 'Flutter'
-  s.dependency 'Firebase/Core'
-  s.dependency 'Firebase/MLVision'
+  s.dependency 'firebase_core'
+  s.dependency 'Firebase/MLVision', firebase_sdk_version
   s.ios.deployment_target = '9.0'
   s.static_framework = true
 
diff --git a/packages/firebase_performance/ios/firebase_performance.podspec b/packages/firebase_performance/ios/firebase_performance.podspec
@@ -6,7 +6,6 @@ require 'yaml'
 pubspec = YAML.load_file(File.join('..', 'pubspec.yaml'))
 library_version = pubspec['version'].gsub('+', '-')
 
-firebase_sdk_version = '6.33.0'
 if defined?($FirebaseSDKVersion)
   Pod::UI.puts "#{pubspec['name']}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
   firebase_sdk_version = $FirebaseSDKVersion
@@ -32,8 +31,7 @@ Pod::Spec.new do |s|
   s.public_header_files = 'Classes/**/*.h'
   s.dependency 'Flutter'
   s.dependency 'firebase_core'
-  s.dependency 'Firebase/CoreOnly', "~> #{firebase_sdk_version}"
-  s.dependency 'Firebase/Performance', "~> #{firebase_sdk_version}"
+  s.dependency 'Firebase/Performance', firebase_sdk_version
   s.ios.deployment_target = '8.0'
   s.static_framework = true
 
diff --git a/packages/firebase_remote_config/ios/firebase_remote_config.podspec b/packages/firebase_remote_config/ios/firebase_remote_config.podspec
@@ -3,7 +3,6 @@ require 'yaml'
 pubspec = YAML.load_file(File.join('..', 'pubspec.yaml'))
 library_version = pubspec['version'].gsub('+', '-')
 
-firebase_sdk_version = '6.33.0'
 if defined?($FirebaseSDKVersion)
   Pod::UI.puts "#{pubspec['name']}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
   firebase_sdk_version = $FirebaseSDKVersion
@@ -33,8 +32,7 @@ Pod::Spec.new do |s|
   s.dependency 'Flutter'
 
   s.dependency 'firebase_core'
-  s.dependency 'Firebase/CoreOnly', "~> #{firebase_sdk_version}"
-  s.dependency 'Firebase/RemoteConfig', "~> #{firebase_sdk_version}"
+  s.dependency 'Firebase/RemoteConfig', firebase_sdk_version
 
   s.static_framework = true
   s.pod_target_xcconfig = { 
diff --git a/packages/firebase_storage/firebase_storage/ios/firebase_storage.podspec b/packages/firebase_storage/firebase_storage/ios/firebase_storage.podspec
@@ -3,7 +3,6 @@ require 'yaml'
 pubspec = YAML.load_file(File.join('..', 'pubspec.yaml'))
 library_version = pubspec['version'].gsub('+', '-')
 
-firebase_sdk_version = '6.33.0'
 if defined?($FirebaseSDKVersion)
   Pod::UI.puts "#{pubspec['name']}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'"
   firebase_sdk_version = $FirebaseSDKVersion
@@ -33,8 +32,7 @@ Pod::Spec.new do |s|
   s.dependency 'Flutter'
 
   s.dependency 'firebase_core'
-  s.dependency 'Firebase/CoreOnly', "~> #{firebase_sdk_version}"
-  s.dependency 'Firebase/Storage', "~> #{firebase_sdk_version}"
+  s.dependency 'Firebase/Storage', firebase_sdk_version
   
   s.static_framework = true
   s.pod_target_xcconfig = {
