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

Commit 2b90285

Browse files
cbenhagencbenhagen
committed
Merge branch 'update_exoplayer' of github.com:cbenhagen/plugins into update_exoplayer
2 parents 1c20962 + df2f9f6 commit 2b90285

File tree

172 files changed

+6217
-205
lines changed

Some content is hidden

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

172 files changed

+6217
-205
lines changed

‎packages/google_sign_in/google_sign_in/CHANGELOG.md‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
## 4.1.0
2+
3+
* Support web by default.
4+
* Require Flutter SDK `v1.12.13+hotfix.4` or greater.
5+
6+
## 4.0.17
7+
8+
* Add missing documentation and fix an unawaited future in the example app.
9+
110
## 4.0.16
211

312
* Remove the deprecated `author:` field from pubspec.yaml
@@ -57,8 +66,8 @@
5766

5867
## 4.0.3
5968

60-
* Update guava to `27.0.1-android`.
61-
* Add correct @NonNull annotations to reduce compiler warnings.
69+
* Update guava to `27.0.1-android`.
70+
* Add correct @NonNull annotations to reduce compiler warnings.
6271

6372
## 4.0.2
6473

‎packages/google_sign_in/google_sign_in/analysis_options.yaml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎packages/google_sign_in/google_sign_in/example/lib/main.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
// ignore_for_file: public_member_api_docs
6+
57
import 'dart:async';
68
import 'dart:convert' show json;
79

@@ -102,9 +104,7 @@ class SignInDemoState extends State<SignInDemo> {
102104
}
103105
}
104106

105-
Future<void> _handleSignOut() async {
106-
_googleSignIn.disconnect();
107-
}
107+
Future<void> _handleSignOut() => _googleSignIn.disconnect();
108108

109109
Widget _buildBody() {
110110
if (_currentUser != null) {

‎packages/google_sign_in/google_sign_in/example/web/index.html‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="UTF-8">
5+
<meta name="google-signin-client_id" content="159623150305-q05bbbtsutr02abhips3suj7hujfk4bg.apps.googleusercontent.com" />
6+
<title>Google Sign-in Example</title>
7+
</head>
8+
<body>
9+
<script src="main.dart.js" type="application/javascript"></script>
10+
</body>
11+
</html>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export 'package:google_sign_in_platform_interface/google_sign_in_platform_interf
1515
export 'src/common.dart';
1616
export 'widgets.dart';
1717

18+
/// Holds authentication tokens after sign in.
1819
class GoogleSignInAuthentication {
1920
GoogleSignInAuthentication._(this._data);
2021

@@ -30,6 +31,10 @@ class GoogleSignInAuthentication {
3031
String toString() => 'GoogleSignInAuthentication:$_data';
3132
}
3233

34+
/// Holds fields describing a signed in user's identity, following
35+
/// [GoogleSignInUserData].
36+
///
37+
/// [id] is guaranteed to be non-null.
3338
class GoogleSignInAccount implements GoogleIdentity {
3439
GoogleSignInAccount._(this._googleSignIn, GoogleSignInUserData data)
3540
: displayName = data.displayName,
@@ -92,6 +97,10 @@ class GoogleSignInAccount implements GoogleIdentity {
9297
return GoogleSignInAuthentication._(response);
9398
}
9499

100+
/// Convenience method returning a `<String, String>` map of HTML Authorization
101+
/// headers, containing the current `authentication.accessToken`.
102+
///
103+
/// See also https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Authorization.
95104
Future<Map<String, String>> get authHeaders async {
96105
final String token = (await authentication).accessToken;
97106
return <String, String>{

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ class FakeSignInBackend {
6060

6161
/// Represents a fake user that can be used with the [FakeSignInBackend] to
6262
/// obtain a [GoogleSignInAccount] and simulate authentication.
63-
///
6463
class FakeUser {
64+
/// Any of the given parameters can be null.
6565
const FakeUser({
6666
this.id,
6767
this.email,
@@ -71,11 +71,22 @@ class FakeUser {
7171
this.accessToken,
7272
});
7373

74+
/// Will be converted into [GoogleSignInUserData.id].
7475
final String id;
76+
77+
/// Will be converted into [GoogleSignInUserData.email].
7578
final String email;
79+
80+
/// Will be converted into [GoogleSignInUserData.displayName].
7681
final String displayName;
82+
83+
/// Will be converted into [GoogleSignInUserData.photoUrl].
7784
final String photoUrl;
85+
86+
/// Will be converted into [GoogleSignInTokenData.idToken].
7887
final String idToken;
88+
89+
/// Will be converted into [GoogleSignInTokenData.accessToken].
7990
final String accessToken;
8091

8192
Map<String, String> get _asMap => <String, String>{

‎packages/google_sign_in/google_sign_in/pubspec.yaml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: google_sign_in
22
description: Flutter plugin for Google Sign-In, a secure authentication system
33
for signing in with a Google account on Android and iOS.
44
homepage: https://github.com/flutter/plugins/tree/master/packages/google_sign_in/google_sign_in
5-
version: 4.0.16
5+
version: 4.1.0
66

77
flutter:
88
plugin:
@@ -12,12 +12,20 @@ flutter:
1212
pluginClass: GoogleSignInPlugin
1313
ios:
1414
pluginClass: FLTGoogleSignInPlugin
15+
web:
16+
default_package: google_sign_in_web
1517

1618
dependencies:
1719
google_sign_in_platform_interface: ^1.0.0
1820
flutter:
1921
sdk: flutter
2022
meta: ^1.0.4
23+
# The design on https://flutter.dev/go/federated-plugins was to leave
24+
# this constraint as "any". We cannot do it right now as it fails pub publish
25+
# validation, so we set a ^ constraint.
26+
# TODO(amirh): Revisit this (either update this part in the design or the pub tool).
27+
# https://github.com/flutter/flutter/issues/46264
28+
google_sign_in_web: ^0.8.2
2129

2230
dev_dependencies:
2331
http: ^0.12.0
@@ -26,4 +34,4 @@ dev_dependencies:
2634

2735
environment:
2836
sdk: ">=2.0.0-dev.28.0 <3.0.0"
29-
flutter: ">=1.10.0 <2.0.0"
37+
flutter: ">=1.12.13+hotfix.4 <2.0.0"

‎packages/google_sign_in/google_sign_in_web/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.8.2
2+
3+
* Require Flutter SDK 1.12.13+hotfix.4 or greater.
4+
15
## 0.8.1+2
26

37
* Remove the deprecated `author:` field from pubspec.yaml

‎packages/google_sign_in/google_sign_in_web/pubspec.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: google_sign_in_web
22
description: Flutter plugin for Google Sign-In, a secure authentication system
33
for signing in with a Google account on Android, iOS and Web.
44
homepage: https://github.com/flutter/plugins/tree/master/packages/google_sign_in/google_sign_in_web
5-
version: 0.8.1+2
5+
version: 0.8.2
66

77
flutter:
88
plugin:
@@ -27,4 +27,4 @@ dev_dependencies:
2727

2828
environment:
2929
sdk: ">=2.6.0 <3.0.0"
30-
flutter: ">=1.10.0 <2.0.0"
30+
flutter: ">=1.12.13+hotfix.4 <2.0.0"

‎packages/in_app_purchase/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.2.2+5
2+
3+
* Update version of json_annotation to ^3.0.0 and json_serializable to ^3.2.0. Resolve conflicts with other packages e.g. flutter_tools from sdk.
4+
15
## 0.2.2+4
26

37
* Remove the deprecated `author:` field from pubspec.yaml

0 commit comments

Comments
 (0)