Skip to content

Commit 992d38e

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents 80d439b + fa74d3e commit 992d38e

File tree

317 files changed

+8548
-2196
lines changed

Some content is hidden

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

317 files changed

+8548
-2196
lines changed

.ci.yaml

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

.ci/flutter_master.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
f35d049e0d8e0f1b3754293f36761fa3d985fca1
1+
11def8eff45582ff7613f96ea769df0fcff4bd9f

.ci/flutter_stable.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
1+
78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
# because there doesn't appear to be anything to wait for. To avoid that,
5050
# explicitly wait for one LUCI test by name first.
5151
- name: Wait for test check-in
52-
uses: lewagon/wait-on-check-action@e106e5c43e8ca1edea6383a39a01c5ca495fd812
52+
uses: lewagon/wait-on-check-action@595dabb3acf442d47e29c9ec9ba44db0c6bdd18f
5353
with:
5454
ref: ${{ github.sha }}
5555
check-name: 'Linux ci_yaml packages roller'
@@ -61,7 +61,7 @@ jobs:
6161

6262
# This workflow should be the last to run. So wait for all the other tests to succeed.
6363
- name: Wait on all tests
64-
uses: lewagon/wait-on-check-action@e106e5c43e8ca1edea6383a39a01c5ca495fd812
64+
uses: lewagon/wait-on-check-action@595dabb3acf442d47e29c9ec9ba44db0c6bdd18f
6565
with:
6666
ref: ${{ github.sha }}
6767
running-workflow-name: 'release'

.github/workflows/scorecards-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@ jobs:
4949

5050
# Upload the results to GitHub's code scanning dashboard.
5151
- name: "Upload to code-scanning"
52-
uses: github/codeql-action/upload-sarif@407ffafae6a767df3e0230c3df91b6443ae8df75 # v1.0.26
52+
uses: github/codeql-action/upload-sarif@b374143c1149a9115d881581d29b8390bbcbb59c # v1.0.26
5353
with:
5454
sarif_file: results.sarif

CODEOWNERS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,17 +71,17 @@ packages/video_player/video_player_android/** @camsim99
7171

7272
# - iOS
7373
packages/camera/camera_avfoundation/** @hellohuanlin
74-
packages/file_selector/file_selector_ios/** @stuartmorgan
74+
packages/file_selector/file_selector_ios/** @jmagman
7575
packages/google_maps_flutter/google_maps_flutter_ios/** @hellohuanlin
7676
packages/google_sign_in/google_sign_in_ios/** @vashworth
7777
packages/image_picker/image_picker_ios/** @vashworth
7878
packages/in_app_purchase/in_app_purchase_storekit/** @louisehsu
79-
packages/ios_platform_images/ios/** @stuartmorgan
79+
packages/ios_platform_images/ios/** @jmagman
8080
packages/local_auth/local_auth_ios/** @louisehsu
81-
packages/path_provider/path_provider_foundation/** @stuartmorgan
81+
packages/path_provider/path_provider_foundation/** @jmagman
8282
packages/quick_actions/quick_actions_ios/** @hellohuanlin
8383
packages/shared_preferences/shared_preferences_foundation/** @tarrinneal
84-
packages/url_launcher/url_launcher_ios/** @stuartmorgan
84+
packages/url_launcher/url_launcher_ios/** @jmagman
8585
packages/video_player/video_player_avfoundation/** @hellohuanlin
8686
packages/webview_flutter/webview_flutter_wkwebview/** @hellohuanlin
8787

packages/animations/example/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip

packages/camera/camera/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.10.5+7
2+
3+
* Updates example app to use non-deprecated video_player method.
4+
15
## 0.10.5+6
26

37
* Updates minimum supported SDK version to Flutter 3.10/Dart 3.0.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

packages/camera/camera/example/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip

0 commit comments

Comments
 (0)