Skip to content

Commit ab10846

Browse files
committed
Merge branch 'develop' into test
* 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
2 parents 9065223 + e919bc3 commit ab10846

File tree

67 files changed

+474
-290
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+474
-290
lines changed

CHANGELOG.md

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,110 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## 2024-10-07
7+
8+
### Changes
9+
10+
---
11+
12+
Packages with changes:
13+
14+
- [`google_ml_kit` - `v0.19.0`](#google_ml_kit---v0190)
15+
- [`google_mlkit_barcode_scanning` - `v0.13.0`](#google_mlkit_barcode_scanning---v0130)
16+
- [`google_mlkit_commons` - `v0.9.0`](#google_mlkit_commons---v090)
17+
- [`google_mlkit_digital_ink_recognition` - `v0.13.0`](#google_mlkit_digital_ink_recognition---v0130)
18+
- [`google_mlkit_document_scanner` - `v0.3.0`](#google_mlkit_document_scanner---v030)
19+
- [`google_mlkit_entity_extraction` - `v0.14.0`](#google_mlkit_entity_extraction---v0140)
20+
- [`google_mlkit_face_detection` - `v0.12.0`](#google_mlkit_face_detection---v0120)
21+
- [`google_mlkit_face_mesh_detection` - `v0.3.0`](#google_mlkit_face_mesh_detection---v030)
22+
- [`google_mlkit_image_labeling` - `v0.13.0`](#google_mlkit_image_labeling---v0130)
23+
- [`google_mlkit_language_id` - `v0.12.0`](#google_mlkit_language_id---v0120)
24+
- [`google_mlkit_object_detection` - `v0.14.0`](#google_mlkit_object_detection---v0140)
25+
- [`google_mlkit_pose_detection` - `v0.13.0`](#google_mlkit_pose_detection---v0130)
26+
- [`google_mlkit_selfie_segmentation` - `v0.9.0`](#google_mlkit_selfie_segmentation---v090)
27+
- [`google_mlkit_smart_reply` - `v0.12.0`](#google_mlkit_smart_reply---v0120)
28+
- [`google_mlkit_text_recognition` - `v0.14.0`](#google_mlkit_text_recognition---v0140)
29+
- [`google_mlkit_translation` - `v0.12.0`](#google_mlkit_translation---v0120)
30+
31+
---
32+
33+
#### `google_ml_kit` - `v0.19.0`
34+
35+
* Update dependencies.
36+
* Update README.
37+
38+
#### `google_mlkit_barcode_scanning` - `v0.13.0`
39+
40+
* Update dependencies.
41+
* Update README.
42+
43+
#### `google_mlkit_commons` - `v0.9.0`
44+
45+
* Update README.
46+
47+
#### `google_mlkit_digital_ink_recognition` - `v0.13.0`
48+
49+
* Update dependencies.
50+
* Update README.
51+
52+
#### `google_mlkit_document_scanner` - `v0.3.0`
53+
54+
* Update README.
55+
56+
#### `google_mlkit_entity_extraction` - `v0.14.0`
57+
58+
* Update dependencies.
59+
* Update README.
60+
61+
#### `google_mlkit_face_detection` - `v0.12.0`
62+
63+
* Update dependencies.
64+
* Update README.
65+
66+
#### `google_mlkit_face_mesh_detection` - `v0.3.0`
67+
68+
* Update README.
69+
70+
#### `google_mlkit_image_labeling` - `v0.13.0`
71+
72+
* Update dependencies.
73+
* Update README.
74+
75+
#### `google_mlkit_language_id` - `v0.12.0`
76+
77+
* Update dependencies.
78+
* Update README.
79+
80+
#### `google_mlkit_object_detection` - `v0.14.0`
81+
82+
* Update dependencies.
83+
* Update README.
84+
85+
#### `google_mlkit_pose_detection` - `v0.13.0`
86+
87+
* Update dependencies.
88+
* Update README.
89+
90+
#### `google_mlkit_selfie_segmentation` - `v0.9.0`
91+
92+
* Update dependencies.
93+
* Update README.
94+
95+
#### `google_mlkit_smart_reply` - `v0.12.0`
96+
97+
* Update dependencies.
98+
* Update README.
99+
100+
#### `google_mlkit_text_recognition` - `v0.14.0`
101+
102+
* Update dependencies.
103+
* Update README.
104+
105+
#### `google_mlkit_translation` - `v0.12.0`
106+
107+
* Update dependencies.
108+
* Update README.
109+
6110
## 2024-09-19
7111

8112
### Changes

README.md

Lines changed: 21 additions & 21 deletions
Large diffs are not rendered by default.

packages/example/ios/Podfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ flutter_ios_podfile_setup
2828

2929
target 'Runner' do
3030
# Add language package you need to use
31-
pod 'GoogleMLKit/TextRecognitionChinese', '~> 6.0.0'
32-
pod 'GoogleMLKit/TextRecognitionDevanagari', '~> 6.0.0'
33-
pod 'GoogleMLKit/TextRecognitionJapanese', '~> 6.0.0'
34-
pod 'GoogleMLKit/TextRecognitionKorean', '~> 6.0.0'
31+
pod 'GoogleMLKit/TextRecognitionChinese', '~> 7.0.0'
32+
pod 'GoogleMLKit/TextRecognitionDevanagari', '~> 7.0.0'
33+
pod 'GoogleMLKit/TextRecognitionJapanese', '~> 7.0.0'
34+
pod 'GoogleMLKit/TextRecognitionKorean', '~> 7.0.0'
3535

3636
flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
3737
end
3838

3939
# add this line:
40-
$iOSVersion = '12.0' # or newer version
40+
$iOSVersion = '15.5.0' # or newer version
4141

4242
post_install do |installer|
4343
# add these lines:

packages/example/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ environment:
1313
dependencies:
1414
flutter:
1515
sdk: flutter
16-
flutter_pdfview: ^1.3.2
16+
flutter_pdfview: ^1.3.3
1717
image_picker: ^1.1.2
1818
camera: ^0.10.6
1919
path: ^1.9.0
@@ -57,7 +57,7 @@ dependency_overrides:
5757
path: ../google_mlkit_commons
5858

5959
dev_dependencies:
60-
flutter_lints: ^4.0.0
60+
flutter_lints: ^5.0.0
6161
flutter_test:
6262
sdk: flutter
6363

packages/google_ml_kit/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 0.19.0
2+
3+
* Update dependencies.
4+
* Update README.
5+
16
## 0.18.1
27

38
* Update dependencies.

packages/google_ml_kit/README.md

Lines changed: 28 additions & 28 deletions
Large diffs are not rendered by default.
Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: google_ml_kit
22
description: A Flutter plugin to use all APIs from Google's standalone ML Kit for mobile platforms.
3-
version: 0.18.1
3+
version: 0.19.0
44
homepage: https://github.com/flutter-ml/google_ml_kit_flutter
55
repository: https://github.com/flutter-ml/google_ml_kit_flutter/tree/master/packages/google_ml_kit
66

@@ -13,24 +13,24 @@ dependencies:
1313
sdk: flutter
1414

1515
# Vision APIs
16-
google_mlkit_commons: ^0.8.1
17-
google_mlkit_barcode_scanning: ^0.12.1
18-
google_mlkit_digital_ink_recognition: ^0.12.1
19-
google_mlkit_face_detection: ^0.11.1
20-
google_mlkit_face_mesh_detection: ^0.2.1
21-
google_mlkit_image_labeling: ^0.12.1
22-
google_mlkit_object_detection: ^0.13.1
23-
google_mlkit_pose_detection: ^0.12.1
24-
google_mlkit_selfie_segmentation: ^0.8.1
25-
google_mlkit_text_recognition: ^0.13.1
16+
google_mlkit_commons: ^0.9.0
17+
google_mlkit_barcode_scanning: ^0.13.0
18+
google_mlkit_digital_ink_recognition: ^0.13.0
19+
google_mlkit_face_detection: ^0.12.0
20+
google_mlkit_face_mesh_detection: ^0.3.0
21+
google_mlkit_image_labeling: ^0.13.0
22+
google_mlkit_object_detection: ^0.14.0
23+
google_mlkit_pose_detection: ^0.13.0
24+
google_mlkit_selfie_segmentation: ^0.9.0
25+
google_mlkit_text_recognition: ^0.14.0
2626

2727
# Natural Language APIs
28-
google_mlkit_entity_extraction: ^0.13.1
29-
google_mlkit_language_id: ^0.11.1
30-
google_mlkit_translation: ^0.11.1
31-
google_mlkit_smart_reply: ^0.11.1
28+
google_mlkit_entity_extraction: ^0.14.0
29+
google_mlkit_language_id: ^0.12.0
30+
google_mlkit_translation: ^0.12.0
31+
google_mlkit_smart_reply: ^0.12.0
3232

3333
dev_dependencies:
3434
flutter_test:
3535
sdk: flutter
36-
flutter_lints: ^4.0.0
36+
flutter_lints: ^5.0.0

packages/google_mlkit_barcode_scanning/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 0.13.0
2+
3+
* Update dependencies.
4+
* Update README.
5+
16
## 0.12.1
27

38
* Update dependencies.

packages/google_mlkit_barcode_scanning/README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ A Flutter plugin to use [Google's ML Kit Barcode Scanning](https://developers.go
3131

3232
### iOS
3333

34-
- Minimum iOS Deployment Target: 12.0
35-
- Xcode 15 or newer
34+
- Minimum iOS Deployment Target: 15.5.0
35+
- Xcode 15.3.0 or newer
3636
- Swift 5
3737
- 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).
3838

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

4949
```ruby
50-
platform :ios, '12.0' # or newer version
50+
platform :ios, '15.5.0' # or newer version
5151

5252
...
5353

5454
# add this line:
55-
$iOSVersion = '12.0' # or newer version
55+
$iOSVersion = '15.5.0' # or newer version
5656

5757
post_install do |installer|
5858
# add these lines:
5959
installer.pods_project.build_configurations.each do |config|
6060
config.build_settings["EXCLUDED_ARCHS[sdk=*]"] = "armv7"
6161
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = $iOSVersion
6262
end
63-
63+
6464
installer.pods_project.targets.each do |target|
6565
flutter_additional_ios_build_settings(target)
66-
66+
6767
# add these lines:
6868
target.build_configurations.each do |config|
6969
if Gem::Version.new($iOSVersion) > Gem::Version.new(config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'])
7070
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = $iOSVersion
7171
end
7272
end
73-
73+
7474
end
7575
end
7676
```
7777

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

8080
### Android
8181

packages/google_mlkit_barcode_scanning/ios/google_mlkit_barcode_scanning.podspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ Pod::Spec.new do |s|
1515
s.source_files = 'Classes/**/*'
1616
s.public_header_files = 'Classes/**/*.h'
1717
s.dependency 'Flutter'
18-
s.dependency 'GoogleMLKit/BarcodeScanning', '~> 6.0.0'
18+
s.dependency 'GoogleMLKit/BarcodeScanning', '~> 7.0.0'
1919
s.dependency 'google_mlkit_commons'
20-
s.platform = :ios, '12.0'
21-
s.ios.deployment_target = '12.0'
20+
s.platform = :ios, '15.5.0'
21+
s.ios.deployment_target = '15.5.0'
2222
s.static_framework = true
2323
s.swift_version = '5.0'
2424

0 commit comments

Comments
 (0)