Skip to content

Commit

Permalink
Merge branch 'develop' into test
Browse files Browse the repository at this point in the history
* develop:
  chore: Update dev dependencies and example app
  chore: Update iOS dependencies (#693)

# Conflicts:
#	README.md
#	packages/example/ios/Podfile.lock
#	packages/example/pubspec.lock
  • Loading branch information
fbernaly committed Oct 7, 2024
2 parents 9065223 + e919bc3 commit ab10846
Show file tree
Hide file tree
Showing 67 changed files with 474 additions and 290 deletions.
104 changes: 104 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,110 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## 2024-10-07

### Changes

---

Packages with changes:

- [`google_ml_kit` - `v0.19.0`](#google_ml_kit---v0190)
- [`google_mlkit_barcode_scanning` - `v0.13.0`](#google_mlkit_barcode_scanning---v0130)
- [`google_mlkit_commons` - `v0.9.0`](#google_mlkit_commons---v090)
- [`google_mlkit_digital_ink_recognition` - `v0.13.0`](#google_mlkit_digital_ink_recognition---v0130)
- [`google_mlkit_document_scanner` - `v0.3.0`](#google_mlkit_document_scanner---v030)
- [`google_mlkit_entity_extraction` - `v0.14.0`](#google_mlkit_entity_extraction---v0140)
- [`google_mlkit_face_detection` - `v0.12.0`](#google_mlkit_face_detection---v0120)
- [`google_mlkit_face_mesh_detection` - `v0.3.0`](#google_mlkit_face_mesh_detection---v030)
- [`google_mlkit_image_labeling` - `v0.13.0`](#google_mlkit_image_labeling---v0130)
- [`google_mlkit_language_id` - `v0.12.0`](#google_mlkit_language_id---v0120)
- [`google_mlkit_object_detection` - `v0.14.0`](#google_mlkit_object_detection---v0140)
- [`google_mlkit_pose_detection` - `v0.13.0`](#google_mlkit_pose_detection---v0130)
- [`google_mlkit_selfie_segmentation` - `v0.9.0`](#google_mlkit_selfie_segmentation---v090)
- [`google_mlkit_smart_reply` - `v0.12.0`](#google_mlkit_smart_reply---v0120)
- [`google_mlkit_text_recognition` - `v0.14.0`](#google_mlkit_text_recognition---v0140)
- [`google_mlkit_translation` - `v0.12.0`](#google_mlkit_translation---v0120)

---

#### `google_ml_kit` - `v0.19.0`

* Update dependencies.
* Update README.

#### `google_mlkit_barcode_scanning` - `v0.13.0`

* Update dependencies.
* Update README.

#### `google_mlkit_commons` - `v0.9.0`

* Update README.

#### `google_mlkit_digital_ink_recognition` - `v0.13.0`

* Update dependencies.
* Update README.

#### `google_mlkit_document_scanner` - `v0.3.0`

* Update README.

#### `google_mlkit_entity_extraction` - `v0.14.0`

* Update dependencies.
* Update README.

#### `google_mlkit_face_detection` - `v0.12.0`

* Update dependencies.
* Update README.

#### `google_mlkit_face_mesh_detection` - `v0.3.0`

* Update README.

#### `google_mlkit_image_labeling` - `v0.13.0`

* Update dependencies.
* Update README.

#### `google_mlkit_language_id` - `v0.12.0`

* Update dependencies.
* Update README.

#### `google_mlkit_object_detection` - `v0.14.0`

* Update dependencies.
* Update README.

#### `google_mlkit_pose_detection` - `v0.13.0`

* Update dependencies.
* Update README.

#### `google_mlkit_selfie_segmentation` - `v0.9.0`

* Update dependencies.
* Update README.

#### `google_mlkit_smart_reply` - `v0.12.0`

* Update dependencies.
* Update README.

#### `google_mlkit_text_recognition` - `v0.14.0`

* Update dependencies.
* Update README.

#### `google_mlkit_translation` - `v0.12.0`

* Update dependencies.
* Update README.

## 2024-09-19

### Changes
Expand Down
42 changes: 21 additions & 21 deletions README.md

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions packages/example/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ flutter_ios_podfile_setup

target 'Runner' do
# Add language package you need to use
pod 'GoogleMLKit/TextRecognitionChinese', '~> 6.0.0'
pod 'GoogleMLKit/TextRecognitionDevanagari', '~> 6.0.0'
pod 'GoogleMLKit/TextRecognitionJapanese', '~> 6.0.0'
pod 'GoogleMLKit/TextRecognitionKorean', '~> 6.0.0'
pod 'GoogleMLKit/TextRecognitionChinese', '~> 7.0.0'
pod 'GoogleMLKit/TextRecognitionDevanagari', '~> 7.0.0'
pod 'GoogleMLKit/TextRecognitionJapanese', '~> 7.0.0'
pod 'GoogleMLKit/TextRecognitionKorean', '~> 7.0.0'

flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
end

# add this line:
$iOSVersion = '12.0' # or newer version
$iOSVersion = '15.5.0' # or newer version

post_install do |installer|
# add these lines:
Expand Down
4 changes: 2 additions & 2 deletions packages/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ environment:
dependencies:
flutter:
sdk: flutter
flutter_pdfview: ^1.3.2
flutter_pdfview: ^1.3.3
image_picker: ^1.1.2
camera: ^0.10.6
path: ^1.9.0
Expand Down Expand Up @@ -57,7 +57,7 @@ dependency_overrides:
path: ../google_mlkit_commons

dev_dependencies:
flutter_lints: ^4.0.0
flutter_lints: ^5.0.0
flutter_test:
sdk: flutter

Expand Down
5 changes: 5 additions & 0 deletions packages/google_ml_kit/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 0.19.0

* Update dependencies.
* Update README.

## 0.18.1

* Update dependencies.
Expand Down
56 changes: 28 additions & 28 deletions packages/google_ml_kit/README.md

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions packages/google_ml_kit/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: google_ml_kit
description: A Flutter plugin to use all APIs from Google's standalone ML Kit for mobile platforms.
version: 0.18.1
version: 0.19.0
homepage: https://github.com/flutter-ml/google_ml_kit_flutter
repository: https://github.com/flutter-ml/google_ml_kit_flutter/tree/master/packages/google_ml_kit

Expand All @@ -13,24 +13,24 @@ dependencies:
sdk: flutter

# Vision APIs
google_mlkit_commons: ^0.8.1
google_mlkit_barcode_scanning: ^0.12.1
google_mlkit_digital_ink_recognition: ^0.12.1
google_mlkit_face_detection: ^0.11.1
google_mlkit_face_mesh_detection: ^0.2.1
google_mlkit_image_labeling: ^0.12.1
google_mlkit_object_detection: ^0.13.1
google_mlkit_pose_detection: ^0.12.1
google_mlkit_selfie_segmentation: ^0.8.1
google_mlkit_text_recognition: ^0.13.1
google_mlkit_commons: ^0.9.0
google_mlkit_barcode_scanning: ^0.13.0
google_mlkit_digital_ink_recognition: ^0.13.0
google_mlkit_face_detection: ^0.12.0
google_mlkit_face_mesh_detection: ^0.3.0
google_mlkit_image_labeling: ^0.13.0
google_mlkit_object_detection: ^0.14.0
google_mlkit_pose_detection: ^0.13.0
google_mlkit_selfie_segmentation: ^0.9.0
google_mlkit_text_recognition: ^0.14.0

# Natural Language APIs
google_mlkit_entity_extraction: ^0.13.1
google_mlkit_language_id: ^0.11.1
google_mlkit_translation: ^0.11.1
google_mlkit_smart_reply: ^0.11.1
google_mlkit_entity_extraction: ^0.14.0
google_mlkit_language_id: ^0.12.0
google_mlkit_translation: ^0.12.0
google_mlkit_smart_reply: ^0.12.0

dev_dependencies:
flutter_test:
sdk: flutter
flutter_lints: ^4.0.0
flutter_lints: ^5.0.0
5 changes: 5 additions & 0 deletions packages/google_mlkit_barcode_scanning/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 0.13.0

* Update dependencies.
* Update README.

## 0.12.1

* Update dependencies.
Expand Down
16 changes: 8 additions & 8 deletions packages/google_mlkit_barcode_scanning/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ A Flutter plugin to use [Google's ML Kit Barcode Scanning](https://developers.go

### iOS

- Minimum iOS Deployment Target: 12.0
- Xcode 15 or newer
- Minimum iOS Deployment Target: 15.5.0
- Xcode 15.3.0 or newer
- Swift 5
- ML Kit does not support 32-bit architectures (i386 and armv7). ML Kit does support 64-bit architectures (x86_64 and arm64). Check this [list](https://developer.apple.com/support/required-device-capabilities/) to see if your device has the required device capabilities. More info [here](https://developers.google.com/ml-kit/migration/ios).

Expand All @@ -47,35 +47,35 @@ Go to Project > Runner > Building Settings > Excluded Architectures > Any SDK >
Your Podfile should look like this:

```ruby
platform :ios, '12.0' # or newer version
platform :ios, '15.5.0' # or newer version

...

# add this line:
$iOSVersion = '12.0' # or newer version
$iOSVersion = '15.5.0' # or newer version

post_install do |installer|
# add these lines:
installer.pods_project.build_configurations.each do |config|
config.build_settings["EXCLUDED_ARCHS[sdk=*]"] = "armv7"
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = $iOSVersion
end

installer.pods_project.targets.each do |target|
flutter_additional_ios_build_settings(target)

# add these lines:
target.build_configurations.each do |config|
if Gem::Version.new($iOSVersion) > Gem::Version.new(config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'])
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = $iOSVersion
end
end

end
end
```

Notice that the minimum `IPHONEOS_DEPLOYMENT_TARGET` is 12.0, you can set it to something newer but not older.
Notice that the minimum `IPHONEOS_DEPLOYMENT_TARGET` is 15.5.0, you can set it to something newer but not older.

### Android

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ Pod::Spec.new do |s|
s.source_files = 'Classes/**/*'
s.public_header_files = 'Classes/**/*.h'
s.dependency 'Flutter'
s.dependency 'GoogleMLKit/BarcodeScanning', '~> 6.0.0'
s.dependency 'GoogleMLKit/BarcodeScanning', '~> 7.0.0'
s.dependency 'google_mlkit_commons'
s.platform = :ios, '12.0'
s.ios.deployment_target = '12.0'
s.platform = :ios, '15.5.0'
s.ios.deployment_target = '15.5.0'
s.static_framework = true
s.swift_version = '5.0'

Expand Down
6 changes: 3 additions & 3 deletions packages/google_mlkit_barcode_scanning/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: google_mlkit_barcode_scanning
description: A Flutter plugin to use Google's ML Kit Barcode Scanning to read data encoded using most standard barcode formats.
version: 0.12.1
version: 0.13.0
homepage: https://github.com/flutter-ml/google_ml_kit_flutter
repository: https://github.com/flutter-ml/google_ml_kit_flutter/tree/master/packages/google_mlkit_barcode_scanning

Expand All @@ -11,12 +11,12 @@ environment:
dependencies:
flutter:
sdk: flutter
google_mlkit_commons: ^0.8.1
google_mlkit_commons: ^0.9.0

dev_dependencies:
flutter_test:
sdk: flutter
flutter_lints: ^4.0.0
flutter_lints: ^5.0.0

flutter:
plugin:
Expand Down
4 changes: 4 additions & 0 deletions packages/google_mlkit_commons/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.9.0

* Update README.

## 0.8.1

* Handle NullPointer Exception in `InputImageConverter.java`
Expand Down
20 changes: 10 additions & 10 deletions packages/google_mlkit_commons/README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# google\_mlkit\_commons
# google_mlkit_commons

[![Pub Version](https://img.shields.io/pub/v/google_mlkit_commons)](https://pub.dev/packages/google_mlkit_commons)
[![analysis](https://github.com/flutter-ml/google_ml_kit_flutter/actions/workflows/code-analysis.yml/badge.svg)](https://github.com/flutter-ml/google_ml_kit_flutter/actions)
[![Star on Github](https://img.shields.io/github/stars/flutter-ml/google_ml_kit_flutter.svg?style=flat&logo=github&colorB=deeppink&label=stars)](https://github.com/flutter-ml/google_ml_kit_flutter)
[![License: MIT](https://img.shields.io/badge/license-MIT-purple.svg)](https://opensource.org/licenses/MIT)

A Flutter plugin with common methods used in [google\_ml\_kit](https://github.com/flutter-ml/google_ml_kit_flutter).
A Flutter plugin with common methods used in [google_ml_kit](https://github.com/flutter-ml/google_ml_kit_flutter).

**PLEASE READ THIS** before continuing or posting a [new issue](https://github.com/flutter-ml/google_ml_kit_flutter/issues):

Expand All @@ -31,8 +31,8 @@ A Flutter plugin with common methods used in [google\_ml\_kit](https://github.co

### iOS

- Minimum iOS Deployment Target: 12.0
- Xcode 15 or newer
- Minimum iOS Deployment Target: 15.5.0
- Xcode 15.3.0 or newer
- Swift 5
- ML Kit does not support 32-bit architectures (i386 and armv7). ML Kit does support 64-bit architectures (x86_64 and arm64). Check this [list](https://developer.apple.com/support/required-device-capabilities/) to see if your device has the required device capabilities. More info [here](https://developers.google.com/ml-kit/migration/ios).

Expand All @@ -47,35 +47,35 @@ Go to Project > Runner > Building Settings > Excluded Architectures > Any SDK >
Your Podfile should look like this:

```ruby
platform :ios, '12.0' # or newer version
platform :ios, '15.5.0' # or newer version

...

# add this line:
$iOSVersion = '12.0' # or newer version
$iOSVersion = '15.5.0' # or newer version

post_install do |installer|
# add these lines:
installer.pods_project.build_configurations.each do |config|
config.build_settings["EXCLUDED_ARCHS[sdk=*]"] = "armv7"
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = $iOSVersion
end

installer.pods_project.targets.each do |target|
flutter_additional_ios_build_settings(target)

# add these lines:
target.build_configurations.each do |config|
if Gem::Version.new($iOSVersion) > Gem::Version.new(config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'])
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = $iOSVersion
end
end

end
end
```

Notice that the minimum `IPHONEOS_DEPLOYMENT_TARGET` is 12.0, you can set it to something newer but not older.
Notice that the minimum `IPHONEOS_DEPLOYMENT_TARGET` is 15.5.0, you can set it to something newer but not older.

### Android

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ Pod::Spec.new do |s|
s.public_header_files = 'Classes/**/*.h'
s.dependency 'Flutter'
s.dependency 'MLKitVision'
s.platform = :ios, '12.0'
s.ios.deployment_target = '12.0'
s.platform = :ios, '15.5.0'
s.ios.deployment_target = '15.5.0'
s.static_framework = true
s.swift_version = '5.0'

Expand Down
Loading

0 comments on commit ab10846

Please sign in to comment.