fix: Fixed a bug that prevented getting MasamuneAdapterScope.of prope…

…rly.
mathrunet · Mar 3, 2023 · 5f59965 · 5f59965
1 parent 32f571e
commit 5f59965
Show file tree

Hide file tree

Showing 14 changed files with 417 additions and 291 deletions.
diff --git a/packages/masamune_logger_firebase/example/pubspec.lock b/packages/masamune_logger_firebase/example/pubspec.lock
@@ -5,10 +5,10 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: e440ac42679dfc04bbbefb58ed225c994bc7e07fccc8a68ec7d3631a127e5da9
+      sha256: "98d1d33ed129b372846e862de23a0fc365745f4d7b5e786ce667fcbbb7ac5c07"
       url: "https://pub.dev"
     source: hosted
-    version: "54.0.0"
+    version: "55.0.0"
   _flutterfire_internals:
     dependency: transitive
     description:
@@ -21,10 +21,10 @@ packages:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "2c2e3721ee9fb36de92faa060f3480c81b23e904352b087e5c64224b1a044427"
+      sha256: "881348aed9b0b425882c97732629a6a31093c8ff20fc4b3b03fb9d3d50a3a126"
       url: "https://pub.dev"
     source: hosted
-    version: "5.6.0"
+    version: "5.7.1"
   args:
     dependency: transitive
     description:
@@ -609,10 +609,10 @@ packages:
     dependency: transitive
     description:
       name: katana_responsive
-      sha256: "7be839fa2064cd773036d57fa822b285a3a9cb76afa2dcece843fa6e5a722c0b"
+      sha256: "752500c68c21e8cfb2ad220c68da60758052b67d74d28305e2f9ddf5eb876dd7"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.3.0"
   katana_router:
     dependency: transitive
     description:
@@ -657,26 +657,26 @@ packages:
     dependency: transitive
     description:
       name: katana_theme
-      sha256: "4e58c8c54fe3fb467ef0e09b7059fad52f739c8c2726746f386d6c59eb57fcc6"
+      sha256: "54fe77f312f13d8d062b5372e3afe1fdc60692607d6a5c4db89e5200ff59321d"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.3.3"
   katana_theme_annotation:
     dependency: transitive
     description:
       name: katana_theme_annotation
-      sha256: "69f27524404d3a5d78a19f4b0d9035aeb37bd2218156f3bbe2746a656361ad1f"
+      sha256: bfa97dd576edbbc2736cb18941bd0fed0a3e8d73318ae947d03dfcca28c19801
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.1"
   katana_ui:
     dependency: transitive
     description:
       name: katana_ui
-      sha256: e9d80ed58ec1db181cb623f0dca0beb6d24305e43f888b12daad71a9877b0895
+      sha256: "97ad7ee50fed5c993891c5890caab1eff7871d54825e3fe7d96a80226040657a"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.8"
+    version: "1.1.9"
   lints:
     dependency: transitive
     description:
@@ -697,10 +697,10 @@ packages:
     dependency: transitive
     description:
       name: masamune
-      sha256: "319b423bfb095f5b17fde2418f80b09682d113b0b7aa98d35b0e5ee578ac62b7"
+      sha256: "2fd90cc88163b0c062b6f0edcf49cfe55c48947b780e615658bdccb3a33333c4"
       url: "https://pub.dev"
     source: hosted
-    version: "1.7.2"
+    version: "1.7.5"
   masamune_annotation:
     dependency: transitive
     description:
@@ -715,7 +715,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.2.16"
+    version: "1.2.20"
   matcher:
     dependency: transitive
     description:
@@ -864,10 +864,10 @@ packages:
     dependency: transitive
     description:
       name: pubspec_parse
-      sha256: "75f6614d6dde2dc68948dffbaa4fe5dae32cd700eb9fb763fe11dfb45a3c4d0a"
+      sha256: ec85d7d55339d85f44ec2b682a82fea340071e8978257e5a43e69f79e98ef50c
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.2"
   recase:
     dependency: transitive
     description:
@@ -1057,6 +1057,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.1"
+  universal_platform:
+    dependency: transitive
+    description:
+      name: universal_platform
+      sha256: d315be0f6641898b280ffa34e2ddb14f3d12b1a37882557869646e0cc363d0cc
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0+1"
   url_strategy:
     dependency: transitive
     description:

diff --git a/packages/masamune_logger_firebase/lib/masamune_logger_firebase.dart b/packages/masamune_logger_firebase/lib/masamune_logger_firebase.dart
@@ -18,6 +18,7 @@ import 'package:flutter/foundation.dart';
 import 'package:firebase_analytics/firebase_analytics.dart';
 import 'package:firebase_crashlytics/firebase_crashlytics.dart';
 import 'package:firebase_performance/firebase_performance.dart';
+import 'package:flutter/widgets.dart';
 import 'package:katana_firebase/katana_firebase.dart';
 import 'package:masamune/masamune.dart';
 

diff --git a/packages/masamune_logger_firebase/lib/src/firebase_logger_masamune_adapter.dart b/packages/masamune_logger_firebase/lib/src/firebase_logger_masamune_adapter.dart
@@ -92,6 +92,15 @@ class FirebaseLoggerMasamuneAdapter extends MasamuneAdapter {
     }
   }
 
+  @override
+  Widget onBuildApp(BuildContext context, Widget app) {
+    return MasamuneAdapterScope<FirebaseLoggerMasamuneAdapter>(
+      adapter: this,
+      onInit: onInitScope,
+      child: app,
+    );
+  }
+
   @override
   void onError(Object error, StackTrace stackTrace) {
     if (!kIsWeb) {

diff --git a/packages/masamune_logger_firebase/pubspec.lock b/packages/masamune_logger_firebase/pubspec.lock
@@ -5,10 +5,10 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: e440ac42679dfc04bbbefb58ed225c994bc7e07fccc8a68ec7d3631a127e5da9
+      sha256: "98d1d33ed129b372846e862de23a0fc365745f4d7b5e786ce667fcbbb7ac5c07"
       url: "https://pub.dev"
     source: hosted
-    version: "54.0.0"
+    version: "55.0.0"
   _flutterfire_internals:
     dependency: transitive
     description:
@@ -21,10 +21,10 @@ packages:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "2c2e3721ee9fb36de92faa060f3480c81b23e904352b087e5c64224b1a044427"
+      sha256: "881348aed9b0b425882c97732629a6a31093c8ff20fc4b3b03fb9d3d50a3a126"
       url: "https://pub.dev"
     source: hosted
-    version: "5.6.0"
+    version: "5.7.1"
   args:
     dependency: transitive
     description:
@@ -473,10 +473,10 @@ packages:
     dependency: transitive
     description:
       name: katana_responsive
-      sha256: "7be839fa2064cd773036d57fa822b285a3a9cb76afa2dcece843fa6e5a722c0b"
+      sha256: "11803aa79a320f3946b8ae69dae657079e6f23449303cda8874d155bbd7ccaf3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.3.2"
   katana_router:
     dependency: transitive
     description:
@@ -521,26 +521,26 @@ packages:
     dependency: transitive
     description:
       name: katana_theme
-      sha256: "4e58c8c54fe3fb467ef0e09b7059fad52f739c8c2726746f386d6c59eb57fcc6"
+      sha256: "54fe77f312f13d8d062b5372e3afe1fdc60692607d6a5c4db89e5200ff59321d"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.3.3"
   katana_theme_annotation:
     dependency: transitive
     description:
       name: katana_theme_annotation
-      sha256: "69f27524404d3a5d78a19f4b0d9035aeb37bd2218156f3bbe2746a656361ad1f"
+      sha256: bfa97dd576edbbc2736cb18941bd0fed0a3e8d73318ae947d03dfcca28c19801
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.1"
   katana_ui:
     dependency: transitive
     description:
       name: katana_ui
-      sha256: e9d80ed58ec1db181cb623f0dca0beb6d24305e43f888b12daad71a9877b0895
+      sha256: "092af39eca3ba0b7ea6152e80c5d5a39d064002987ec5d839eaf6f928a9eaf81"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.8"
+    version: "1.1.11"
   lints:
     dependency: transitive
     description:
@@ -561,10 +561,10 @@ packages:
     dependency: "direct main"
     description:
       name: masamune
-      sha256: "319b423bfb095f5b17fde2418f80b09682d113b0b7aa98d35b0e5ee578ac62b7"
+      sha256: "37b1b362560ed2ba8e81fa5169269cc56c46b09ec9a899147f70ba638c610687"
       url: "https://pub.dev"
     source: hosted
-    version: "1.7.2"
+    version: "1.8.2"
   masamune_annotation:
     dependency: transitive
     description:
@@ -609,10 +609,10 @@ packages:
     dependency: transitive
     description:
       name: node_preamble
-      sha256: "8ebdbaa3b96d5285d068f80772390d27c21e1fa10fb2df6627b1b9415043608d"
+      sha256: "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
   package_config:
     dependency: transitive
     description:
@@ -930,6 +930,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.1"
+  universal_platform:
+    dependency: transitive
+    description:
+      name: universal_platform
+      sha256: d315be0f6641898b280ffa34e2ddb14f3d12b1a37882557869646e0cc363d0cc
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0+1"
   url_strategy:
     dependency: transitive
     description:
@@ -1011,5 +1019,5 @@ packages:
     source: hosted
     version: "3.1.1"
 sdks:
-  dart: ">=2.18.0 <3.0.0"
+  dart: ">=2.19.0 <3.0.0"
   flutter: ">=3.0.0"
diff --git a/packages/masamune_notification_firebase/example/pubspec.lock b/packages/masamune_notification_firebase/example/pubspec.lock
@@ -5,10 +5,10 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: e440ac42679dfc04bbbefb58ed225c994bc7e07fccc8a68ec7d3631a127e5da9
+      sha256: "98d1d33ed129b372846e862de23a0fc365745f4d7b5e786ce667fcbbb7ac5c07"
       url: "https://pub.dev"
     source: hosted
-    version: "54.0.0"
+    version: "55.0.0"
   _flutterfire_internals:
     dependency: transitive
     description:
@@ -21,10 +21,10 @@ packages:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "2c2e3721ee9fb36de92faa060f3480c81b23e904352b087e5c64224b1a044427"
+      sha256: "881348aed9b0b425882c97732629a6a31093c8ff20fc4b3b03fb9d3d50a3a126"
       url: "https://pub.dev"
     source: hosted
-    version: "5.6.0"
+    version: "5.7.1"
   args:
     dependency: transitive
     description:
@@ -601,10 +601,10 @@ packages:
     dependency: transitive
     description:
       name: katana_responsive
-      sha256: "7be839fa2064cd773036d57fa822b285a3a9cb76afa2dcece843fa6e5a722c0b"
+      sha256: "752500c68c21e8cfb2ad220c68da60758052b67d74d28305e2f9ddf5eb876dd7"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.3.0"
   katana_router:
     dependency: transitive
     description:
@@ -649,26 +649,26 @@ packages:
     dependency: transitive
     description:
       name: katana_theme
-      sha256: "4e58c8c54fe3fb467ef0e09b7059fad52f739c8c2726746f386d6c59eb57fcc6"
+      sha256: "54fe77f312f13d8d062b5372e3afe1fdc60692607d6a5c4db89e5200ff59321d"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.3.3"
   katana_theme_annotation:
     dependency: transitive
     description:
       name: katana_theme_annotation
-      sha256: "69f27524404d3a5d78a19f4b0d9035aeb37bd2218156f3bbe2746a656361ad1f"
+      sha256: bfa97dd576edbbc2736cb18941bd0fed0a3e8d73318ae947d03dfcca28c19801
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.1"
   katana_ui:
     dependency: transitive
     description:
       name: katana_ui
-      sha256: e9d80ed58ec1db181cb623f0dca0beb6d24305e43f888b12daad71a9877b0895
+      sha256: "97ad7ee50fed5c993891c5890caab1eff7871d54825e3fe7d96a80226040657a"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.8"
+    version: "1.1.9"
   lints:
     dependency: transitive
     description:
@@ -689,10 +689,10 @@ packages:
     dependency: transitive
     description:
       name: masamune
-      sha256: "319b423bfb095f5b17fde2418f80b09682d113b0b7aa98d35b0e5ee578ac62b7"
+      sha256: "2fd90cc88163b0c062b6f0edcf49cfe55c48947b780e615658bdccb3a33333c4"
       url: "https://pub.dev"
     source: hosted
-    version: "1.7.2"
+    version: "1.7.5"
   masamune_annotation:
     dependency: transitive
     description:
@@ -707,7 +707,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.2.5"
+    version: "1.2.9"
   matcher:
     dependency: transitive
     description:
@@ -864,10 +864,10 @@ packages:
     dependency: transitive
     description:
       name: pubspec_parse
-      sha256: "75f6614d6dde2dc68948dffbaa4fe5dae32cd700eb9fb763fe11dfb45a3c4d0a"
+      sha256: ec85d7d55339d85f44ec2b682a82fea340071e8978257e5a43e69f79e98ef50c
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.2"
   recase:
     dependency: transitive
     description:
@@ -1065,6 +1065,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.1"
+  universal_platform:
+    dependency: transitive
+    description:
+      name: universal_platform
+      sha256: d315be0f6641898b280ffa34e2ddb14f3d12b1a37882557869646e0cc363d0cc
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0+1"
   url_strategy:
     dependency: transitive
     description:

diff --git a/packages/masamune_notification_firebase/lib/masamune_notification_firebase.dart b/packages/masamune_notification_firebase/lib/masamune_notification_firebase.dart
@@ -17,6 +17,7 @@ import 'package:flutter/foundation.dart';
 
 // Package imports:
 import 'package:firebase_messaging/firebase_messaging.dart';
+import 'package:flutter/widgets.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:katana_firebase/katana_firebase.dart';
 import 'package:masamune/masamune.dart';