From 8b5e92729c46f16624f75409091058e1a5b443b6 Mon Sep 17 00:00:00 2001 From: Artur Jaworski Date: Wed, 5 Oct 2022 09:48:23 +0200 Subject: [PATCH] Preparations for future ably-cocoa & ably-java changes. It requires dependencies update. --- .../flutter/plugin/AblyMethodCallHandler.java | 7 +++ .../plugin/generated/PlatformConstants.java | 1 + bin/codegen_context.dart | 4 ++ example/ios/Flutter/AppFrameworkInfo.plist | 2 +- example/ios/Podfile | 2 +- example/ios/Podfile.lock | 18 +++---- example/ios/Runner.xcodeproj/project.pbxproj | 6 +-- example/ios/Runner/Info.plist | 2 + example/pubspec.lock | 14 ++--- ios/Classes/AblyFlutter.m | 10 ++++ ios/Classes/codec/AblyPlatformConstants.h | 1 + ios/Classes/codec/AblyPlatformConstants.m | 1 + lib/src/generated/platform_constants.dart | 8 +-- lib/src/platform/src/realtime/connection.dart | 12 ++--- pubspec.lock | 31 +++++------ .../ios/Flutter/AppFrameworkInfo.plist | 2 +- test_integration/ios/Podfile.lock | 16 +++--- test_integration/ios/Runner/Info.plist | 2 + test_integration/pubspec.lock | 52 +++++++++---------- 19 files changed, 104 insertions(+), 87 deletions(-) diff --git a/android/src/main/java/io/ably/flutter/plugin/AblyMethodCallHandler.java b/android/src/main/java/io/ably/flutter/plugin/AblyMethodCallHandler.java index 8a273bdbf..eaf501f73 100644 --- a/android/src/main/java/io/ably/flutter/plugin/AblyMethodCallHandler.java +++ b/android/src/main/java/io/ably/flutter/plugin/AblyMethodCallHandler.java @@ -74,6 +74,7 @@ public AblyMethodCallHandler(final MethodChannel methodChannel, _map.put(PlatformConstants.PlatformMethod.releaseRestChannel, this::releaseRestChannel); //Realtime + _map.put(PlatformConstants.PlatformMethod.getRealtimeConnectionRecoveryKey, this::getRealtimeConnectionRecoveryKey); _map.put(PlatformConstants.PlatformMethod.createRealtime, this::createRealtime); _map.put(PlatformConstants.PlatformMethod.connectRealtime, this::connectRealtime); _map.put(PlatformConstants.PlatformMethod.closeRealtime, this::closeRealtime); @@ -465,6 +466,12 @@ public void notImplemented() { } } + private void getRealtimeConnectionRecoveryKey(@NonNull MethodCall call, @NonNull MethodChannel.Result result) { + final AblyFlutterMessage ablyMessage = (AblyFlutterMessage) call.arguments; + final String recoveryKey = instanceStore.getRealtime(ablyMessage.handle).connection.getRecoveryKey(); + result.success(recoveryKey); + } + private void connectRealtime(@NonNull MethodCall call, @NonNull MethodChannel.Result result) { final AblyFlutterMessage ablyMessage = (AblyFlutterMessage) call.arguments; instanceStore.getRealtime(ablyMessage.handle).connect(); diff --git a/android/src/main/java/io/ably/flutter/plugin/generated/PlatformConstants.java b/android/src/main/java/io/ably/flutter/plugin/generated/PlatformConstants.java index cf4e7a69f..4b72b81ff 100644 --- a/android/src/main/java/io/ably/flutter/plugin/generated/PlatformConstants.java +++ b/android/src/main/java/io/ably/flutter/plugin/generated/PlatformConstants.java @@ -68,6 +68,7 @@ static final public class PlatformMethod { public static final String realtimeHistory = "realtimeHistory"; public static final String realtimeTime = "realtimeTime"; public static final String restTime = "restTime"; + public static final String getRealtimeConnectionRecoveryKey = "getRealtimeConnectionRecoveryKey"; public static final String pushActivate = "pushActivate"; public static final String pushDeactivate = "pushDeactivate"; public static final String pushReset = "pushReset"; diff --git a/bin/codegen_context.dart b/bin/codegen_context.dart index 0a114b90b..de7869d7d 100644 --- a/bin/codegen_context.dart +++ b/bin/codegen_context.dart @@ -96,6 +96,10 @@ const List> _platformMethods = [ {'name': 'realtimeHistory', 'value': 'realtimeHistory'}, {'name': 'realtimeTime', 'value': 'realtimeTime'}, {'name': 'restTime', 'value': 'restTime'}, + { + 'name': 'getRealtimeConnectionRecoveryKey', + 'value': 'getRealtimeConnectionRecoveryKey' + }, // Push Notifications {'name': 'pushActivate', 'value': 'pushActivate'}, diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/example/ios/Flutter/AppFrameworkInfo.plist index f2872cf47..4f8d4d245 100644 --- a/example/ios/Flutter/AppFrameworkInfo.plist +++ b/example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 9.0 + 11.0 diff --git a/example/ios/Podfile b/example/ios/Podfile index 9411102b1..313ea4a15 100644 --- a/example/ios/Podfile +++ b/example/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -platform :ios, '10.0' +platform :ios, '11.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 89691b90d..15833de94 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1,11 +1,11 @@ PODS: - - Ably (1.2.10): - - AblyDeltaCodec (= 1.3.2) + - Ably (1.2.15): + - AblyDeltaCodec (= 1.3.3) - msgpack (= 0.4.0) - ably_flutter (1.2.15): - - Ably (= 1.2.10) + - Ably - Flutter - - AblyDeltaCodec (1.3.2) + - AblyDeltaCodec (1.3.3) - device_info_plus (0.0.1): - Flutter - Flutter (1.0.0) @@ -44,16 +44,16 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/fluttertoast/ios" SPEC CHECKSUMS: - Ably: 80be962e2e87bac69727a26ba72b868c8e86288e - ably_flutter: bba4fea46a2a3269fae98b67bd5c0c75cf3f0132 - AblyDeltaCodec: 783d017270de70bbbc0a84e4235297b225d33636 + Ably: bdbaa2cf4937881ac38f0fa4b99905c21a8bc28e + ably_flutter: 1341de3d132c22e32e2234710b58aae945eb2562 + AblyDeltaCodec: add5d06a756b3581b12aab5b5500a320b8c55bea device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed - Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a + Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743 fluttertoast: 6122fa75143e992b1d3470f61000f591a798cc58 msgpack: c85f6251873059738472ae136951cec5f30f3251 Toast: 91b396c56ee72a5790816f40d3a94dd357abc196 -PODFILE CHECKSUM: fe0e1ee7f3d1f7d00b11b474b62dd62134535aea +PODFILE CHECKSUM: 7368163408c647b7eb699d0d788ba6718e18fb8d COCOAPODS: 1.11.3 diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index b677388da..9e53b9add 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -358,7 +358,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -446,7 +446,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -495,7 +495,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/example/ios/Runner/Info.plist b/example/ios/Runner/Info.plist index 02aeae863..8ab3b86ba 100644 --- a/example/ios/Runner/Info.plist +++ b/example/ios/Runner/Info.plist @@ -47,5 +47,7 @@ UIViewControllerBasedStatusBarAppearance + CADisableMinimumFrameDurationOnPhone + diff --git a/example/pubspec.lock b/example/pubspec.lock index 23885748f..f72eacc1f 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -28,7 +28,7 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.2.1" charcode: dependency: transitive description: @@ -49,7 +49,7 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0" + version: "1.16.0" crypto: dependency: "direct main" description: @@ -199,7 +199,7 @@ packages: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.3" + version: "0.6.4" lints: dependency: transitive description: @@ -213,14 +213,14 @@ packages: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.3" + version: "0.1.5" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.8.0" path: dependency: transitive description: @@ -323,7 +323,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.1.2" win32: dependency: transitive description: @@ -346,5 +346,5 @@ packages: source: hosted version: "5.3.1" sdks: - dart: ">=2.15.0 <3.0.0" + dart: ">=2.17.0-0 <3.0.0" flutter: ">=2.8.0" diff --git a/ios/Classes/AblyFlutter.m b/ios/Classes/AblyFlutter.m index ca3203ac7..fd3a3c72f 100644 --- a/ios/Classes/AblyFlutter.m +++ b/ios/Classes/AblyFlutter.m @@ -279,6 +279,15 @@ -(void)reset; result(handle); }; +static const FlutterHandler _getRealtimeConnectionRecoveryKey = ^void(AblyFlutter *const ably, FlutterMethodCall *const call, const FlutterResult result) { + AblyFlutterMessage *const ablyMessage = call.arguments; + + AblyInstanceStore *const instanceStore = [ably instanceStore]; + + NSString *recoveryKey = [[instanceStore realtimeFrom:ablyMessage.handle].connection getRecoveryKey]; + result(recoveryKey); +}; + static const FlutterHandler _connectRealtime = ^void(AblyFlutter *const ably, FlutterMethodCall *const call, const FlutterResult result) { AblyFlutterMessage *const ablyMessage = call.arguments; @@ -702,6 +711,7 @@ -(instancetype)initWithChannel:(FlutterMethodChannel *const)channel AblyPlatformMethod_createRealtime: _createRealtime, AblyPlatformMethod_setRealtimeChannelOptions: _setRealtimeChannelOptions, AblyPlatformMethod_connectRealtime: _connectRealtime, + AblyPlatformMethod_getRealtimeConnectionRecoveryKey: _getRealtimeConnectionRecoveryKey, AblyPlatformMethod_closeRealtime: _closeRealtime, AblyPlatformMethod_attachRealtimeChannel: _attachRealtimeChannel, AblyPlatformMethod_detachRealtimeChannel: _detachRealtimeChannel, diff --git a/ios/Classes/codec/AblyPlatformConstants.h b/ios/Classes/codec/AblyPlatformConstants.h index fecd39be3..3871da900 100644 --- a/ios/Classes/codec/AblyPlatformConstants.h +++ b/ios/Classes/codec/AblyPlatformConstants.h @@ -66,6 +66,7 @@ extern NSString *const AblyPlatformMethod_releaseRealtimeChannel; extern NSString *const AblyPlatformMethod_realtimeHistory; extern NSString *const AblyPlatformMethod_realtimeTime; extern NSString *const AblyPlatformMethod_restTime; +extern NSString *const AblyPlatformMethod_getRealtimeConnectionRecoveryKey; extern NSString *const AblyPlatformMethod_pushActivate; extern NSString *const AblyPlatformMethod_pushDeactivate; extern NSString *const AblyPlatformMethod_pushReset; diff --git a/ios/Classes/codec/AblyPlatformConstants.m b/ios/Classes/codec/AblyPlatformConstants.m index cc3ad48f6..1725cbe8e 100644 --- a/ios/Classes/codec/AblyPlatformConstants.m +++ b/ios/Classes/codec/AblyPlatformConstants.m @@ -36,6 +36,7 @@ NSString *const AblyPlatformMethod_realtimeHistory= @"realtimeHistory"; NSString *const AblyPlatformMethod_realtimeTime= @"realtimeTime"; NSString *const AblyPlatformMethod_restTime= @"restTime"; +NSString *const AblyPlatformMethod_getRealtimeConnectionRecoveryKey= @"getRealtimeConnectionRecoveryKey"; NSString *const AblyPlatformMethod_pushActivate= @"pushActivate"; NSString *const AblyPlatformMethod_pushDeactivate= @"pushDeactivate"; NSString *const AblyPlatformMethod_pushReset= @"pushReset"; diff --git a/lib/src/generated/platform_constants.dart b/lib/src/generated/platform_constants.dart index 8458ce6a4..687a10e25 100644 --- a/lib/src/generated/platform_constants.dart +++ b/lib/src/generated/platform_constants.dart @@ -66,6 +66,8 @@ class PlatformMethod { static const String realtimeHistory = 'realtimeHistory'; static const String realtimeTime = 'realtimeTime'; static const String restTime = 'restTime'; + static const String getRealtimeConnectionRecoveryKey = + 'getRealtimeConnectionRecoveryKey'; static const String pushActivate = 'pushActivate'; static const String pushDeactivate = 'pushDeactivate'; static const String pushReset = 'pushReset'; @@ -385,8 +387,7 @@ class TxPushRequestPermission { static const String alert = 'alert'; static const String carPlay = 'carPlay'; static const String criticalAlert = 'criticalAlert'; - static const String providesAppNotificationSettings = - 'providesAppNotificationSettings'; + static const String providesAppNotificationSettings = 'providesAppNotificationSettings'; static const String provisional = 'provisional'; static const String announcement = 'announcement'; } @@ -402,8 +403,7 @@ class TxUNNotificationSettings { static const String alertStyle = 'alertStyle'; static const String showPreviewsSetting = 'showPreviewsSetting'; static const String criticalAlertSetting = 'criticalAlertSetting'; - static const String providesAppNotificationSettings = - 'providesAppNotificationSettings'; + static const String providesAppNotificationSettings = 'providesAppNotificationSettings'; static const String announcementSetting = 'announcementSetting'; static const String scheduledDeliverySetting = 'scheduledDeliverySetting'; static const String timeSensitiveSetting = 'timeSensitiveSetting'; diff --git a/lib/src/platform/src/realtime/connection.dart b/lib/src/platform/src/realtime/connection.dart index cdaf4e329..085f8660c 100644 --- a/lib/src/platform/src/realtime/connection.dart +++ b/lib/src/platform/src/realtime/connection.dart @@ -49,14 +49,10 @@ class Connection extends PlatformObject { /// https://docs.ably.com/client-lib-development-guide/features/#RTN9 String? key; - /// RTN16b) Connection#recoveryKey is an attribute composed of the - /// connection key and latest serial received on the connection - String? recoveryKey; - - /// The serial number of the last message to be received on this connection. - /// - /// https://docs.ably.com/client-lib-development-guide/features/#RTN10 - int? serial; + /// https://docs.ably.com/client-lib-development-guide/features/#RTN16g + /// https://docs.ably.com/client-lib-development-guide/features/#RTN16h + Future getRecoveryKey() async => + invoke(PlatformMethod.getRealtimeConnectionRecoveryKey); /// current state of this connection /// diff --git a/pubspec.lock b/pubspec.lock index 48915d91e..1a519606b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.8.2" + version: "2.9.0" boolean_selector: dependency: transitive description: @@ -21,21 +21,14 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.1" + version: "1.2.1" clock: dependency: transitive description: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" collection: dependency: "direct main" description: @@ -49,7 +42,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.3.1" flutter: dependency: "direct main" description: flutter @@ -80,28 +73,28 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.11" + version: "0.12.12" material_color_utilities: dependency: transitive description: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.4" + version: "0.1.5" meta: dependency: "direct main" description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.8.0" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" sky_engine: dependency: transitive description: flutter @@ -113,7 +106,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.2" + version: "1.9.0" stack_trace: dependency: transitive description: @@ -134,21 +127,21 @@ packages: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.9" + version: "0.4.12" vector_math: dependency: transitive description: diff --git a/test_integration/ios/Flutter/AppFrameworkInfo.plist b/test_integration/ios/Flutter/AppFrameworkInfo.plist index f2872cf47..4f8d4d245 100644 --- a/test_integration/ios/Flutter/AppFrameworkInfo.plist +++ b/test_integration/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 9.0 + 11.0 diff --git a/test_integration/ios/Podfile.lock b/test_integration/ios/Podfile.lock index 041d63dd3..f62da15e9 100644 --- a/test_integration/ios/Podfile.lock +++ b/test_integration/ios/Podfile.lock @@ -1,11 +1,11 @@ PODS: - - Ably (1.2.10): - - AblyDeltaCodec (= 1.3.2) + - Ably (1.2.15): + - AblyDeltaCodec (= 1.3.3) - msgpack (= 0.4.0) - ably_flutter (1.2.15): - - Ably (= 1.2.10) + - Ably - Flutter - - AblyDeltaCodec (1.3.2) + - AblyDeltaCodec (1.3.3) - Flutter (1.0.0) - msgpack (0.4.0) @@ -26,10 +26,10 @@ EXTERNAL SOURCES: :path: Flutter SPEC CHECKSUMS: - Ably: 80be962e2e87bac69727a26ba72b868c8e86288e - ably_flutter: bba4fea46a2a3269fae98b67bd5c0c75cf3f0132 - AblyDeltaCodec: 783d017270de70bbbc0a84e4235297b225d33636 - Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a + Ably: bdbaa2cf4937881ac38f0fa4b99905c21a8bc28e + ably_flutter: 1341de3d132c22e32e2234710b58aae945eb2562 + AblyDeltaCodec: add5d06a756b3581b12aab5b5500a320b8c55bea + Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 msgpack: c85f6251873059738472ae136951cec5f30f3251 PODFILE CHECKSUM: f2c6cc511583caab2c65ac3f5766428391d93d34 diff --git a/test_integration/ios/Runner/Info.plist b/test_integration/ios/Runner/Info.plist index 24fa028c8..12b769826 100644 --- a/test_integration/ios/Runner/Info.plist +++ b/test_integration/ios/Runner/Info.plist @@ -41,5 +41,7 @@ UIViewControllerBasedStatusBarAppearance + CADisableMinimumFrameDurationOnPhone + diff --git a/test_integration/pubspec.lock b/test_integration/pubspec.lock index cfa2b822a..d75c0d7eb 100644 --- a/test_integration/pubspec.lock +++ b/test_integration/pubspec.lock @@ -28,7 +28,7 @@ packages: name: archive url: "https://pub.dartlang.org" source: hosted - version: "3.1.6" + version: "3.3.0" args: dependency: "direct main" description: @@ -42,7 +42,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.8.2" + version: "2.9.0" boolean_selector: dependency: transitive description: @@ -56,7 +56,7 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.2.1" charcode: dependency: transitive description: @@ -70,14 +70,14 @@ packages: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0" + version: "1.16.0" convert: dependency: transitive description: @@ -91,14 +91,14 @@ packages: name: coverage url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "1.5.0" crypto: dependency: transitive description: name: crypto url: "https://pub.dartlang.org" source: hosted - version: "3.0.1" + version: "3.0.2" enum_to_string: dependency: "direct main" description: @@ -112,7 +112,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" file: dependency: transitive description: @@ -138,7 +138,7 @@ packages: source: hosted version: "1.0.4" flutter_test: - dependency: "direct dev" + dependency: transitive description: flutter source: sdk version: "0.0.0" @@ -211,26 +211,26 @@ packages: source: hosted version: "1.0.2" matcher: - dependency: "direct overridden" + dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.11" + version: "0.12.12" material_color_utilities: dependency: transitive description: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.3" + version: "0.1.5" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.8.0" mime: dependency: transitive description: @@ -258,7 +258,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.2" platform: dependency: transitive description: @@ -340,7 +340,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.9.0" stack_trace: dependency: transitive description: @@ -361,63 +361,63 @@ packages: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" sync_http: dependency: transitive description: name: sync_http url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.3.1" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.2.1" test: dependency: "direct dev" description: name: test url: "https://pub.dartlang.org" source: hosted - version: "1.21.1" + version: "1.21.4" test_api: - dependency: "direct overridden" + dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.9" + version: "0.4.12" test_core: dependency: transitive description: name: test_core url: "https://pub.dartlang.org" source: hosted - version: "0.4.13" + version: "0.4.16" typed_data: dependency: transitive description: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.3.1" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.1.2" vm_service: dependency: transitive description: name: vm_service url: "https://pub.dartlang.org" source: hosted - version: "7.5.0" + version: "9.0.0" watcher: dependency: transitive description: @@ -454,5 +454,5 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=2.14.0 <3.0.0" + dart: ">=2.17.0-0 <3.0.0" flutter: ">=2.5.0"