Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[face-detector] Make Firebase pods version customisable, so it can be used with bare projects #7141

Merged
merged 3 commits into from May 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions ios/Podfile.lock
Expand Up @@ -1548,8 +1548,6 @@ PODS:
- Firebase/Core (= 6.14.0)
- Firebase/MLVision (= 6.14.0)
- Firebase/MLVisionFaceModel (= 6.14.0)
- FirebaseMLCommon (= 0.19.0)
mczernek marked this conversation as resolved.
Show resolved Hide resolved
- FirebaseMLVision (= 0.19.0)
- UMCore
- UMFaceDetectorInterface
- EXFileSystem (8.1.0):
Expand Down Expand Up @@ -3825,7 +3823,7 @@ SPEC CHECKSUMS:
EXDocumentPicker: 3bacb53995a03147696a93e1727288b1a7d39cf7
EXErrorRecovery: 8f4c21ab2f51bf75defe4536f841a37de59b0661
EXFacebook: 74d53d9da75d1a953f1821dd417594ed18d7a72f
EXFaceDetector: 347204431405fed65226f43921d43c8c5a003d37
EXFaceDetector: 29bb21bb1c689a44d095b130f4bddde1b20c8761
EXFileSystem: cf4232ba7c62dc49b78c2d36005f97b6fddf0b01
EXFirebaseAnalytics: 535e764dcb3facfa1668d81e422b685eb93c1c9f
EXFirebaseCore: 4e0976590135563e26af5050916879d5ee218f1b
Expand Down
2 changes: 1 addition & 1 deletion ios/Pods/.project_cache/installation_cache.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

206 changes: 85 additions & 121 deletions ios/Pods/EXFaceDetector.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions ios/Pods/Local Podspecs/EXFaceDetector.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions ios/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions packages/expo-face-detector/CHANGELOG.md
Expand Up @@ -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
13 changes: 8 additions & 5 deletions packages/expo-face-detector/ios/EXFaceDetector.podspec
Expand Up @@ -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
sjchmiela marked this conversation as resolved.
Show resolved Hide resolved
end

Pod::Spec.new do |s|
s.name = 'EXFaceDetector'
s.version = package['version']
Expand All @@ -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