Skip to content

Commit 1537778

Browse files
nateshmbhatnateshmbhat
authored
Merge branch 'main' into develop
2 parents a892a5e + 98580c6 commit 1537778

File tree

182 files changed

+8565
-4059
lines changed

Some content is hidden

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

182 files changed

+8565
-4059
lines changed

‎.ci/flutter_master.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
da5523afc3c1081d54f92ad5bf59fcc1be431bf2
1+
6b18740d5a23137e905196d94551443121881aad

‎.ci/targets/android_platform_tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ tasks:
1111
args: ["build-examples", "--apk"]
1212
- name: lint
1313
script: .ci/scripts/tool_runner.sh
14-
args: ["lint-android"]
14+
args: ["analyze", "--android", "--no-dart"]
1515
# Native unit and native integration are split into two steps to allow for
1616
# different exclusions.
1717
# TODO(stuartmorgan): Eliminate the native unit test exclusion, and combine

‎.ci/targets/ios_platform_tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ tasks:
1414
args: ["build-examples", "--ios", "--swift-package-manager"]
1515
- name: xcode analyze
1616
script: .ci/scripts/tool_runner.sh
17-
args: ["xcode-analyze", "--ios", "--exclude=script/configs/xcode_warnings_exceptions.yaml"]
17+
args: ["analyze", "--no-dart", "--ios", "--exclude=script/configs/xcode_warnings_exceptions.yaml"]
1818
- name: xcode analyze deprecation
1919
# Ensure we don't accidentally introduce deprecated code.
2020
script: .ci/scripts/tool_runner.sh
21-
args: ["xcode-analyze", "--ios", "--ios-min-version=14.0", "--exclude=script/configs/exclude_xcode_deprecation.yaml,script/configs/xcode_warnings_exceptions.yaml"]
21+
args: ["analyze", "--no-dart", "--ios", "--ios-min-version=14.0", "--exclude=script/configs/exclude_xcode_deprecation.yaml,script/configs/xcode_warnings_exceptions.yaml"]
2222
- name: native test
2323
script: .ci/scripts/tool_runner.sh
2424
# Simulator name and version must match name and version in create_simulator.sh

‎.ci/targets/macos_platform_tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ tasks:
1111
args: ["build-examples", "--macos", "--swift-package-manager"]
1212
- name: xcode analyze
1313
script: .ci/scripts/tool_runner.sh
14-
args: ["xcode-analyze", "--macos", "--exclude=script/configs/xcode_warnings_exceptions.yaml"]
14+
args: ["analyze", "--no-dart", "--macos", "--exclude=script/configs/xcode_warnings_exceptions.yaml"]
1515
- name: xcode analyze deprecation
1616
# Ensure we don't accidentally introduce deprecated code.
1717
script: .ci/scripts/tool_runner.sh
18-
args: ["xcode-analyze", "--macos", "--macos-min-version=14.0", "--exclude=script/configs/exclude_xcode_deprecation.yaml,script/configs/xcode_warnings_exceptions.yaml"]
18+
args: ["analyze", "--no-dart", "--macos", "--macos-min-version=14.0", "--exclude=script/configs/exclude_xcode_deprecation.yaml,script/configs/xcode_warnings_exceptions.yaml"]
1919
- name: native test
2020
script: .ci/scripts/tool_runner.sh
2121
args: ["native-test", "--macos", "--xcode-warnings-exceptions=script/configs/xcode_warnings_exceptions.yaml"]

‎CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ third_party/packages/cupertino_icons/** @MitchellGoodwin
4646
third_party/packages/cupertino_icons/test/goldens/** @LongCatIsLooong
4747
third_party/packages/flutter_svg/** @domesticmouse
4848
third_party/packages/flutter_svg_test/** @domesticmouse
49+
third_party/packages/mustache_template/** @bkonyi @parlough
4950
third_party/packages/path_parsing/** @domesticmouse
5051

5152
# Plugin platform implementation rules. These should stay last, since the last

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ These are the packages hosted in this repository:
6767
| [plugin\_platform\_interface](./packages/plugin_platform_interface/) | [![pub package](https://img.shields.io/pub/v/plugin_platform_interface.svg)](https://pub.dev/packages/plugin_platform_interface) | [![pub points](https://img.shields.io/pub/points/plugin_platform_interface)](https://pub.dev/packages/plugin_platform_interface/score) | [![downloads](https://img.shields.io/pub/dm/plugin_platform_interface)](https://pub.dev/packages/plugin_platform_interface/score) | [![GitHub issues by-label](https://img.shields.io/github/issues/flutter/flutter/p%3A%20plugin_platform_interface?label=)](https://github.com/flutter/flutter/labels/p%3A%20plugin_platform_interface) | [![GitHub pull requests by-label](https://img.shields.io/github/issues-pr/flutter/packages/p%3A%20plugin_platform_interface?label=)](https://github.com/flutter/packages/labels/p%3A%20plugin_platform_interface) |
6868
| [quick\_actions](./packages/quick_actions/) | [![pub package](https://img.shields.io/pub/v/quick_actions.svg)](https://pub.dev/packages/quick_actions) | [![pub points](https://img.shields.io/pub/points/quick_actions)](https://pub.dev/packages/quick_actions/score) | [![downloads](https://img.shields.io/pub/dm/quick_actions)](https://pub.dev/packages/quick_actions/score) | [![GitHub issues by-label](https://img.shields.io/github/issues/flutter/flutter/p%3A%20quick_actions?label=)](https://github.com/flutter/flutter/labels/p%3A%20quick_actions) | [![GitHub pull requests by-label](https://img.shields.io/github/issues-pr/flutter/packages/p%3A%20quick_actions?label=)](https://github.com/flutter/packages/labels/p%3A%20quick_actions) |
6969
| [google\_identity\_services\_web](./packages/google_identity_services_web/) | [![pub package](https://img.shields.io/pub/v/google_identity_services_web.svg)](https://pub.dev/packages/google_identity_services_web) | [![pub points](https://img.shields.io/pub/points/google_identity_services_web)](https://pub.dev/packages/google_identity_services_web/score) | [![downloads](https://img.shields.io/pub/dm/google_identity_services_web)](https://pub.dev/packages/google_identity_services_web/score) | [![GitHub issues by-label](https://img.shields.io/github/issues/flutter/flutter/p%3A%20google_identity_services_web?label=)](https://github.com/flutter/flutter/labels/p%3A%20google_identity_services_web) | [![GitHub pull requests by-label](https://img.shields.io/github/issues-pr/flutter/packages/p%3A%20google_identity_services_web?label=)](https://github.com/flutter/packages/labels/p%3A%20google_identity_services_web) |
70+
| [mustache\_template](./third_party/packages/mustache_template/) | [![pub package](https://img.shields.io/pub/v/mustache_template.svg)](https://pub.dev/packages/mustache_template) | [![pub points](https://img.shields.io/pub/points/mustache_template)](https://pub.dev/packages/mustache_template/score) | [![downloads](https://img.shields.io/pub/dm/mustache_template)](https://pub.dev/packages/mustache_template/score) | [![GitHub issues by-label](https://img.shields.io/github/issues/flutter/flutter/p%3A%20mustache_template?label=)](https://github.com/flutter/flutter/labels/p%3A%20mustache_template) | [![GitHub pull requests by-label](https://img.shields.io/github/issues-pr/flutter/packages/p%3A%20mustache_template?label=)](https://github.com/flutter/packages/labels/p%3A%20mustache_template) |
7071
| [rfw](./packages/rfw/) | [![pub package](https://img.shields.io/pub/v/rfw.svg)](https://pub.dev/packages/rfw) | [![pub points](https://img.shields.io/pub/points/rfw)](https://pub.dev/packages/rfw/score) | [![downloads](https://img.shields.io/pub/dm/rfw)](https://pub.dev/packages/rfw/score) | [![GitHub issues by-label](https://img.shields.io/github/issues/flutter/flutter/p%3A%20rfw?label=)](https://github.com/flutter/flutter/labels/p%3A%20rfw) | [![GitHub pull requests by-label](https://img.shields.io/github/issues-pr/flutter/packages/p%3A%20rfw?label=)](https://github.com/flutter/packages/labels/p%3A%20rfw) |
7172
| [shared\_preferences](./packages/shared_preferences/) | [![pub package](https://img.shields.io/pub/v/shared_preferences.svg)](https://pub.dev/packages/shared_preferences) | [![pub points](https://img.shields.io/pub/points/shared_preferences)](https://pub.dev/packages/shared_preferences/score) | [![downloads](https://img.shields.io/pub/dm/shared_preferences)](https://pub.dev/packages/shared_preferences/score) | [![GitHub issues by-label](https://img.shields.io/github/issues/flutter/flutter/p%3A%20shared_preferences?label=)](https://github.com/flutter/flutter/labels/p%3A%20shared_preferences) | [![GitHub pull requests by-label](https://img.shields.io/github/issues-pr/flutter/packages/p%3A%20shared_preferences?label=)](https://github.com/flutter/packages/labels/p%3A%20shared_preferences) |
7273
| [standard\_message\_codec](./packages/standard_message_codec/) | [![pub package](https://img.shields.io/pub/v/standard_message_codec.svg)](https://pub.dev/packages/standard_message_codec) | [![pub points](https://img.shields.io/pub/points/standard_message_codec)](https://pub.dev/packages/standard_message_codec/score) | [![downloads](https://img.shields.io/pub/dm/standard_message_codec)](https://pub.dev/packages/standard_message_codec/score) | [![GitHub issues by-label](https://img.shields.io/github/issues/flutter/flutter/p%3A%20standard_message_codec?label=)](https://github.com/flutter/flutter/labels/p%3A%20standard_message_codec) | [![GitHub pull requests by-label](https://img.shields.io/github/issues-pr/flutter/packages/p%3A%20standard_message_codec?label=)](https://github.com/flutter/packages/labels/p%3A%20standard_message_codec) |

‎packages/camera/camera/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ A Flutter plugin for iOS, Android and Web allowing access to the device cameras.
88

99
| | Android | iOS | Web |
1010
|----------------|---------|-----------|------------------------|
11-
| **Support** | SDK 21+ | iOS 12.0+ | [See `camera_web `][1] |
11+
| **Support** | SDK 23+ | iOS 12.0+ | [See `camera_web `][1] |
1212

1313
## Features
1414

@@ -37,10 +37,10 @@ If editing `Info.plist` as text, add:
3737

3838
### Android
3939

40-
Change the minimum Android sdk version to 21 (or higher) in your `android/app/build.gradle` file.
40+
Change the minimum Android sdk version to 23 (or higher) in your `android/app/build.gradle` file.
4141

4242
```groovy
43-
minSdkVersion 21
43+
minSdk = 23
4444
```
4545

4646
The endorsed [`camera_android_camerax`][2] implementation of the camera plugin built with CameraX has

‎packages/camera/camera_avfoundation/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 0.9.21+3
2+
3+
* Removes code for versions of iOS older than 13.0.
4+
* Updates minimum supported SDK version to Flutter 3.35.
5+
16
## 0.9.21+2
27

38
* Migrates `DefaultCamera` initialization to Swift.

‎packages/camera/camera_avfoundation/example/integration_test/camera_test.dart

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ void main() {
7777
testWidgets('Capture specific image resolutions', (
7878
WidgetTester tester,
7979
) async {
80-
final List<CameraDescription> cameras =
81-
await CameraPlatform.instance.availableCameras();
80+
final List<CameraDescription> cameras = await CameraPlatform.instance
81+
.availableCameras();
8282
if (cameras.isEmpty) {
8383
return;
8484
}
@@ -138,8 +138,8 @@ void main() {
138138
testWidgets('Capture specific video resolutions', (
139139
WidgetTester tester,
140140
) async {
141-
final List<CameraDescription> cameras =
142-
await CameraPlatform.instance.availableCameras();
141+
final List<CameraDescription> cameras = await CameraPlatform.instance
142+
.availableCameras();
143143
if (cameras.isEmpty) {
144144
return;
145145
}
@@ -168,8 +168,8 @@ void main() {
168168
});
169169

170170
testWidgets('Pause and resume video recording', (WidgetTester tester) async {
171-
final List<CameraDescription> cameras =
172-
await CameraPlatform.instance.availableCameras();
171+
final List<CameraDescription> cameras = await CameraPlatform.instance
172+
.availableCameras();
173173
if (cameras.isEmpty) {
174174
return;
175175
}
@@ -222,8 +222,8 @@ void main() {
222222
});
223223

224224
testWidgets('Set description while recording', (WidgetTester tester) async {
225-
final List<CameraDescription> cameras =
226-
await CameraPlatform.instance.availableCameras();
225+
final List<CameraDescription> cameras = await CameraPlatform.instance
226+
.availableCameras();
227227
if (cameras.length < 2) {
228228
return;
229229
}
@@ -244,8 +244,8 @@ void main() {
244244
});
245245

246246
testWidgets('Set description', (WidgetTester tester) async {
247-
final List<CameraDescription> cameras =
248-
await CameraPlatform.instance.availableCameras();
247+
final List<CameraDescription> cameras = await CameraPlatform.instance
248+
.availableCameras();
249249
if (cameras.length < 2) {
250250
return;
251251
}
@@ -293,8 +293,8 @@ void main() {
293293
testWidgets('image streaming with imageFormatGroup', (
294294
WidgetTester tester,
295295
) async {
296-
final List<CameraDescription> cameras =
297-
await CameraPlatform.instance.availableCameras();
296+
final List<CameraDescription> cameras = await CameraPlatform.instance
297+
.availableCameras();
298298
if (cameras.isEmpty) {
299299
return;
300300
}
@@ -316,8 +316,8 @@ void main() {
316316
});
317317

318318
testWidgets('Recording with video streaming', (WidgetTester tester) async {
319-
final List<CameraDescription> cameras =
320-
await CameraPlatform.instance.availableCameras();
319+
final List<CameraDescription> cameras = await CameraPlatform.instance
320+
.availableCameras();
321321
if (cameras.isEmpty) {
322322
return;
323323
}
@@ -349,8 +349,8 @@ void main() {
349349
testWidgets('Capture specific image output formats', (
350350
WidgetTester tester,
351351
) async {
352-
final List<CameraDescription> cameras =
353-
await CameraPlatform.instance.availableCameras();
352+
final List<CameraDescription> cameras = await CameraPlatform.instance
353+
.availableCameras();
354354
if (cameras.isEmpty) {
355355
return;
356356
}
@@ -371,8 +371,8 @@ void main() {
371371

372372
group('Camera settings', () {
373373
testWidgets('Control FPS', (WidgetTester tester) async {
374-
final List<CameraDescription> cameras =
375-
await CameraPlatform.instance.availableCameras();
374+
final List<CameraDescription> cameras = await CameraPlatform.instance
375+
.availableCameras();
376376
if (cameras.isEmpty) {
377377
return;
378378
}
@@ -412,8 +412,8 @@ void main() {
412412
});
413413

414414
testWidgets('Control video bitrate', (WidgetTester tester) async {
415-
final List<CameraDescription> cameras =
416-
await CameraPlatform.instance.availableCameras();
415+
final List<CameraDescription> cameras = await CameraPlatform.instance
416+
.availableCameras();
417417
if (cameras.isEmpty) {
418418
return;
419419
}
@@ -454,8 +454,8 @@ void main() {
454454
});
455455

456456
testWidgets('Control audio bitrate', (WidgetTester tester) async {
457-
final List<CameraDescription> cameras =
458-
await CameraPlatform.instance.availableCameras();
457+
final List<CameraDescription> cameras = await CameraPlatform.instance
458+
.availableCameras();
459459
if (cameras.isEmpty) {
460460
return;
461461
}

‎packages/camera/camera_avfoundation/example/ios/Flutter/AppFrameworkInfo.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
<string>arm64</string>
2626
</array>
2727
<key>MinimumOSVersion</key>
28-
<string>12.0</string>
28+
<string>13.0</string>
2929
</dict>
3030
</plist>

0 commit comments

Comments
 (0)