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

Commit 27bf63e

Browse files
alihassan143alihassan143
authored
Merge branch 'flutter:main' into main
2 parents 1181376 + 376a64f commit 27bf63e

File tree

95 files changed

+1088
-475
lines changed

Some content is hidden

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

95 files changed

+1088
-475
lines changed

‎.ci/flutter_master.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c07af53b3cb2182d7735f022969efb00f2ddbd27
1+
b31f41bd1aa68531d30854937ac004d2f4ab2361

‎.github/workflows/scorecards-analysis.yml

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

5151
# Upload the results to GitHub's code scanning dashboard.
5252
- name: "Upload to code-scanning"
53-
uses: github/codeql-action/upload-sarif@b398f525a5587552e573b247ac661067fafa920b
53+
uses: github/codeql-action/upload-sarif@904260d7d935dff982205cbdb42025ce30b7a34f
5454
with:
5555
sarif_file: results.sarif

‎AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,4 @@ Daniel Roek <[email protected]>
6868
TheOneWithTheBraid <[email protected]>
6969
Rulong Chen（陈汝龙） <[email protected]>
7070
Hwanseok Kang <[email protected]>
71+
Twin Sun, LLC <[email protected]>

‎packages/camera/camera_android_camerax/example/README.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1-
# camera_android_camerax_example
1+
# Platform Implementation Test App
22

3-
Demonstrates how to use the camera_android_camerax plugin.
3+
This is a test app for manual testing and automated integration testing
4+
of this platform implementation. It is not intended to demonstrate actual use of
5+
this package, since the intent is that plugin clients use the app-facing
6+
package.
7+
8+
Unless you are making changes to this implementation package, this example is
9+
very unlikely to be relevant.

‎packages/camera/camera_web/example/README.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
1-
# Testing
1+
# Platform Implementation Test App
2+
3+
This is a test app for manual testing and automated integration testing
4+
of this platform implementation. It is not intended to demonstrate actual use of
5+
this package, since the intent is that plugin clients use the app-facing
6+
package.
7+
8+
Unless you are making changes to this implementation package, this example is
9+
very unlikely to be relevant.
10+
11+
## Testing
212

313
This package uses `package:integration_test` to run its tests in a web browser.
414

515
See [Plugin Tests > Web Tests](https://github.com/flutter/flutter/wiki/Plugin-Tests#web-tests)
616
in the Flutter wiki for instructions to setup and run the tests in this package.
717

818
Check [flutter.dev > Integration testing](https://flutter.dev/docs/testing/integration-tests)
9-
for more info.
19+
for more info.

‎packages/camera/camera_windows/example/README.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1-
# camera_windows_example
1+
# Platform Implementation Test App
22

3-
Demonstrates how to use the camera_windows plugin.
3+
This is a test app for manual testing and automated integration testing
4+
of this platform implementation. It is not intended to demonstrate actual use of
5+
this package, since the intent is that plugin clients use the app-facing
6+
package.
7+
8+
Unless you are making changes to this implementation package, this example is
9+
very unlikely to be relevant.

‎packages/file_selector/file_selector_ios/example/README.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
# `file_selector_ios` example
1+
# Platform Implementation Test App
22

3-
Demonstrates iOS implementation of the
4-
[`file_selector` plugin](https://pub.dev/packages/file_selector).
3+
This is a test app for manual testing and automated integration testing
4+
of this platform implementation. It is not intended to demonstrate actual use of
5+
this package, since the intent is that plugin clients use the app-facing
6+
package.
7+
8+
Unless you are making changes to this implementation package, this example is
9+
very unlikely to be relevant.

‎packages/file_selector/file_selector_linux/example/README.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
# `file_selector_linux` example
1+
# Platform Implementation Test App
22

3-
Demonstrates Linux implementation of the
4-
[`file_selector` plugin](https://pub.dev/packages/file_selector).
3+
This is a test app for manual testing and automated integration testing
4+
of this platform implementation. It is not intended to demonstrate actual use of
5+
this package, since the intent is that plugin clients use the app-facing
6+
package.
7+
8+
Unless you are making changes to this implementation package, this example is
9+
very unlikely to be relevant.

‎packages/file_selector/file_selector_macos/example/README.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
# `file_selector_macos` example
1+
# Platform Implementation Test App
22

3-
Demonstrates macOS implementation of the
4-
[`file_selector` plugin](https://pub.dev/packages/file_selector).
3+
This is a test app for manual testing and automated integration testing
4+
of this platform implementation. It is not intended to demonstrate actual use of
5+
this package, since the intent is that plugin clients use the app-facing
6+
package.
7+
8+
Unless you are making changes to this implementation package, this example is
9+
very unlikely to be relevant.

‎packages/file_selector/file_selector_web/example/README.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
1-
# Testing
1+
# Platform Implementation Test App
2+
3+
This is a test app for manual testing and automated integration testing
4+
of this platform implementation. It is not intended to demonstrate actual use of
5+
this package, since the intent is that plugin clients use the app-facing
6+
package.
7+
8+
Unless you are making changes to this implementation package, this example is
9+
very unlikely to be relevant.
10+
11+
## Testing
212

313
This package uses `package:integration_test` to run its tests in a web browser.
414

515
See [Plugin Tests > Web Tests](https://github.com/flutter/flutter/wiki/Plugin-Tests#web-tests)
616
in the Flutter wiki for instructions to setup and run the tests in this package.
717

818
Check [flutter.dev > Integration testing](https://flutter.dev/docs/testing/integration-tests)
9-
for more info.
19+
for more info.

‎packages/file_selector/file_selector_windows/example/README.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
# `file_selector_windows` Example
1+
# Platform Implementation Test App
22

3-
Demonstrates Windows implementation of the
4-
[`file_selector` plugin](https://pub.dev/packages/file_selector).
3+
This is a test app for manual testing and automated integration testing
4+
of this platform implementation. It is not intended to demonstrate actual use of
5+
this package, since the intent is that plugin clients use the app-facing
6+
package.
7+
8+
Unless you are making changes to this implementation package, this example is
9+
very unlikely to be relevant.

‎packages/google_maps_flutter/google_maps_flutter_android/example/README.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1-
# google_maps_flutter_example
1+
# Platform Implementation Test App
22

3-
Demonstrates how to use the google_maps_flutter plugin.
3+
This is a test app for manual testing and automated integration testing
4+
of this platform implementation. It is not intended to demonstrate actual use of
5+
this package, since the intent is that plugin clients use the app-facing
6+
package.
7+
8+
Unless you are making changes to this implementation package, this example is
9+
very unlikely to be relevant.

‎packages/google_maps_flutter/google_maps_flutter_ios/example/README.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1-
# google_maps_flutter_example
1+
# Platform Implementation Test App
22

3-
Demonstrates how to use the google_maps_flutter plugin.
3+
This is a test app for manual testing and automated integration testing
4+
of this platform implementation. It is not intended to demonstrate actual use of
5+
this package, since the intent is that plugin clients use the app-facing
6+
package.
7+
8+
Unless you are making changes to this implementation package, this example is
9+
very unlikely to be relevant.

‎packages/google_maps_flutter/google_maps_flutter_web/example/README.md

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
1-
# Testing
1+
# Platform Implementation Test App
2+
3+
This is a test app for manual testing and automated integration testing
4+
of this platform implementation. It is not intended to demonstrate actual use of
5+
this package, since the intent is that plugin clients use the app-facing
6+
package.
7+
8+
Unless you are making changes to this implementation package, this example is
9+
very unlikely to be relevant.
10+
11+
## Testing
212

313
This package uses `package:integration_test` to run its tests in a web browser.
414

@@ -7,6 +17,3 @@ in the Flutter wiki for instructions to setup and run the tests in this package.
717

818
Check [flutter.dev > Integration testing](https://flutter.dev/docs/testing/integration-tests)
919
for more info.
10-
11-
See [Plugin Tests > Web Tests > Mocks](https://github.com/flutter/flutter/wiki/Plugin-Tests#mocks)
12-
in the Flutter wiki for more information about the `.mocks.dart` files in this package.

‎packages/google_sign_in/google_sign_in/AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,4 @@ Aleksandr Yurkovskiy <[email protected]>
6464
Anton Borries <[email protected]>
6565
Alex Li <[email protected]>
6666
Rahul Raj <[email protected]>
67+
Twin Sun, LLC <[email protected]>

‎packages/google_sign_in/google_sign_in/CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
## NEXT
1+
## 5.4.2
22

33
* Updates minimum Flutter version to 2.10.
4+
* Adds override for `GoogleSignInPlatform.initWithParams`.
5+
* Fixes tests to recognize new default `forceCodeForRefreshToken` request attribute.
46

57
## 5.4.1
68

‎packages/google_sign_in/google_sign_in/lib/google_sign_in.dart

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,16 @@ class GoogleSignIn {
179179
/// The [hostedDomain] argument specifies a hosted domain restriction. By
180180
/// setting this, sign in will be restricted to accounts of the user in the
181181
/// specified domain. By default, the list of accounts will not be restricted.
182+
///
183+
/// The [forceCodeForRefreshToken] is used on Android to ensure the authentication
184+
/// code can be exchanged for a refresh token after the first request.
182185
GoogleSignIn({
183186
this.signInOption = SignInOption.standard,
184187
this.scopes = const <String>[],
185188
this.hostedDomain,
186189
this.clientId,
187190
this.serverClientId,
191+
this.forceCodeForRefreshToken = false,
188192
});
189193

190194
/// Factory for creating default sign in user experience.
@@ -250,6 +254,9 @@ class GoogleSignIn {
250254
/// server.
251255
final String? serverClientId;
252256

257+
/// Force the authorization code to be valid for a refresh token every time. Only needed on Android.
258+
final bool forceCodeForRefreshToken;
259+
253260
final StreamController<GoogleSignInAccount?> _currentUserController =
254261
StreamController<GoogleSignInAccount?>.broadcast();
255262

@@ -286,6 +293,7 @@ class GoogleSignIn {
286293
hostedDomain: hostedDomain,
287294
clientId: clientId,
288295
serverClientId: serverClientId,
296+
forceCodeForRefreshToken: forceCodeForRefreshToken,
289297
))
290298
..catchError((dynamic _) {
291299
// Invalidate initialization if it errors out.

‎packages/google_sign_in/google_sign_in/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Flutter plugin for Google Sign-In, a secure authentication system
33
for signing in with a Google account on Android and iOS.
44
repository: https://github.com/flutter/plugins/tree/main/packages/google_sign_in/google_sign_in
55
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+google_sign_in%22
6-
version: 5.4.1
6+
version: 5.4.2
77

88

99
environment:
@@ -23,8 +23,8 @@ flutter:
2323
dependencies:
2424
flutter:
2525
sdk: flutter
26-
google_sign_in_android: ^6.0.0
27-
google_sign_in_ios: ^5.4.0
26+
google_sign_in_android: ^6.1.0
27+
google_sign_in_ios: ^5.5.0
2828
google_sign_in_platform_interface: ^2.2.0
2929
google_sign_in_web: ^0.10.0
3030

‎packages/google_sign_in/google_sign_in/test/google_sign_in_test.dart

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,16 @@ void main() {
8080
verify(mockPlatform.signIn());
8181
});
8282

83+
test('forceCodeForRefreshToken sent with init method call', () async {
84+
final GoogleSignIn googleSignIn =
85+
GoogleSignIn(forceCodeForRefreshToken: true);
86+
87+
await googleSignIn.signIn();
88+
89+
_verifyInit(mockPlatform, forceCodeForRefreshToken: true);
90+
verify(mockPlatform.signIn());
91+
});
92+
8393
test('signOut', () async {
8494
final GoogleSignIn googleSignIn = GoogleSignIn();
8595

‎packages/google_sign_in/google_sign_in_android/example/README.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1-
# google_sign_in_android example
1+
# Platform Implementation Test App
22

3-
Exercises the Android implementation of `GoogleSignInPlatform`.
3+
This is a test app for manual testing and automated integration testing
4+
of this platform implementation. It is not intended to demonstrate actual use of
5+
this package, since the intent is that plugin clients use the app-facing
6+
package.
7+
8+
Unless you are making changes to this implementation package, this example is
9+
very unlikely to be relevant.

‎packages/google_sign_in/google_sign_in_ios/example/README.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1-
# google_sign_in_ios example
1+
# Platform Implementation Test App
22

3-
Exercises the iOS implementation of `GoogleSignInPlatform`.
3+
This is a test app for manual testing and automated integration testing
4+
of this platform implementation. It is not intended to demonstrate actual use of
5+
this package, since the intent is that plugin clients use the app-facing
6+
package.
7+
8+
Unless you are making changes to this implementation package, this example is
9+
very unlikely to be relevant.

‎packages/google_sign_in/google_sign_in_web/example/README.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
1-
# Testing
1+
# Platform Implementation Test App
2+
3+
This is a test app for manual testing and automated integration testing
4+
of this platform implementation. It is not intended to demonstrate actual use of
5+
this package, since the intent is that plugin clients use the app-facing
6+
package.
7+
8+
Unless you are making changes to this implementation package, this example is
9+
very unlikely to be relevant.
10+
11+
## Testing
212

313
This package uses `package:integration_test` to run its tests in a web browser.
414

515
See [Plugin Tests > Web Tests](https://github.com/flutter/flutter/wiki/Plugin-Tests#web-tests)
616
in the Flutter wiki for instructions to setup and run the tests in this package.
717

818
Check [flutter.dev > Integration testing](https://flutter.dev/docs/testing/integration-tests)
9-
for more info.
19+
for more info.

‎packages/image_picker/image_picker_android/example/README.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1-
# image_picker_example
1+
# Platform Implementation Test App
22

3-
Demonstrates how to use the `image_picker` plugin.
3+
This is a test app for manual testing and automated integration testing
4+
of this platform implementation. It is not intended to demonstrate actual use of
5+
this package, since the intent is that plugin clients use the app-facing
6+
package.
7+
8+
Unless you are making changes to this implementation package, this example is
9+
very unlikely to be relevant.

‎packages/image_picker/image_picker_for_web/example/README.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
1-
# Testing
1+
# Platform Implementation Test App
2+
3+
This is a test app for manual testing and automated integration testing
4+
of this platform implementation. It is not intended to demonstrate actual use of
5+
this package, since the intent is that plugin clients use the app-facing
6+
package.
7+
8+
Unless you are making changes to this implementation package, this example is
9+
very unlikely to be relevant.
10+
11+
## Testing
212

313
This package uses `package:integration_test` to run its tests in a web browser.
414

‎packages/image_picker/image_picker_ios/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.8.6+1
2+
3+
* Fixes issue with crashing the app when picking images with PHPicker without providing `Photo Library Usage` permission.
4+
15
## 0.8.6
26

37
* Adds `requestFullMetadata` option to `pickImage`, so images on iOS can be picked without `Photo Library Usage` permission.

‎packages/image_picker/image_picker_ios/example/README.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1-
# image_picker_example
1+
# Platform Implementation Test App
22

3-
Demonstrates how to use the `image_picker` plugin.
3+
This is a test app for manual testing and automated integration testing
4+
of this platform implementation. It is not intended to demonstrate actual use of
5+
this package, since the intent is that plugin clients use the app-facing
6+
package.
7+
8+
Unless you are making changes to this implementation package, this example is
9+
very unlikely to be relevant.

0 commit comments

Comments
 (0)