Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Commit de090aa

Browse files
committed
Merge branch 'main' into webview-scroll
2 parents b65687d + ff84c44 commit de090aa

File tree

523 files changed

+8326
-5064
lines changed

Some content is hidden

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

523 files changed

+8326
-5064
lines changed

.ci/flutter_master.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8c2fdb803e49b361235bf6b55e98cb2df7a167e0
1+
a815ee634202c0a9e1be9c73450226c7cff97cff

.ci/flutter_stable.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
135454af32477f815a7525073027a3ff9eff1bfd
1+
b06b8b2710955028a6b562f5aa6fe62941d6febf

.cirrus.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,9 @@ task:
101101
always:
102102
format_script: ./script/tool_runner.sh format --fail-on-change
103103
license_script: $PLUGIN_TOOL_COMMAND license-check
104-
pubspec_script: ./script/tool_runner.sh pubspec-check
104+
# The major and minor versions here should match the lowest version
105+
# analyzed in legacy_version_analyze.
106+
pubspec_script: ./script/tool_runner.sh pubspec-check --min-min-flutter-version=3.0.0 --min-min-dart-version=2.17.0
105107
readme_script:
106108
- ./script/tool_runner.sh readme-check
107109
# Re-run with --require-excerpts, skipping packages that still need
@@ -171,12 +173,13 @@ task:
171173
- name: legacy_version_analyze
172174
depends_on: analyze
173175
matrix:
176+
# Change the arguments to pubspec-check when changing these values.
174177
env:
175178
CHANNEL: "3.0.5"
176179
DART_VERSION: "2.17.6"
177180
env:
178-
CHANNEL: "2.10.5"
179-
DART_VERSION: "2.16.2"
181+
CHANNEL: "3.3.10"
182+
DART_VERSION: "2.18.6"
180183
package_prep_script:
181184
# Allow analyzing packages that use a dev dependency with a higher
182185
# minimum Flutter/Dart version than the package itself.

CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ packages/**/*_web/** @ditman
2828

2929
# - Android
3030
packages/camera/camera_android/** @camsim99
31+
packages/camera/camera_android_camerax/** @camsim99
3132
packages/espresso/** @GaryQian
3233
packages/flutter_plugin_android_lifecycle/** @GaryQian
3334
packages/google_maps_flutter/google_maps_flutter_android/** @GaryQian
@@ -49,7 +50,7 @@ packages/image_picker/image_picker_ios/** @vashworth
4950
packages/in_app_purchase/in_app_purchase_storekit/** @cyanglaz
5051
packages/ios_platform_images/ios/** @jmagman
5152
packages/local_auth/local_auth_ios/** @hellohuanlin
52-
packages/path_provider/path_provider_ios/** @jmagman
53+
packages/path_provider/path_provider_foundation/** @jmagman
5354
packages/quick_actions/quick_actions_ios/** @hellohuanlin
5455
packages/shared_preferences/shared_preferences_foundation/** @cyanglaz
5556
packages/url_launcher/url_launcher_ios/** @jmagman
@@ -64,7 +65,6 @@ packages/url_launcher/url_launcher_linux/** @cbracken
6465

6566
# - macOS
6667
packages/file_selector/file_selector_macos/** @cbracken
67-
packages/path_provider/path_provider_macos/** @cbracken
6868
packages/url_launcher/url_launcher_macos/** @cbracken
6969

7070
# - Windows

analysis_options.yaml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -141,19 +141,19 @@ linter:
141141
# - literal_only_boolean_expressions # too many false positives: https://github.com/dart-lang/linter/issues/453
142142
- missing_whitespace_between_adjacent_strings
143143
- no_adjacent_strings_in_list
144-
# - no_default_cases # LOCAL CHANGE - Needs to be enabled and violations fixed.
144+
- no_default_cases
145145
- no_duplicate_case_values
146146
- no_leading_underscores_for_library_prefixes
147147
- no_leading_underscores_for_local_identifiers
148148
- no_logic_in_create_state
149-
# - no_runtimeType_toString # ok in tests; we enable this only in packages/
149+
- no_runtimeType_toString # DIFFERENT FROM FLUTTER/FLUTTER
150150
- non_constant_identifier_names
151151
- noop_primitive_operations
152152
- null_check_on_nullable_type_parameter
153153
- null_closures
154154
# - omit_local_variable_types # opposite of always_specify_types
155155
# - one_member_abstracts # too many false positives
156-
# - only_throw_errors # this does get disabled in a few places where we have legacy code that uses strings et al # LOCAL CHANGE - Needs to be enabled and violations fixed.
156+
- only_throw_errors # this does get disabled in a few places where we have legacy code that uses strings et al
157157
- overridden_fields
158158
- package_api_docs
159159
- package_names
@@ -200,7 +200,7 @@ linter:
200200
- prefer_typing_uninitialized_variables
201201
- prefer_void_to_null
202202
- provide_deprecation_message
203-
# - public_member_api_docs # enabled on a case-by-case basis; see e.g. packages/analysis_options.yaml
203+
- public_member_api_docs # DIFFERENT FROM FLUTTER/FLUTTER
204204
- recursive_getters
205205
# - require_trailing_commas # blocked on https://github.com/dart-lang/sdk/issues/47441
206206
- secure_pubspec_urls
@@ -241,7 +241,7 @@ linter:
241241
- unnecessary_to_list_in_spreads
242242
- unrelated_type_equality_checks
243243
- unsafe_html
244-
# - use_build_context_synchronously # LOCAL CHANGE - Needs to be enabled and violations fixed.
244+
- use_build_context_synchronously
245245
# - use_colored_box # not yet tested
246246
# - use_decorated_box # not yet tested
247247
# - use_enums # not yet tested
@@ -261,8 +261,3 @@ linter:
261261
# - use_to_and_as_if_applicable # has false positives, so we prefer to catch this by code-review
262262
- valid_regexps
263263
- void_checks
264-
### Local flutter/plugins additions ###
265-
# These are from flutter/flutter/packages, so will need to be preserved
266-
# separately when moving to a shared file.
267-
- no_runtimeType_toString # use objectRuntimeType from package:foundation
268-
- public_member_api_docs # see https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo#documentation-dartdocs-javadocs-etc

packages/camera/camera/CHANGELOG.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
## 0.10.3
2+
3+
* Adds back use of Optional type.
4+
5+
## 0.10.2+1
6+
7+
* Updates code for stricter lint checks.
8+
9+
## 0.10.2
10+
11+
* Implements option to also stream when recording a video.
12+
113
## 0.10.1
214

315
* Remove usage of deprecated quiver Optional type.
@@ -27,7 +39,7 @@
2739
## 0.10.0
2840

2941
* **Breaking Change** Bumps default camera_web package version, which updates permission exception code from `cameraPermission` to `CameraAccessDenied`.
30-
* **Breaking Change** Bumps default camera_android package version, which updates permission exception code from `cameraPermission` to
42+
* **Breaking Change** Bumps default camera_android package version, which updates permission exception code from `cameraPermission` to
3143
`CameraAccessDenied` and `AudioAccessDenied`.
3244
* Ignores unnecessary import warnings in preparation for [upcoming Flutter changes](https://github.com/flutter/flutter/pull/106316).
3345

packages/camera/camera/example/lib/main.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,11 @@ IconData getCameraLensIcon(CameraLensDirection direction) {
3131
return Icons.camera_front;
3232
case CameraLensDirection.external:
3333
return Icons.camera;
34-
default:
35-
throw ArgumentError('Unknown lens direction');
3634
}
35+
// This enum is from a different package, so a new value could be added at
36+
// any time. The example should keep working if that happens.
37+
// ignore: dead_code
38+
return Icons.camera;
3739
}
3840

3941
void _logError(String code, String? message) {

0 commit comments

Comments
 (0)