Skip to content

Commit

Permalink
fix: update GoogleMLKit pods to version 7.0.0 (#202)
Browse files Browse the repository at this point in the history 
* fix: increase deployment target to `15.5`

* docs

* fix(ios): update `GoogleMLKit` pods to version `7.0.0`

* chore: update `package-lock.json`
  • Loading branch information
@robingenz
robingenz authored Oct 27, 2024
1 parent 04c5b66 commit 257ef27
Show file tree
Hide file tree
Showing 23 changed files with 148 additions and 107 deletions.
8 changes: 8 additions & 0 deletions .changeset/little-brooms-explode.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
'@capacitor-mlkit/barcode-scanning': major
'@capacitor-mlkit/face-detection': major
'@capacitor-mlkit/selfie-segmentation': major
'@capacitor-mlkit/translation': major
---

fix(ios): update `GoogleMLKit` pods to version `7.0.0`
10 changes: 5 additions & 5 deletions package-lock.json
View file

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

11 changes: 11 additions & 0 deletions packages/barcode-scanning/BREAKING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,20 @@ This is a comprehensive list of the breaking changes introduced in the major ver

## Versions

- [Version 7.x.x](#version-7xx)
- [Version 6.x.x](#version-6xx)
- [Version 5.x.x](#version-5xx)

## Version 7.x.x

### Minimum Deployment Target

On **iOS**, make sure to set the deployment target in your `ios/App/Podfile` to at least `15.5`:

```ruby
platform :ios, '15.5'
```

## Version 6.x.x

### Variables
Expand Down
2 changes: 1 addition & 1 deletion packages/barcode-scanning/CapacitorMlkitBarcodeScanning.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Pod::Spec.new do |s|
s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
s.ios.deployment_target = '13.0'
s.dependency 'Capacitor'
s.dependency 'GoogleMLKit/BarcodeScanning', '6.0.0'
s.dependency 'GoogleMLKit/BarcodeScanning', '7.0.0'
s.swift_version = '5.1'
s.static_framework = true
end
109 changes: 37 additions & 72 deletions packages/barcode-scanning/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,16 @@ android {
}
```

### iOS

#### Minimum Deployment Target

Make sure to set the deployment target in your `ios/App/Podfile` to at least `15.5`:

```ruby
platform :ios, '15.5'
```

#### Variables

This plugin will use the following project variables (defined in your app’s `variables.gradle` file):
Expand Down Expand Up @@ -279,78 +289,33 @@ If you can't see the camera view, make sure all elements in the DOM are not visi

<docgen-index>

- [@capacitor-mlkit/barcode-scanning](#capacitor-mlkitbarcode-scanning)
- [Features](#features)
- [Demo](#demo)
- [Guides](#guides)
- [Installation](#installation)
- [Android](#android)
- [Permissions](#permissions)
- [Data Binding](#data-binding)
- [Variables](#variables)
- [iOS](#ios)
- [Configuration](#configuration)
- [Demo](#demo-1)
- [Usage](#usage)
- [API](#api)
- [startScan(...)](#startscan)
- [stopScan()](#stopscan)
- [readBarcodesFromImage(...)](#readbarcodesfromimage)
- [scan(...)](#scan)
- [isSupported()](#issupported)
- [enableTorch()](#enabletorch)
- [disableTorch()](#disabletorch)
- [toggleTorch()](#toggletorch)
- [isTorchEnabled()](#istorchenabled)
- [isTorchAvailable()](#istorchavailable)
- [setZoomRatio(...)](#setzoomratio)
- [getZoomRatio()](#getzoomratio)
- [getMinZoomRatio()](#getminzoomratio)
- [getMaxZoomRatio()](#getmaxzoomratio)
- [openSettings()](#opensettings)
- [isGoogleBarcodeScannerModuleAvailable()](#isgooglebarcodescannermoduleavailable)
- [installGoogleBarcodeScannerModule()](#installgooglebarcodescannermodule)
- [checkPermissions()](#checkpermissions)
- [requestPermissions()](#requestpermissions)
- [addListener('barcodeScanned', ...)](#addlistenerbarcodescanned-)
- [addListener('barcodesScanned', ...)](#addlistenerbarcodesscanned-)
- [addListener('scanError', ...)](#addlistenerscanerror-)
- [addListener('googleBarcodeScannerModuleInstallProgress', ...)](#addlistenergooglebarcodescannermoduleinstallprogress-)
- [removeAllListeners()](#removealllisteners)
- [Interfaces](#interfaces)
- [StartScanOptions](#startscanoptions)
- [ReadBarcodesFromImageResult](#readbarcodesfromimageresult)
- [Barcode](#barcode)
- [ReadBarcodesFromImageOptions](#readbarcodesfromimageoptions)
- [ScanResult](#scanresult)
- [ScanOptions](#scanoptions)
- [IsSupportedResult](#issupportedresult)
- [IsTorchEnabledResult](#istorchenabledresult)
- [IsTorchAvailableResult](#istorchavailableresult)
- [SetZoomRatioOptions](#setzoomratiooptions)
- [GetZoomRatioResult](#getzoomratioresult)
- [GetMinZoomRatioResult](#getminzoomratioresult)
- [GetMaxZoomRatioResult](#getmaxzoomratioresult)
- [IsGoogleBarcodeScannerModuleAvailableResult](#isgooglebarcodescannermoduleavailableresult)
- [PermissionStatus](#permissionstatus)
- [PluginListenerHandle](#pluginlistenerhandle)
- [BarcodeScannedEvent](#barcodescannedevent)
- [BarcodesScannedEvent](#barcodesscannedevent)
- [ScanErrorEvent](#scanerrorevent)
- [GoogleBarcodeScannerModuleInstallProgressEvent](#googlebarcodescannermoduleinstallprogressevent)
- [Type Aliases](#type-aliases)
- [CameraPermissionState](#camerapermissionstate)
- [PermissionState](#permissionstate)
- [Enums](#enums)
- [BarcodeFormat](#barcodeformat)
- [LensFacing](#lensfacing)
- [BarcodeValueType](#barcodevaluetype)
- [GoogleBarcodeScannerModuleInstallState](#googlebarcodescannermoduleinstallstate)
- [Common Issues](#common-issues)
- [`NullPointerException` during `startScan(...)`](#nullpointerexception-during-startscan)
- [Terms \& Privacy](#terms--privacy)
- [Changelog](#changelog)
- [License](#license)
* [`startScan(...)`](#startscan)
* [`stopScan()`](#stopscan)
* [`readBarcodesFromImage(...)`](#readbarcodesfromimage)
* [`scan(...)`](#scan)
* [`isSupported()`](#issupported)
* [`enableTorch()`](#enabletorch)
* [`disableTorch()`](#disabletorch)
* [`toggleTorch()`](#toggletorch)
* [`isTorchEnabled()`](#istorchenabled)
* [`isTorchAvailable()`](#istorchavailable)
* [`setZoomRatio(...)`](#setzoomratio)
* [`getZoomRatio()`](#getzoomratio)
* [`getMinZoomRatio()`](#getminzoomratio)
* [`getMaxZoomRatio()`](#getmaxzoomratio)
* [`openSettings()`](#opensettings)
* [`isGoogleBarcodeScannerModuleAvailable()`](#isgooglebarcodescannermoduleavailable)
* [`installGoogleBarcodeScannerModule()`](#installgooglebarcodescannermodule)
* [`checkPermissions()`](#checkpermissions)
* [`requestPermissions()`](#requestpermissions)
* [`addListener('barcodeScanned', ...)`](#addlistenerbarcodescanned)
* [`addListener('barcodesScanned', ...)`](#addlistenerbarcodesscanned)
* [`addListener('scanError', ...)`](#addlistenerscanerror)
* [`addListener('googleBarcodeScannerModuleInstallProgress', ...)`](#addlistenergooglebarcodescannermoduleinstallprogress)
* [`removeAllListeners()`](#removealllisteners)
* [Interfaces](#interfaces)
* [Type Aliases](#type-aliases)
* [Enums](#enums)

</docgen-index>

Expand Down
8 changes: 4 additions & 4 deletions packages/barcode-scanning/ios/Plugin.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.5;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -522,7 +522,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.5;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
Expand All @@ -545,7 +545,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Plugin/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.5;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)\n$(FRAMEWORK_SEARCH_PATHS)\n$(FRAMEWORK_SEARCH_PATHS)";
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.getcapacitor.Plugin;
Expand All @@ -571,7 +571,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Plugin/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.5;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)";
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = com.getcapacitor.Plugin;
Expand Down
4 changes: 2 additions & 2 deletions packages/barcode-scanning/ios/Podfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
platform :ios, '13.0'
platform :ios, '15.5'

def capacitor_pods
# Comment the next line if you're not using Swift and don't want to use dynamic frameworks
Expand All @@ -9,7 +9,7 @@ end

target 'Plugin' do
capacitor_pods
pod 'GoogleMLKit/BarcodeScanning', '6.0.0'
pod 'GoogleMLKit/BarcodeScanning', '7.0.0'
end

target 'PluginTests' do
Expand Down
11 changes: 11 additions & 0 deletions packages/face-detection/BREAKING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,19 @@ This is a comprehensive list of the breaking changes introduced in the major ver

## Versions

- [Version 7.x.x](#version-7xx)
- [Version 6.x.x](#version-6xx)

## Version 7.x.x

### Minimum Deployment Target

On **iOS**, make sure to set the deployment target in your `ios/App/Podfile` to at least `15.5`:

```ruby
platform :ios, '15.5'
```

## Version 6.x.x

### Variables
Expand Down
2 changes: 1 addition & 1 deletion packages/face-detection/CapacitorMlkitFaceDetection.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Pod::Spec.new do |s|
s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
s.ios.deployment_target = '13.0'
s.dependency 'Capacitor'
s.dependency 'GoogleMLKit/FaceDetection', '6.0.0'
s.dependency 'GoogleMLKit/FaceDetection', '7.0.0'
s.swift_version = '5.1'
s.static_framework = true
end
12 changes: 12 additions & 0 deletions packages/face-detection/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ npx cap sync

### Android

#### Dependencies

You need to add the following meta data **in** the `application` tag in your `AndroidManifest.xml`:

```xml
Expand All @@ -27,6 +29,16 @@ This plugin will use the following project variables (defined in your app’s `v
- `$mlkitFaceDetectionVersion` version of `com.google.mlkit:face-detection` (default: `16.1.5`)
- `$playServicesMlkitFaceDetectionVersion` version of `com.google.android.gms:play-services-mlkit-face-detection` (default: `17.1.0`)

### iOS

#### Minimum Deployment Target

Make sure to set the deployment target in your `ios/App/Podfile` to at least `15.5`:

```ruby
platform :ios, '15.5'
```

## Configuration

No configuration required for this plugin.
Expand Down
8 changes: 4 additions & 4 deletions packages/face-detection/ios/Plugin.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.5;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -512,7 +512,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.5;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
Expand All @@ -535,7 +535,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Plugin/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.5;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)\n$(FRAMEWORK_SEARCH_PATHS)\n$(FRAMEWORK_SEARCH_PATHS)";
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.getcapacitor.Plugin;
Expand All @@ -561,7 +561,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Plugin/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.5;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)";
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = com.getcapacitor.Plugin;
Expand Down
4 changes: 2 additions & 2 deletions packages/face-detection/ios/Podfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
platform :ios, '13.0'
platform :ios, '15.5'

def capacitor_pods
# Comment the next line if you're not using Swift and don't want to use dynamic frameworks
Expand All @@ -9,7 +9,7 @@ end

target 'Plugin' do
capacitor_pods
pod 'GoogleMLKit/FaceDetection', '6.0.0'
pod 'GoogleMLKit/FaceDetection', '7.0.0'
end

target 'PluginTests' do
Expand Down
8 changes: 4 additions & 4 deletions packages/face-mesh-detection/ios/Plugin.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.5;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -446,7 +446,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.5;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
Expand All @@ -469,7 +469,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Plugin/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.5;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)\n$(FRAMEWORK_SEARCH_PATHS)\n$(FRAMEWORK_SEARCH_PATHS)";
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.getcapacitor.Plugin;
Expand All @@ -495,7 +495,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Plugin/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.5;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)";
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = com.getcapacitor.Plugin;
Expand Down
Loading

0 comments on commit 257ef27

Please sign in to comment.