Merge remote-tracking branch 'origin/master' into feature/sign-in-wit…

…h-apple/handle-cancellation-of-chrome-custom-tab
aboutyou · Jun 2, 2020 · 821265e · 821265e
2 parents c1ab530 + b6663d6
commit 821265e
Show file tree

Hide file tree

Showing 9 changed files with 80 additions and 62 deletions.
diff --git a/packages/pending_operations/analysis_options.yaml b/packages/pending_operations/analysis_options.yaml
@@ -1,4 +1,4 @@
-include: package:pedantic/analysis_options.yaml
+include: package:pedantic/analysis_options.1.8.0.yaml
 
 linter:
   rules: # http://dart-lang.github.io/linter/lints/options/options.html

diff --git a/packages/pending_operations/pubspec.lock b/packages/pending_operations/pubspec.lock
@@ -21,42 +21,42 @@ packages:
       name: archive
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.11"
+    version: "2.0.13"
   args:
     dependency: transitive
     description:
       name: args
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.2"
+    version: "1.6.0"
   async:
     dependency: transitive
     description:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.4.0"
+    version: "2.4.1"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.5"
+    version: "2.0.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.2"
+    version: "1.1.3"
   collection:
     dependency: transitive
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.11"
+    version: "1.14.12"
   convert:
     dependency: transitive
     description:
@@ -77,7 +77,7 @@ packages:
       name: crypto
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
   csslib:
     dependency: transitive
     description:
@@ -136,7 +136,7 @@ packages:
       name: image
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.12"
   io:
     dependency: transitive
     description:
@@ -262,7 +262,7 @@ packages:
       name: quiver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.5"
+    version: "2.1.3"
   shelf:
     dependency: transitive
     description:
@@ -302,7 +302,7 @@ packages:
       name: source_map_stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.5"
+    version: "2.0.0"
   source_maps:
     dependency: transitive
     description:
@@ -316,7 +316,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.5"
+    version: "1.7.0"
   stack_trace:
     dependency: transitive
     description:
@@ -351,21 +351,21 @@ packages:
       name: test
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.4"
+    version: "1.14.4"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.11"
+    version: "0.2.15"
   test_core:
     dependency: transitive
     description:
       name: test_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.15"
+    version: "0.3.4"
   typed_data:
     dependency: transitive
     description:
@@ -401,13 +401,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
+  webkit_inspection_protocol:
+    dependency: transitive
+    description:
+      name: webkit_inspection_protocol
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.7.3"
   xml:
     dependency: transitive
     description:
       name: xml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.5.0"
+    version: "3.6.1"
   yaml:
     dependency: transitive
     description:

diff --git a/packages/sign_in_with_apple/CHANGELOG.md b/packages/sign_in_with_apple/CHANGELOG.md
@@ -1,3 +1,7 @@
+## TBD
+
+- `AppleLogoPainter` is now exposed, so consumers can use it to build their own buttons
+
 ## 2.3.0
 
 - Fix the Android implementation closing the Chrome Custom Tab to not execute `runApp` in the Flutter again, but rather bring the existing Flutter activity to the front

diff --git a/packages/sign_in_with_apple/lib/src/widgets/sign_in_with_apple_button.dart b/packages/sign_in_with_apple/lib/src/widgets/sign_in_with_apple_button.dart
@@ -17,7 +17,6 @@ class SignInWithAppleButton extends StatelessWidget {
     this.style = SignInWithAppleButtonStyle.black,
     this.borderRadius = const BorderRadius.all(Radius.circular(8.0)),
     this.iconAlignment = IconAlignment.center,
-    this.fontFamilyFallback,
   })  : assert(text != null),
         assert(height != null),
         assert(style != null),
@@ -55,11 +54,6 @@ class SignInWithAppleButton extends StatelessWidget {
   /// This defaults to [IconAlignment.center].
   final IconAlignment iconAlignment;
 
-  /// The fallback fonts to try if the SF font is not available
-  ///
-  /// `fontSize` and `letterSpacing` will still be set to work best for the SF font
-  final List<String> fontFamilyFallback;
-
   /// Returns the background color of the button based on the current [style].
   Color get _backgroundColor {
     switch (style) {
@@ -124,7 +118,6 @@ class SignInWithAppleButton extends StatelessWidget {
         color: _contrastColor,
         // defaults styles aligned with https://github.com/flutter/flutter/blob/master/packages/flutter/lib/src/cupertino/text_theme.dart#L16
         fontFamily: '.SF Pro Text',
-        fontFamilyFallback: fontFamilyFallback,
         letterSpacing: -0.41,
       ),
     );

diff --git a/packages/state_queue/analysis_options.yaml b/packages/state_queue/analysis_options.yaml
@@ -1,4 +1,4 @@
-include: package:pedantic/analysis_options.yaml
+include: package:pedantic/analysis_options.1.8.0.yaml
 
 linter:
   rules: # http://dart-lang.github.io/linter/lints/options/options.html

diff --git a/packages/state_queue/pubspec.lock b/packages/state_queue/pubspec.lock
@@ -14,42 +14,42 @@ packages:
       name: archive
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.11"
+    version: "2.0.13"
   args:
     dependency: transitive
     description:
       name: args
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.2"
+    version: "1.6.0"
   async:
     dependency: transitive
     description:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.4.0"
+    version: "2.4.1"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.5"
+    version: "2.0.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.2"
+    version: "1.1.3"
   collection:
     dependency: transitive
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.11"
+    version: "1.14.12"
   convert:
     dependency: transitive
     description:
@@ -70,7 +70,7 @@ packages:
       name: crypto
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
   csslib:
     dependency: transitive
     description:
@@ -136,7 +136,7 @@ packages:
       name: image
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.12"
   io:
     dependency: transitive
     description:
@@ -220,7 +220,7 @@ packages:
       name: package_config
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.9.3"
   package_resolver:
     dependency: transitive
     description:
@@ -276,7 +276,7 @@ packages:
       name: quiver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.5"
+    version: "2.1.3"
   shelf:
     dependency: transitive
     description:
@@ -316,7 +316,7 @@ packages:
       name: source_map_stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.5"
+    version: "2.0.0"
   source_maps:
     dependency: transitive
     description:
@@ -330,7 +330,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.5"
+    version: "1.7.0"
   stack_trace:
     dependency: transitive
     description:
@@ -365,21 +365,21 @@ packages:
       name: test
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.4"
+    version: "1.14.4"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.11"
+    version: "0.2.15"
   test_core:
     dependency: transitive
     description:
       name: test_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.15"
+    version: "0.3.4"
   typed_data:
     dependency: transitive
     description:
@@ -415,13 +415,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
+  webkit_inspection_protocol:
+    dependency: transitive
+    description:
+      name: webkit_inspection_protocol
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.7.3"
   xml:
     dependency: transitive
     description:
       name: xml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.5.0"
+    version: "3.6.1"
   yaml:
     dependency: transitive
     description:
@@ -430,5 +437,5 @@ packages:
     source: hosted
     version: "2.2.0"
 sdks:
-  dart: ">=2.6.0 <3.0.0"
+  dart: ">=2.7.0 <3.0.0"
   flutter: ">=1.7.0 <2.0.0"
diff --git a/packages/state_queue/test/state_queue/state_queue_test.dart b/packages/state_queue/test/state_queue/state_queue_test.dart
@@ -27,7 +27,7 @@ void main() {
 
     unawaited(
       // running this in a zone in order to be able to surpress the error logging to the console
-      runZoned<Future<void>>(
+      runZonedGuarded<Future<void>>(
         () async {
           final bloc = _TestBloc()
             ..setState(100)
@@ -41,7 +41,7 @@ void main() {
           completer.complete(bloc.value);
         },
         // ignore: avoid_annotating_with_dynamic, avoid_types_on_closure_parameters
-        onError: (dynamic localError, StackTrace stackTrace) {
+        (dynamic localError, StackTrace stackTrace) {
           assert(error == null);
 
           error = localError;

diff --git a/packages/with_bloc/analysis_options.yaml b/packages/with_bloc/analysis_options.yaml
@@ -1,4 +1,4 @@
-include: package:pedantic/analysis_options.yaml
+include: package:pedantic/analysis_options.1.8.0.yaml
 
 linter:
   rules: # http://dart-lang.github.io/linter/lints/options/options.html