[face-detector] Make Firebase pods version customisable, so it can be…

… used with bare projects (#7141) * [face-detector] Make firebase pod version overridable This makes the firebase pod version overridable so that this package can be used in bare projects, together with other firebase packages. When Firebase versions differ accross multiple packages, pod install will fail. This follows the `$FirebaseSDKVersion` constants also used by react-native-firebase to maximize interop and make it easier for users to configure. [face-detector] Remove explicit FirebaseMLVision dependencies [face-detector] Update changelog Update packages/expo-face-detector/CHANGELOG.md Co-authored-by: Stanisław Chmiela <sjchmiela@users.noreply.github.com> * [ios] Pod install * Update packages/expo-face-detector/CHANGELOG.md
expo · May 14, 2020 · ba7564f · ba7564f
1 parent 0049bf7
commit ba7564f
Show file tree

Hide file tree

Showing 7 changed files with 98 additions and 139 deletions.
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -1548,8 +1548,6 @@ PODS:
     - Firebase/Core (= 6.14.0)
     - Firebase/MLVision (= 6.14.0)
     - Firebase/MLVisionFaceModel (= 6.14.0)
-    - FirebaseMLCommon (= 0.19.0)
-    - FirebaseMLVision (= 0.19.0)
     - UMCore
     - UMFaceDetectorInterface
   - EXFileSystem (8.1.0):
@@ -3825,7 +3823,7 @@ SPEC CHECKSUMS:
   EXDocumentPicker: 3bacb53995a03147696a93e1727288b1a7d39cf7
   EXErrorRecovery: 8f4c21ab2f51bf75defe4536f841a37de59b0661
   EXFacebook: 74d53d9da75d1a953f1821dd417594ed18d7a72f
-  EXFaceDetector: 347204431405fed65226f43921d43c8c5a003d37
+  EXFaceDetector: 29bb21bb1c689a44d095b130f4bddde1b20c8761
   EXFileSystem: cf4232ba7c62dc49b78c2d36005f97b6fddf0b01
   EXFirebaseAnalytics: 535e764dcb3facfa1668d81e422b685eb93c1c9f
   EXFirebaseCore: 4e0976590135563e26af5050916879d5ee218f1b

diff --git a/ios/Pods/.project_cache/installation_cache.yaml b/ios/Pods/.project_cache/installation_cache.yaml
diff --git a/ios/Pods/EXFaceDetector.xcodeproj/project.pbxproj b/ios/Pods/EXFaceDetector.xcodeproj/project.pbxproj
diff --git a/ios/Pods/Local Podspecs/EXFaceDetector.podspec.json b/ios/Pods/Local Podspecs/EXFaceDetector.podspec.json
diff --git a/ios/Pods/Manifest.lock b/ios/Pods/Manifest.lock
diff --git a/packages/expo-face-detector/CHANGELOG.md b/packages/expo-face-detector/CHANGELOG.md
@@ -6,4 +6,6 @@
 
 ### 🎉 New features
 
+- Added support for overriding the iOS Firebase SDK version in the bare workflow. ([#7141](https://github.com/expo/expo/pull/7141) by [@IjzerenHein](https://github.com/IjzerenHein))
+
 ### 🐛 Bug fixes
diff --git a/packages/expo-face-detector/ios/EXFaceDetector.podspec b/packages/expo-face-detector/ios/EXFaceDetector.podspec
@@ -2,6 +2,11 @@ require 'json'
 
 package = JSON.parse(File.read(File.join(__dir__, '..', 'package.json')))
 
+firebase_sdk_version = '6.14.0'
+if defined? $FirebaseSDKVersion
+  firebase_sdk_version = $FirebaseSDKVersion
+end
+
 Pod::Spec.new do |s|
   s.name           = 'EXFaceDetector'
   s.version        = package['version']
@@ -18,9 +23,7 @@ Pod::Spec.new do |s|
 
   s.dependency 'UMCore'
   s.dependency 'UMFaceDetectorInterface'
-  s.dependency 'Firebase/Core', "6.14.0"
-  s.dependency 'Firebase/MLVision', "6.14.0"
-  s.dependency 'Firebase/MLVisionFaceModel', "6.14.0"
-  s.dependency 'FirebaseMLVision', "0.19.0"
-  s.dependency 'FirebaseMLCommon', "0.19.0"
+  s.dependency 'Firebase/Core', firebase_sdk_version
+  s.dependency 'Firebase/MLVision', firebase_sdk_version
+  s.dependency 'Firebase/MLVisionFaceModel', firebase_sdk_version
 end