Skip to content

Commit d03b600

Browse files
authored
Merge branch 'main' into ios-deprecation-check
2 parents b9da864 + e35d04c commit d03b600

206 files changed

Lines changed: 5189 additions & 6276 deletions

File tree

Some content is hidden

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

.ci/flutter_master.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2773c0c8e15e5a5bfe90e44eef3faa7cc0ba6803
1+
43657f3baa17bc1df6cc15da8b0fea2290c2c4fd

.ci/flutter_stable.version

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

.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'

README.md

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

customer_testing.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ pushd packages/rfw
2929

3030
# Update the subpackages so that the analysis doesn't get confused.
3131
pushd example/remote; flutter packages get; popd
32-
pushd example/wasm; flutter packages get; popd
3332
pushd test_coverage; dart pub get; popd
3433

3534
flutter analyze --no-fatal-infos

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
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.

0 commit comments

Comments
 (0)