Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 41aac10

Browse files
blackorbs-devblackorbs-dev
authored
Merge branch 'main' into fix-issue-148013
2 parents 8fbb01c + f787951 commit 41aac10

File tree

286 files changed

+6153
-5042
lines changed

Some content is hidden

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

286 files changed

+6153
-5042
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"]

‎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: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
1-
## NEXT
1+
## 0.9.21+3
22

3+
* Removes code for versions of iOS older than 13.0.
4+
* Updates minimum supported SDK version to Flutter 3.35.
5+
6+
## 0.9.21+2
7+
8+
* Migrates `DefaultCamera` initialization to Swift.
9+
* Removes unused `textureId` field of `FLTCam` class.
310
* Updates minimum supported SDK version to Flutter 3.29/Dart 3.7.
411

512
## 0.9.21+1

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

‎packages/camera/camera_avfoundation/example/ios/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
# platform :ios, '12.0'
2+
# platform :ios, '13.0'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

‎packages/camera/camera_avfoundation/example/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@
643643
CODE_SIGN_STYLE = Automatic;
644644
GCC_C_LANGUAGE_STANDARD = gnu11;
645645
INFOPLIST_FILE = RunnerTests/Info.plist;
646-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
646+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
647647
LD_RUNPATH_SEARCH_PATHS = (
648648
"$(inherited)",
649649
"@executable_path/Frameworks",
@@ -676,7 +676,7 @@
676676
CODE_SIGN_STYLE = Automatic;
677677
GCC_C_LANGUAGE_STANDARD = gnu11;
678678
INFOPLIST_FILE = RunnerTests/Info.plist;
679-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
679+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
680680
LD_RUNPATH_SEARCH_PATHS = (
681681
"$(inherited)",
682682
"@executable_path/Frameworks",
@@ -740,7 +740,7 @@
740740
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
741741
GCC_WARN_UNUSED_FUNCTION = YES;
742742
GCC_WARN_UNUSED_VARIABLE = YES;
743-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
743+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
744744
MTL_ENABLE_DEBUG_INFO = YES;
745745
ONLY_ACTIVE_ARCH = YES;
746746
SDKROOT = iphoneos;
@@ -790,7 +790,7 @@
790790
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
791791
GCC_WARN_UNUSED_FUNCTION = YES;
792792
GCC_WARN_UNUSED_VARIABLE = YES;
793-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
793+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
794794
MTL_ENABLE_DEBUG_INFO = NO;
795795
SDKROOT = iphoneos;
796796
TARGETED_DEVICE_FAMILY = "1,2";

0 commit comments

Comments
 (0)