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

Commit 1492eba

Browse files
committed
Merge remote-tracking branch 'flutter/main' into google_sign_in_doc
2 parents c83ac99 + ef20791 commit 1492eba

File tree

664 files changed

+11731
-1439
lines changed

Some content is hidden

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

664 files changed

+11731
-1439
lines changed

.ci/flutter_master.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5820b5f03927491b81dcdbd4bbf00f64012e0478
1+
dfcd9650e36bdc4e3c9d186682b4e574c7012e45

.ci/flutter_stable.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
f1875d570e39de09040c8f79aa13cc56baab8db1
1+
ffccd96b62ee8cec7740dab303538c5fc26ac543

.cirrus.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
gcp_credentials: ENCRYPTED[!ebad0a1f4f7a446b77944c33651460a7ab010b4617273cb016cf354eb8fc22aa92e37a3c58bfa4a0c40a799351e027a6!]
1+
gcp_credentials: ENCRYPTED[!f1177d1ddb5330ffaa9ea11c9c9e8e0c542185e895c36071f18cec923dd31c50ece6d18da89c2f6f1cd2d1a98d0c2eea!]
22

33
# Run on PRs and main branch post submit only. Don't run tests when tagging.
44
only_if: $CIRRUS_TAG == '' && ($CIRRUS_PR != '' || $CIRRUS_BRANCH == 'main')
@@ -161,8 +161,8 @@ task:
161161
depends_on: analyze
162162
env:
163163
matrix:
164+
CHANNEL: "3.0.5"
164165
CHANNEL: "2.10.5"
165-
CHANNEL: "2.8.1"
166166
package_prep_script:
167167
# Allow analyzing plugins that use a Pigeon version with a higher
168168
# minimum Flutter/Dart version than the plugin itself.
@@ -212,9 +212,9 @@ task:
212212
- flutter config --enable-linux-desktop
213213
- ./script/tool_runner.sh build-examples --linux
214214
native_test_script:
215-
- ./script/tool_runner.sh native-test --linux --no-integration
215+
- xvfb-run ./script/tool_runner.sh native-test --linux --no-integration
216216
drive_script:
217-
- xvfb-run ./script/tool_runner.sh drive-examples --linux
217+
- xvfb-run ./script/tool_runner.sh drive-examples --linux --exclude=script/configs/exclude_integration_linux.yaml
218218

219219
# Heavy-workload Linux tasks.
220220
# These use machines with more CPUs and memory, so will reduce parallelization
@@ -246,7 +246,7 @@ task:
246246
CHANNEL: "master"
247247
CHANNEL: "stable"
248248
MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
249-
GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[c84a06b85f9c906705732aea6142ef6f63ff1a6f07372dc36880a9d0c2c4b9cb35b2e35cd19edc6285167c2a5cc075ec]
249+
GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[30e6cf7189e3ff3868edc25d2e638ef2aec70546456427064bbc74b297d36145364f49f9d26b327787a59df149d69262]
250250
build_script:
251251
# Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they
252252
# might include non-ASCII characters which makes Gradle crash.

.github/dependabot.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,22 @@ updates:
1616
interval: "weekly"
1717
open-pull-requests-limit: 10
1818

19+
- package-ecosystem: "gradle"
20+
directory: "/packages/camera/camera_android_camerax/android"
21+
commit-message:
22+
prefix: "[camera]"
23+
schedule:
24+
interval: "weekly"
25+
open-pull-requests-limit: 10
26+
27+
- package-ecosystem: "gradle"
28+
directory: "/packages/camera/camera_android_camerax/example/android/app"
29+
commit-message:
30+
prefix: "[camera]"
31+
schedule:
32+
interval: "weekly"
33+
open-pull-requests-limit: 10
34+
1935
- package-ecosystem: "gradle"
2036
directory: "/packages/camera/camera/example/android/app"
2137
commit-message:

.github/workflows/pull_request_label.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
pull-requests: write
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/labeler@9fd24f1f9d6ceb64ba34d181b329ee72f99978a0
24+
- uses: actions/labeler@e54e5b338fbd6e6cdb5d60f51c22335fc57c401e
2525
with:
2626
repo-token: "${{ secrets.GITHUB_TOKEN }}"
2727
sync-labels: true

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
# This workflow should be the last to run. So wait for all the other tests to succeed.
3838
- name: Wait on all tests
39-
uses: lewagon/wait-on-check-action@752bfae19aef55dab12a00bc36d48acc46b77e9d
39+
uses: lewagon/wait-on-check-action@e2558238c09778af25867eb5de5a3ce4bbae3dcd
4040
with:
4141
ref: ${{ github.sha }}
4242
running-workflow-name: 'release'

.github/workflows/scorecards-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
persist-credentials: false
2626

2727
- name: "Run analysis"
28-
uses: ossf/scorecard-action@3e15ea8318eee9b333819ec77a36aca8d39df13e
28+
uses: ossf/scorecard-action@ce330fde6b1a5c9c75b417e7efc510b822a35564
2929
with:
3030
results_file: results.sarif
3131
results_format: sarif
@@ -48,6 +48,6 @@ jobs:
4848

4949
# Upload the results to GitHub's code scanning dashboard.
5050
- name: "Upload to code-scanning"
51-
uses: github/codeql-action/upload-sarif@2ca79b6fa8d3ec278944088b4aa5f46912db5d63
51+
uses: github/codeql-action/upload-sarif@c7f292ea4f542c473194b33813ccd4c207a6c725
5252
with:
5353
sarif_file: results.sarif

CODEOWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ packages/video_player/video_player_android/** @camsim99
4242

4343
# - iOS
4444
packages/camera/camera_avfoundation/** @hellohuanlin
45+
packages/file_selector/file_selector_ios/** @jmagman
4546
packages/google_maps_flutter/google_maps_flutter_ios/** @cyanglaz
4647
packages/google_sign_in/google_sign_in_ios/** @jmagman
4748
packages/image_picker/image_picker_ios/** @cyanglaz
@@ -56,6 +57,7 @@ packages/video_player/video_player_avfoundation/** @hellohuanlin
5657
packages/webview_flutter/webview_flutter_wkwebview/** @cyanglaz
5758

5859
# - Linux
60+
packages/file_selector/file_selector_linux/** @cbracken
5961
packages/path_provider/path_provider_linux/** @cbracken
6062
packages/shared_preferences/shared_preferences_linux/** @cbracken
6163
packages/url_launcher/url_launcher_linux/** @cbracken

analysis_options.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ linter:
8383
# - avoid_positional_boolean_parameters # would have been nice to enable this but by now there's too many places that break it
8484
# - avoid_print # LOCAL CHANGE - Needs to be enabled and violations fixed.
8585
# - avoid_private_typedef_functions # we prefer having typedef (discussion in https://github.com/flutter/flutter/pull/16356)
86-
# - avoid_redundant_argument_values # LOCAL CHANGE - Needs to be enabled and violations fixed.
86+
- avoid_redundant_argument_values
8787
- avoid_relative_lib_imports
8888
- avoid_renaming_method_parameters
8989
- avoid_return_types_on_setters
@@ -248,7 +248,7 @@ linter:
248248
- use_is_even_rather_than_modulo
249249
- use_key_in_widget_constructors
250250
- use_late_for_private_fields_and_variables
251-
# - use_named_constants # LOCAL CHANGE - Needs to be enabled and violations fixed.
251+
- use_named_constants
252252
- use_raw_strings
253253
- use_rethrow_when_possible
254254
- use_setters_to_change_properties

packages/camera/camera/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
## NEXT
2+
3+
* Updates minimum Flutter version to 2.10.
4+
5+
## 0.10.0+1
6+
7+
* Fixes avoid_redundant_argument_values lint warnings and minor typos.
8+
19
## 0.10.0
210

311
* **Breaking Change** Bumps default camera_web package version, which updates permission exception code from `cameraPermission` to `CameraAccessDenied`.

0 commit comments

Comments
 (0)