Skip to content

Commit 0323a45

Browse files
omar-hanafyomar-hanafy
authored
Merge branch 'main' into main
2 parents 97c5ed8 + 4a231ae commit 0323a45

File tree

162 files changed

+5886
-3365
lines changed

Some content is hidden

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

162 files changed

+5886
-3365
lines changed

‎.ci.yaml‎

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ platform_properties:
2828
device_type: none
2929
dependencies: >-
3030
[
31-
{"dependency": "android_sdk", "version": "version:33v6"},
31+
{"dependency": "android_sdk", "version": "version:36v1"},
3232
{"dependency": "open_jdk", "version": "version:17"},
3333
{"dependency": "curl", "version": "version:7.64.0"},
34-
{"dependency": "avd_cipd_version", "version": "build_id:8733065022087935185"}
34+
{"dependency": "avd_cipd_version", "version": "build_id:8719362231152674241"}
3535
]
3636
linux_android_legacy:
3737
properties:
@@ -362,7 +362,7 @@ targets:
362362
# web_benchmarks needs Chrome.
363363
dependencies: >-
364364
[
365-
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"},
365+
{"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"},
366366
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
367367
{"dependency": "cmake", "version": "build_id:8787856497187628321"},
368368
{"dependency": "ninja", "version": "version:1.9.0"},
@@ -385,7 +385,7 @@ targets:
385385
# See comments on 'master' version above.
386386
dependencies: >-
387387
[
388-
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"},
388+
{"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"},
389389
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
390390
{"dependency": "cmake", "version": "build_id:8787856497187628321"},
391391
{"dependency": "ninja", "version": "version:1.9.0"},
@@ -435,7 +435,7 @@ targets:
435435
package_sharding: "--shardIndex 0 --shardCount 6"
436436
dependencies: >-
437437
[
438-
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
438+
{"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
439439
]
440440
env_variables: >-
441441
{
@@ -453,7 +453,7 @@ targets:
453453
package_sharding: "--shardIndex 1 --shardCount 6"
454454
dependencies: >-
455455
[
456-
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
456+
{"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
457457
]
458458
env_variables: >-
459459
{
@@ -471,7 +471,7 @@ targets:
471471
package_sharding: "--shardIndex 2 --shardCount 6"
472472
dependencies: >-
473473
[
474-
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
474+
{"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
475475
]
476476
env_variables: >-
477477
{
@@ -489,7 +489,7 @@ targets:
489489
package_sharding: "--shardIndex 3 --shardCount 6"
490490
dependencies: >-
491491
[
492-
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
492+
{"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
493493
]
494494
env_variables: >-
495495
{
@@ -507,7 +507,7 @@ targets:
507507
package_sharding: "--shardIndex 4 --shardCount 6"
508508
dependencies: >-
509509
[
510-
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
510+
{"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
511511
]
512512
env_variables: >-
513513
{
@@ -525,7 +525,7 @@ targets:
525525
package_sharding: "--shardIndex 5 --shardCount 6"
526526
dependencies: >-
527527
[
528-
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
528+
{"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
529529
]
530530
env_variables: >-
531531
{
@@ -544,7 +544,7 @@ targets:
544544
package_sharding: "--shardIndex 0 --shardCount 6"
545545
dependencies: >-
546546
[
547-
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
547+
{"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
548548
]
549549
env_variables: >-
550550
{
@@ -563,7 +563,7 @@ targets:
563563
package_sharding: "--shardIndex 1 --shardCount 6"
564564
dependencies: >-
565565
[
566-
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
566+
{"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
567567
]
568568
env_variables: >-
569569
{
@@ -582,7 +582,7 @@ targets:
582582
package_sharding: "--shardIndex 2 --shardCount 6"
583583
dependencies: >-
584584
[
585-
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
585+
{"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
586586
]
587587
env_variables: >-
588588
{
@@ -601,7 +601,7 @@ targets:
601601
package_sharding: "--shardIndex 3 --shardCount 6"
602602
dependencies: >-
603603
[
604-
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
604+
{"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
605605
]
606606
env_variables: >-
607607
{
@@ -620,7 +620,7 @@ targets:
620620
package_sharding: "--shardIndex 4 --shardCount 6"
621621
dependencies: >-
622622
[
623-
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
623+
{"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
624624
]
625625
env_variables: >-
626626
{
@@ -639,7 +639,7 @@ targets:
639639
package_sharding: "--shardIndex 5 --shardCount 6"
640640
dependencies: >-
641641
[
642-
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
642+
{"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
643643
]
644644
env_variables: >-
645645
{
@@ -1043,10 +1043,6 @@ targets:
10431043
properties:
10441044
version_file: flutter_master.version
10451045
target_file: macos_repo_checks.yaml
1046-
dependencies: >
1047-
[
1048-
{"dependency": "swift_format", "version": "build_id:8797338979890974865"}
1049-
]
10501046

10511047
### macOS desktop tasks ###
10521048
# macos-platform_tests builds all the packages on ARM, so this build is run
@@ -1116,10 +1112,6 @@ targets:
11161112
{
11171113
"CHANNEL": "master"
11181114
}
1119-
dependencies: >
1120-
[
1121-
{"dependency": "swift_format", "version": "build_id:8797338979890974865"}
1122-
]
11231115
11241116
- name: Mac_arm64 custom_package_tests stable
11251117
recipe: packages/packages
@@ -1132,10 +1124,6 @@ targets:
11321124
{
11331125
"CHANNEL": "stable"
11341126
}
1135-
dependencies: >
1136-
[
1137-
{"dependency": "swift_format", "version": "build_id:8797338979890974865"}
1138-
]
11391127
11401128
### iOS tasks ###
11411129
# ios_platform_tests builds all the packages on ARM, so this build is run

‎.ci/flutter_master.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
d733bea58c1a761547a3566476ef2d5840631376
1+
adffe244f3f112e35736d08d85ab4cdbe8e13aa4

‎.ci/flutter_stable.version‎

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

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
# because there doesn't appear to be anything to wait for. To avoid that,
5757
# explicitly wait for one LUCI test by name first.
5858
- name: Wait for test check-in
59-
uses: lewagon/wait-on-check-action@ccfb013c15c8afb7bf2b7c028fb74dc5a068cccc
59+
uses: lewagon/wait-on-check-action@0dceb95e7c4cad8cc7422aee3885998f5cab9c79
6060
with:
6161
ref: ${{ github.sha }}
6262
check-name: 'Linux ci_yaml packages roller'
@@ -68,7 +68,7 @@ jobs:
6868

6969
# This workflow should be the last to run. So wait for all the other tests to succeed.
7070
- name: Wait on all tests
71-
uses: lewagon/wait-on-check-action@ccfb013c15c8afb7bf2b7c028fb74dc5a068cccc
71+
uses: lewagon/wait-on-check-action@0dceb95e7c4cad8cc7422aee3885998f5cab9c79
7272
with:
7373
ref: ${{ github.sha }}
7474
running-workflow-name: 'release'

‎packages/camera/camera/CHANGELOG.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
## NEXT
1+
## 0.11.2
22

33
* Fixes overflowed toggles in the camera example.
4+
* Fixes `CameraLensType` export.
45

56
## 0.11.1
67

‎packages/camera/camera/lib/camera.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ export 'package:camera_platform_interface/camera_platform_interface.dart'
77
CameraDescription,
88
CameraException,
99
CameraLensDirection,
10+
CameraLensType,
1011
ExposureMode,
1112
FlashMode,
1213
FocusMode,

‎packages/camera/camera/pubspec.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: A Flutter plugin for controlling the camera. Supports previewing
44
Dart.
55
repository: https://github.com/flutter/packages/tree/main/packages/camera/camera
66
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
7-
version: 0.11.1
7+
version: 0.11.2
88

99
environment:
1010
sdk: ^3.6.0
@@ -23,7 +23,7 @@ flutter:
2323
dependencies:
2424
camera_android_camerax: ^0.6.13
2525
camera_avfoundation: ^0.9.18
26-
camera_platform_interface: ^2.9.0
26+
camera_platform_interface: ^2.10.0
2727
camera_web: ^0.3.3
2828
flutter:
2929
sdk: flutter

‎packages/camera/camera/test/camera_export_test.dart‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// Copyright 2013 The Flutter Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the LICENSE file.
4+
5+
// ignore_for_file: unnecessary_statements
6+
7+
import 'package:camera/camera.dart' as main_file;
8+
import 'package:flutter_test/flutter_test.dart';
9+
10+
void main() {
11+
group('camera', () {
12+
test(
13+
'ensure camera.dart exports classes from platform interface',
14+
() {
15+
main_file.CameraDescription;
16+
main_file.CameraException;
17+
main_file.CameraLensDirection;
18+
main_file.CameraLensType;
19+
main_file.ExposureMode;
20+
main_file.FlashMode;
21+
main_file.FocusMode;
22+
main_file.ImageFormatGroup;
23+
main_file.ResolutionPreset;
24+
main_file.XFile;
25+
},
26+
);
27+
});
28+
}

‎packages/camera/camera_android_camerax/CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 0.6.19
2+
3+
* Changes target rotation of captured images to current default display rotation to fix captured
4+
photo orientation to upright.
5+
16
## 0.6.18+3
27

38
* Fixes incorrect camera preview mirroring for front cameras of devices using the Impeller backend.

‎packages/camera/camera_android_camerax/lib/src/android_camera_camerax.dart‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,8 @@ class AndroidCameraCameraX extends CameraPlatform {
392392
// Configure ImageCapture instance.
393393
imageCapture = proxy.newImageCapture(
394394
resolutionSelector: presetResolutionSelector,
395-
/* use CameraX default target rotation */ targetRotation: null,
395+
/* use CameraX default target rotation */ targetRotation:
396+
await deviceOrientationManager.getDefaultDisplayRotation(),
396397
);
397398

398399
// Configure ImageAnalysis instance.
@@ -966,9 +967,9 @@ class AndroidCameraCameraX extends CameraPlatform {
966967
await imageCapture!.setFlashMode(CameraXFlashMode.off);
967968
}
968969

969-
// Set target rotation to default CameraX rotation only if capture
970-
// orientation not locked.
971-
if (!captureOrientationLocked && shouldSetDefaultRotation) {
970+
// Set target rotation to the current default CameraX rotation if
971+
// the capture orientation is not locked.
972+
if (!captureOrientationLocked) {
972973
await imageCapture!.setTargetRotation(
973974
await deviceOrientationManager.getDefaultDisplayRotation(),
974975
);

0 commit comments

Comments
 (0)