diff --git a/example/pubspec.lock b/example/pubspec.lock index 76cbb69a..bbe30729 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -21,34 +21,34 @@ packages: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" chopper: dependency: "direct main" description: name: chopper - sha256: d1457197abb29ee354889fda35a7ac2e752eb5a687562148afb1faa78a61e36d + sha256: fb6106cd29553e34c811874efd8e8ee051ad7b9546e0d8c79394d2b6c9621b45 url: "https://pub.dev" source: hosted - version: "7.1.1" + version: "8.4.0" clock: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" collection: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.1" cupertino_icons: dependency: "direct main" description: @@ -69,18 +69,18 @@ packages: dependency: transitive description: name: equatable - sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2 + sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7" url: "https://pub.dev" source: hosted - version: "2.0.5" + version: "2.0.7" fake_async: dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.3" file: dependency: transitive description: @@ -134,10 +134,10 @@ packages: dependency: transitive description: name: http - sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" + sha256: "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412" url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.6.0" http_parser: dependency: transitive description: @@ -163,26 +163,26 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de" url: "https://pub.dev" source: hosted - version: "10.0.4" + version: "11.0.2" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.10" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" lints: dependency: transitive description: @@ -195,34 +195,34 @@ packages: dependency: transitive description: name: logging - sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" + sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" matcher: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.17" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.11.1" meta: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.17.0" nested: dependency: transitive description: @@ -235,10 +235,10 @@ packages: dependency: transitive description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" permission_handler: dependency: "direct main" description: @@ -319,11 +319,19 @@ packages: url: "https://pub.dev" source: hosted version: "6.0.5" + qs_dart: + dependency: transitive + description: + name: qs_dart + sha256: "27da57e8b394163f96b74bccb6eb6115bfd2585de4b9ad6241bdf1a9797ab54f" + url: "https://pub.dev" + source: hosted + version: "1.6.0" sky_engine: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_span: dependency: transitive description: @@ -336,18 +344,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" string_scanner: dependency: transitive description: @@ -376,10 +384,10 @@ packages: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55 url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.7.7" typed_data: dependency: transitive description: @@ -440,10 +448,10 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: fff0932192afeedf63cdd50ecbb1bc825d31aed259f02bb8dba0f3b729a5e88b + sha256: "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2" url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.4.1" url_launcher_windows: dependency: transitive description: @@ -456,94 +464,94 @@ packages: dependency: transitive description: name: vector_math - sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.2.0" vital_core: dependency: "direct main" description: path: "../packages/vital_core/vital_core" relative: true source: path - version: "4.5.3" + version: "4.5.6" vital_core_android: dependency: "direct overridden" description: path: "../packages/vital_core/vital_core_android" relative: true source: path - version: "4.5.3" + version: "4.5.6" vital_core_ios: dependency: "direct overridden" description: path: "../packages/vital_core/vital_core_ios" relative: true source: path - version: "4.5.3" + version: "4.5.6" vital_core_platform_interface: dependency: "direct overridden" description: path: "../packages/vital_core/vital_core_platform_interface" relative: true source: path - version: "4.5.3" + version: "4.5.6" vital_devices: dependency: "direct main" description: path: "../packages/vital_devices/vital_devices" relative: true source: path - version: "4.5.3" + version: "4.5.6" vital_devices_android: dependency: "direct overridden" description: path: "../packages/vital_devices/vital_devices_android" relative: true source: path - version: "4.5.3" + version: "4.5.6" vital_devices_ios: dependency: "direct overridden" description: path: "../packages/vital_devices/vital_devices_ios" relative: true source: path - version: "4.5.3" + version: "4.5.6" vital_devices_platform_interface: dependency: "direct overridden" description: path: "../packages/vital_devices/vital_devices_platform_interface" relative: true source: path - version: "4.5.3" + version: "4.5.6" vital_health: dependency: "direct main" description: path: "../packages/vital_health/vital_health" relative: true source: path - version: "4.5.3" + version: "4.5.6" vital_health_android: dependency: "direct overridden" description: path: "../packages/vital_health/vital_health_android" relative: true source: path - version: "4.5.3" + version: "4.5.6" vital_health_ios: dependency: "direct overridden" description: path: "../packages/vital_health/vital_health_ios" relative: true source: path - version: "4.5.3" + version: "4.5.6" vital_health_platform_interface: dependency: "direct overridden" description: path: "../packages/vital_health/vital_health_platform_interface" relative: true source: path - version: "4.5.3" + version: "4.5.6" vm_service: dependency: transitive description: @@ -552,14 +560,22 @@ packages: url: "https://pub.dev" source: hosted version: "14.2.1" + weak_map: + dependency: transitive + description: + name: weak_map + sha256: "5f8e5d5ce57dc624db5fae814dd689ccae1f17f92b426e52f0a7cbe7f6f4ab97" + url: "https://pub.dev" + source: hosted + version: "4.0.1" web: dependency: transitive description: name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a" url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "1.1.1" webdriver: dependency: transitive description: @@ -569,5 +585,5 @@ packages: source: hosted version: "3.0.3" sdks: - dart: ">=3.4.0 <4.0.0" - flutter: ">=3.22.0" + dart: ">=3.8.0-0 <4.0.0" + flutter: ">=3.27.0" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 29557c09..b9ae68fb 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: vital_core: ^4.5.6 vital_health: ^4.5.6 vital_devices: ^4.5.6 - chopper: ^7.1.1 + chopper: ^8.4.0 dev_dependencies: flutter_test: sdk: flutter diff --git a/packages/vital_core/vital_core/lib/services/activity_service.chopper.dart b/packages/vital_core/vital_core/lib/services/activity_service.chopper.dart index f589cacd..5f74986e 100644 --- a/packages/vital_core/vital_core/lib/services/activity_service.chopper.dart +++ b/packages/vital_core/vital_core/lib/services/activity_service.chopper.dart @@ -1,4 +1,5 @@ // GENERATED CODE - DO NOT MODIFY BY HAND +// dart format width=80 part of 'activity_service.dart'; diff --git a/packages/vital_core/vital_core/lib/services/activity_service.dart b/packages/vital_core/vital_core/lib/services/activity_service.dart index 112f178f..8a91c295 100644 --- a/packages/vital_core/vital_core/lib/services/activity_service.dart +++ b/packages/vital_core/vital_core/lib/services/activity_service.dart @@ -12,7 +12,7 @@ part 'activity_service.chopper.dart'; @ChopperApi() abstract class ActivityService extends ChopperService { - @Get(path: 'summary/activity/{user_id}') + @GET(path: 'summary/activity/{user_id}') @FactoryConverter(request: JsonConverter.requestFactory) Future> _getActivity( @Path('user_id') String userId, @@ -31,7 +31,7 @@ abstract class ActivityService extends ChopperService { endDate?.toIso8601String(), provider); } - @Get(path: 'summary/activity/{user_id}/raw') + @GET(path: 'summary/activity/{user_id}/raw') Future> getActivityRaw( @Path('user_id') String userId, @Query('start_date') DateTime startDate, @@ -40,7 +40,7 @@ abstract class ActivityService extends ChopperService { ); static ActivityService create( - http.Client httpClient, Uri baseUrl, RequestInterceptor authInterceptor) { + http.Client httpClient, Uri baseUrl, Interceptor authInterceptor) { final client = ChopperClient( client: httpClient, baseUrl: baseUrl, diff --git a/packages/vital_core/vital_core/lib/services/body_service.chopper.dart b/packages/vital_core/vital_core/lib/services/body_service.chopper.dart index fc5de67a..d83597f1 100644 --- a/packages/vital_core/vital_core/lib/services/body_service.chopper.dart +++ b/packages/vital_core/vital_core/lib/services/body_service.chopper.dart @@ -1,4 +1,5 @@ // GENERATED CODE - DO NOT MODIFY BY HAND +// dart format width=80 part of 'body_service.dart'; diff --git a/packages/vital_core/vital_core/lib/services/body_service.dart b/packages/vital_core/vital_core/lib/services/body_service.dart index de01cea2..98e3ef15 100644 --- a/packages/vital_core/vital_core/lib/services/body_service.dart +++ b/packages/vital_core/vital_core/lib/services/body_service.dart @@ -11,7 +11,7 @@ part 'body_service.chopper.dart'; @ChopperApi() abstract class BodyService extends ChopperService { - @Get(path: '/summary/body/{user_id}') + @GET(path: '/summary/body/{user_id}') Future> getBodyData( @Path('user_id') String userId, @Query('start_date') DateTime startDate, @@ -20,7 +20,7 @@ abstract class BodyService extends ChopperService { ); static BodyService create( - http.Client httpClient, Uri baseUrl, RequestInterceptor authInterceptor) { + http.Client httpClient, Uri baseUrl, Interceptor authInterceptor) { final client = ChopperClient( client: httpClient, baseUrl: baseUrl, diff --git a/packages/vital_core/vital_core/lib/services/control_plane_service.chopper.dart b/packages/vital_core/vital_core/lib/services/control_plane_service.chopper.dart index dc788329..bd8352d4 100644 --- a/packages/vital_core/vital_core/lib/services/control_plane_service.chopper.dart +++ b/packages/vital_core/vital_core/lib/services/control_plane_service.chopper.dart @@ -1,4 +1,5 @@ // GENERATED CODE - DO NOT MODIFY BY HAND +// dart format width=80 part of 'control_plane_service.dart'; diff --git a/packages/vital_core/vital_core/lib/services/control_plane_service.dart b/packages/vital_core/vital_core/lib/services/control_plane_service.dart index 1a0fefb4..e0962598 100644 --- a/packages/vital_core/vital_core/lib/services/control_plane_service.dart +++ b/packages/vital_core/vital_core/lib/services/control_plane_service.dart @@ -14,10 +14,10 @@ part 'control_plane_service.chopper.dart'; @ChopperApi() abstract class ControlPlaneService extends ChopperService { - @Get(path: 'user/') + @GET(path: 'user/') Future> getAll(); - @Post(path: '/user') + @POST(path: '/user') @FactoryConverter( request: JsonConverter.requestFactory, ) @@ -25,23 +25,23 @@ abstract class ControlPlaneService extends ChopperService { @Field('client_user_id') String clientUserId, {@Field('fallback_time_zone') String? fallbackTimeZone}); - @Post(path: '/user/{user_id}/sign_in_token', optionalBody: true) + @POST(path: '/user/{user_id}/sign_in_token', optionalBody: true) @FactoryConverter( request: JsonConverter.requestFactory, ) Future> createSignInToken( @Path('user_id') String userId); - @Delete(path: 'user/{user_id}') + @DELETE(path: 'user/{user_id}') Future> deleteUser( @Path('user_id') String userId); - @Get(path: '/user/resolve/{client_user_id}') + @GET(path: '/user/resolve/{client_user_id}') Future> resolveUser( @Path('client_user_id') String clientUserId); static ControlPlaneService create( - http.Client httpClient, Uri baseUrl, RequestInterceptor authInterceptor) { + http.Client httpClient, Uri baseUrl, Interceptor authInterceptor) { final client = ChopperClient( client: httpClient, baseUrl: baseUrl, diff --git a/packages/vital_core/vital_core/lib/services/link_service.chopper.dart b/packages/vital_core/vital_core/lib/services/link_service.chopper.dart index 510354b6..d01e9102 100644 --- a/packages/vital_core/vital_core/lib/services/link_service.chopper.dart +++ b/packages/vital_core/vital_core/lib/services/link_service.chopper.dart @@ -1,4 +1,5 @@ // GENERATED CODE - DO NOT MODIFY BY HAND +// dart format width=80 part of 'link_service.dart'; diff --git a/packages/vital_core/vital_core/lib/services/link_service.dart b/packages/vital_core/vital_core/lib/services/link_service.dart index 910899ad..b2a4b169 100644 --- a/packages/vital_core/vital_core/lib/services/link_service.dart +++ b/packages/vital_core/vital_core/lib/services/link_service.dart @@ -12,7 +12,7 @@ part 'link_service.chopper.dart'; @ChopperApi() abstract class LinkService extends ChopperService { - @Post(path: 'link/token') + @POST(path: 'link/token') @FactoryConverter(request: JsonConverter.requestFactory) Future> createLink( {@Field('user_id') required String userId, @@ -20,7 +20,7 @@ abstract class LinkService extends ChopperService { @Field('provider') String? provider, @Field('filter_on_providers') List? filterOnProviders}); - @Post(path: 'link/provider/password/{provider}') + @POST(path: 'link/provider/password/{provider}') @FactoryConverter(request: JsonConverter.requestFactory) Future> passwordProvider({ @Path('provider') required String provider, @@ -30,7 +30,7 @@ abstract class LinkService extends ChopperService { @Field('region') String? region, }); - @Post(path: 'link/provider/password/{provider}/complete_mfa') + @POST(path: 'link/provider/password/{provider}/complete_mfa') @FactoryConverter(request: JsonConverter.requestFactory) Future> completePasswordProviderMFA({ @Path('provider') required String provider, @@ -38,7 +38,7 @@ abstract class LinkService extends ChopperService { @Header('x-vital-link-token') required String linkToken, }); - @Post(path: 'link/provider/email/{provider}') + @POST(path: 'link/provider/email/{provider}') @FactoryConverter(request: JsonConverter.requestFactory) Future> emailProvider({ @Path('provider') required String provider, @@ -47,14 +47,14 @@ abstract class LinkService extends ChopperService { @Field('region') String? region, }); - @Get(path: 'link/provider/oauth/{provider}') + @GET(path: 'link/provider/oauth/{provider}') @FactoryConverter(request: JsonConverter.requestFactory) Future> oauthProvider({ @Path('provider') required String provider, @Header('x-vital-link-token') required String linkToken, }); - @Get( + @GET( path: 'link/connect/{provider}', headers: {"X-Vital-SDK-No-Redirect": "1"}) @FactoryConverter(request: JsonConverter.requestFactory) @@ -64,13 +64,13 @@ abstract class LinkService extends ChopperService { @Query('state') required String linkToken, }); - @Post(path: 'link/token/isValid') + @POST(path: 'link/token/isValid') Future> isTokenValid({ @Body() required IsLinkTokenValidRequest request, }); static LinkService create( - http.Client httpClient, Uri baseUrl, RequestInterceptor authInterceptor) { + http.Client httpClient, Uri baseUrl, Interceptor authInterceptor) { final client = ChopperClient( client: httpClient, baseUrl: baseUrl, diff --git a/packages/vital_core/vital_core/lib/services/profile_service.chopper.dart b/packages/vital_core/vital_core/lib/services/profile_service.chopper.dart index d28cec66..48a0fcfa 100644 --- a/packages/vital_core/vital_core/lib/services/profile_service.chopper.dart +++ b/packages/vital_core/vital_core/lib/services/profile_service.chopper.dart @@ -1,4 +1,5 @@ // GENERATED CODE - DO NOT MODIFY BY HAND +// dart format width=80 part of 'profile_service.dart'; diff --git a/packages/vital_core/vital_core/lib/services/profile_service.dart b/packages/vital_core/vital_core/lib/services/profile_service.dart index 92892bce..6600fa0e 100644 --- a/packages/vital_core/vital_core/lib/services/profile_service.dart +++ b/packages/vital_core/vital_core/lib/services/profile_service.dart @@ -11,16 +11,16 @@ part 'profile_service.chopper.dart'; @ChopperApi() abstract class ProfileService extends ChopperService { - @Get(path: 'summary/profile/{user_id}') + @GET(path: 'summary/profile/{user_id}') Future> getProfile( @Path('user_id') String userId, @Query('provider') String? provider); - @Get(path: 'summary/profile/{user_id}/raw') + @GET(path: 'summary/profile/{user_id}/raw') Future> getProfileRaw( @Path('user_id') String userId, @Query('provider') String? provider); static ProfileService create( - http.Client httpClient, Uri baseUrl, RequestInterceptor authInterceptor) { + http.Client httpClient, Uri baseUrl, Interceptor authInterceptor) { final client = ChopperClient( client: httpClient, baseUrl: baseUrl, diff --git a/packages/vital_core/vital_core/lib/services/providers_service.chopper.dart b/packages/vital_core/vital_core/lib/services/providers_service.chopper.dart index 876b13d2..f9c57b1b 100644 --- a/packages/vital_core/vital_core/lib/services/providers_service.chopper.dart +++ b/packages/vital_core/vital_core/lib/services/providers_service.chopper.dart @@ -1,4 +1,5 @@ // GENERATED CODE - DO NOT MODIFY BY HAND +// dart format width=80 part of 'providers_service.dart'; diff --git a/packages/vital_core/vital_core/lib/services/providers_service.dart b/packages/vital_core/vital_core/lib/services/providers_service.dart index c9ebb1c8..c92c2645 100644 --- a/packages/vital_core/vital_core/lib/services/providers_service.dart +++ b/packages/vital_core/vital_core/lib/services/providers_service.dart @@ -11,11 +11,11 @@ part 'providers_service.chopper.dart'; @ChopperApi() abstract class ProvidersService extends ChopperService { - @Get(path: 'providers') + @GET(path: 'providers') Future>> get(); static ProvidersService create( - http.Client httpClient, Uri baseUrl, RequestInterceptor authInterceptor) { + http.Client httpClient, Uri baseUrl, Interceptor authInterceptor) { final client = ChopperClient( client: httpClient, baseUrl: baseUrl, diff --git a/packages/vital_core/vital_core/lib/services/sleep_service.chopper.dart b/packages/vital_core/vital_core/lib/services/sleep_service.chopper.dart index 254c6e0e..18a4d53d 100644 --- a/packages/vital_core/vital_core/lib/services/sleep_service.chopper.dart +++ b/packages/vital_core/vital_core/lib/services/sleep_service.chopper.dart @@ -1,4 +1,5 @@ // GENERATED CODE - DO NOT MODIFY BY HAND +// dart format width=80 part of 'sleep_service.dart'; diff --git a/packages/vital_core/vital_core/lib/services/sleep_service.dart b/packages/vital_core/vital_core/lib/services/sleep_service.dart index 00ef41a0..ee4988ed 100644 --- a/packages/vital_core/vital_core/lib/services/sleep_service.dart +++ b/packages/vital_core/vital_core/lib/services/sleep_service.dart @@ -11,7 +11,7 @@ part 'sleep_service.chopper.dart'; @ChopperApi() abstract class SleepService extends ChopperService { - @Get(path: 'summary/sleep/{user_id}') + @GET(path: 'summary/sleep/{user_id}') Future> _getSleepData( @Path('user_id') String userId, @Query('start_date') String startDate, @@ -29,7 +29,7 @@ abstract class SleepService extends ChopperService { endDate?.toIso8601String(), provider); } - @Get(path: 'summary/sleep/{user_id}/raw') + @GET(path: 'summary/sleep/{user_id}/raw') Future> _getSleepDataRaw( @Path('user_id') String userId, @Query('start_date') String startDate, @@ -48,7 +48,7 @@ abstract class SleepService extends ChopperService { } static SleepService create( - http.Client httpClient, Uri baseUrl, RequestInterceptor authInterceptor) { + http.Client httpClient, Uri baseUrl, Interceptor authInterceptor) { final client = ChopperClient( client: httpClient, baseUrl: baseUrl, diff --git a/packages/vital_core/vital_core/lib/services/timeseries_service.chopper.dart b/packages/vital_core/vital_core/lib/services/timeseries_service.chopper.dart index 50278091..504599af 100644 --- a/packages/vital_core/vital_core/lib/services/timeseries_service.chopper.dart +++ b/packages/vital_core/vital_core/lib/services/timeseries_service.chopper.dart @@ -1,4 +1,5 @@ // GENERATED CODE - DO NOT MODIFY BY HAND +// dart format width=80 part of 'timeseries_service.dart'; diff --git a/packages/vital_core/vital_core/lib/services/timeseries_service.dart b/packages/vital_core/vital_core/lib/services/timeseries_service.dart index a40024e8..1720b677 100644 --- a/packages/vital_core/vital_core/lib/services/timeseries_service.dart +++ b/packages/vital_core/vital_core/lib/services/timeseries_service.dart @@ -13,7 +13,7 @@ part 'timeseries_service.chopper.dart'; @ChopperApi() abstract class TimeseriesService extends ChopperService { - @Get(path: 'timeseries/{user_id}/{resource}') + @GET(path: 'timeseries/{user_id}/{resource}') Future> _intervalTimeseriesRequest( @Path('user_id') String userId, @@ -24,7 +24,7 @@ abstract class TimeseriesService extends ChopperService { @Query('next_cursor') String? nextCursor, }); - @Get(path: 'timeseries/{user_id}/{resource}') + @GET(path: 'timeseries/{user_id}/{resource}') Future> _scalarTimeseriesRequest( @Path('user_id') String userId, @Path('resource') String resource, @@ -34,7 +34,7 @@ abstract class TimeseriesService extends ChopperService { @Query('next_cursor') String? nextCursor, }); - @Get(path: 'timeseries/{user_id}/blood_pressure') + @GET(path: 'timeseries/{user_id}/blood_pressure') Future> _bloodPressureTimeseriesRequest( @Path('user_id') String userId, @@ -98,7 +98,7 @@ abstract class TimeseriesService extends ChopperService { } static TimeseriesService create( - http.Client httpClient, Uri baseUrl, RequestInterceptor authInterceptor) { + http.Client httpClient, Uri baseUrl, Interceptor authInterceptor) { final client = ChopperClient( client: httpClient, baseUrl: baseUrl, diff --git a/packages/vital_core/vital_core/lib/services/user_service.chopper.dart b/packages/vital_core/vital_core/lib/services/user_service.chopper.dart index 5435f82e..7a37a7fb 100644 --- a/packages/vital_core/vital_core/lib/services/user_service.chopper.dart +++ b/packages/vital_core/vital_core/lib/services/user_service.chopper.dart @@ -1,4 +1,5 @@ // GENERATED CODE - DO NOT MODIFY BY HAND +// dart format width=80 part of 'user_service.dart'; diff --git a/packages/vital_core/vital_core/lib/services/user_service.dart b/packages/vital_core/vital_core/lib/services/user_service.dart index 745423a6..f86b4bac 100644 --- a/packages/vital_core/vital_core/lib/services/user_service.dart +++ b/packages/vital_core/vital_core/lib/services/user_service.dart @@ -13,27 +13,27 @@ part 'user_service.chopper.dart'; @ChopperApi() abstract class UserService extends ChopperService { - @Get(path: 'user/{user_id}') + @GET(path: 'user/{user_id}') Future> getUser(@Path('user_id') String userId); - @Patch(path: '/user/{user_id}') + @PATCH(path: '/user/{user_id}') @FactoryConverter( request: JsonConverter.requestFactory, ) Future> patchUser(@Path('user_id') String userId, {@Field('fallback_time_zone') String? fallbackTimeZone}); - @Delete(path: '/user/{user_id}/{provider}') + @DELETE(path: '/user/{user_id}/{provider}') Future> deregisterProvider( @Path('user_id') String userId, @Path('provider') String provider, ); - @Post(path: '/user/refresh/{user_id}', optionalBody: true) + @POST(path: '/user/refresh/{user_id}', optionalBody: true) Future> refreshUser(@Path('user_id') String userId); static UserService create( - http.Client httpClient, Uri baseUrl, RequestInterceptor authInterceptor) { + http.Client httpClient, Uri baseUrl, Interceptor authInterceptor) { final client = ChopperClient( client: httpClient, baseUrl: baseUrl, diff --git a/packages/vital_core/vital_core/lib/services/utils/http_logging_interceptor.dart b/packages/vital_core/vital_core/lib/services/utils/http_logging_interceptor.dart index 01a62152..2843144a 100644 --- a/packages/vital_core/vital_core/lib/services/utils/http_logging_interceptor.dart +++ b/packages/vital_core/vital_core/lib/services/utils/http_logging_interceptor.dart @@ -1,27 +1,27 @@ import 'dart:async'; -import 'package:http/http.dart' as http; + import 'package:chopper/chopper.dart'; +import 'package:http/http.dart' as http; -class HttpRequestLoggingInterceptor extends HttpLoggingInterceptor { +/// Matches the previous logging output while using the new interceptor API. +class HttpRequestLoggingInterceptor implements Interceptor { @override - FutureOr onRequest(Request request) { + FutureOr> intercept( + Chain chain, + ) async { + final request = chain.request; chopperLogger.info('--> ${request.method} ${request.url}'); - request.headers.forEach((k, v) { chopperLogger.info('$k: $v'); }); - if (request is http.Request) { - if (request.body.isNotEmpty) { - chopperLogger.info(request.body); - } + final body = request.body; + if (body is String && body.isNotEmpty) { + chopperLogger.info(body); } - return super.onRequest(request); - } + final response = await chain.proceed(request); - @override - FutureOr onResponse(Response response) { final base = response.base.request; chopperLogger.info('<-- ${response.statusCode} ${base?.url}'); diff --git a/packages/vital_core/vital_core/lib/services/utils/vital_interceptor.dart b/packages/vital_core/vital_core/lib/services/utils/vital_interceptor.dart index faf6cfd8..94273f48 100644 --- a/packages/vital_core/vital_core/lib/services/utils/vital_interceptor.dart +++ b/packages/vital_core/vital_core/lib/services/utils/vital_interceptor.dart @@ -3,11 +3,11 @@ import 'dart:async'; import 'package:chopper/chopper.dart'; import 'package:vital_core/core.dart' as vital_core; -class VitalInterceptor extends HeadersInterceptor { +class VitalInterceptor implements Interceptor { final String? apiKey; final bool useAccessToken; - VitalInterceptor(this.useAccessToken, this.apiKey) : super({}) { + VitalInterceptor(this.useAccessToken, this.apiKey) { if (useAccessToken && apiKey != null) { throw Exception("useAccessToken is true, but an API key is provided."); } @@ -19,7 +19,9 @@ class VitalInterceptor extends HeadersInterceptor { } @override - Future onRequest(Request request) async { + FutureOr> intercept( + Chain chain, + ) async { Map headers; if (useAccessToken) { @@ -31,6 +33,6 @@ class VitalInterceptor extends HeadersInterceptor { }; } - return applyHeaders(request, headers); + return chain.proceed(applyHeaders(chain.request, headers)); } } diff --git a/packages/vital_core/vital_core/lib/services/workout_service.chopper.dart b/packages/vital_core/vital_core/lib/services/workout_service.chopper.dart index 57d156f2..9b8686e8 100644 --- a/packages/vital_core/vital_core/lib/services/workout_service.chopper.dart +++ b/packages/vital_core/vital_core/lib/services/workout_service.chopper.dart @@ -1,4 +1,5 @@ // GENERATED CODE - DO NOT MODIFY BY HAND +// dart format width=80 part of 'workout_service.dart'; diff --git a/packages/vital_core/vital_core/lib/services/workout_service.dart b/packages/vital_core/vital_core/lib/services/workout_service.dart index 1eaa7124..d9b5e563 100644 --- a/packages/vital_core/vital_core/lib/services/workout_service.dart +++ b/packages/vital_core/vital_core/lib/services/workout_service.dart @@ -11,7 +11,7 @@ part 'workout_service.chopper.dart'; @ChopperApi() abstract class WorkoutService extends ChopperService { - @Get(path: 'summary/workouts/{user_id}') + @GET(path: 'summary/workouts/{user_id}') Future> getWorkouts( @Path('user_id') String userId, @Query('start_date') DateTime startDate, { @@ -19,7 +19,7 @@ abstract class WorkoutService extends ChopperService { @Query('provider') String? provider, }); - @Get(path: 'summary/workouts/{user_id}/raw') + @GET(path: 'summary/workouts/{user_id}/raw') Future> getWorkoutsRaw( @Path('user_id') String userId, @Query('start_date') DateTime startDate, @@ -27,13 +27,13 @@ abstract class WorkoutService extends ChopperService { @Query('provider') String? provider, ); - @Get(path: 'timeseries/workouts/{workout_id}/stream') + @GET(path: 'timeseries/workouts/{workout_id}/stream') Future> getWorkoutStream( @Path('workout_id') String workoutId, ); static WorkoutService create( - http.Client httpClient, Uri baseUrl, RequestInterceptor authInterceptor) { + http.Client httpClient, Uri baseUrl, Interceptor authInterceptor) { final client = ChopperClient( client: httpClient, baseUrl: baseUrl, diff --git a/packages/vital_core/vital_core/lib/vital_core.dart b/packages/vital_core/vital_core/lib/vital_core.dart index f6cefc68..5268dad3 100644 --- a/packages/vital_core/vital_core/lib/vital_core.dart +++ b/packages/vital_core/vital_core/lib/vital_core.dart @@ -30,7 +30,7 @@ export 'client_status.dart'; class VitalClient { late final http.Client _httpClient; late final Uri _baseUrl; - late final RequestInterceptor _authInterceptor; + late final Interceptor _authInterceptor; // ignore: unused_field late final Region _region; diff --git a/packages/vital_core/vital_core/pubspec.lock b/packages/vital_core/vital_core/pubspec.lock index 4e98384e..c9b10be5 100644 --- a/packages/vital_core/vital_core/pubspec.lock +++ b/packages/vital_core/vital_core/pubspec.lock @@ -5,18 +5,18 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7" + sha256: c209688d9f5a5f26b2fb47a188131a6fb9e876ae9e47af3737c0b4f58a93470d url: "https://pub.dev" source: hosted - version: "67.0.0" + version: "91.0.0" analyzer: dependency: transitive description: name: analyzer - sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d" + sha256: f51c8499b35f9b26820cfe914828a6a98a94efd5cc78b37bb7d03debae3a1d08 url: "https://pub.dev" source: hosted - version: "6.4.1" + version: "8.4.1" args: dependency: transitive description: @@ -45,18 +45,18 @@ packages: dependency: "direct dev" description: name: build - sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0" + sha256: c1668065e9ba04752570ad7e038288559d1e2ca5c6d0131c0f5f55e39e777413 url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "4.0.3" build_config: dependency: transitive description: name: build_config - sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1 + sha256: "4f64382b97504dc2fcdf487d5aae33418e08b4703fc21249e4db6d804a4d0187" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.2.0" build_daemon: dependency: transitive description: @@ -65,30 +65,14 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.2" - build_resolvers: - dependency: transitive - description: - name: build_resolvers - sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a" - url: "https://pub.dev" - source: hosted - version: "2.4.2" build_runner: dependency: "direct dev" description: name: build_runner - sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7" - url: "https://pub.dev" - source: hosted - version: "2.4.11" - build_runner_core: - dependency: transitive - description: - name: build_runner_core - sha256: e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe + sha256: "110c56ef29b5eb367b4d17fc79375fa8c18a6cd7acd92c05bb3986c17a079057" url: "https://pub.dev" source: hosted - version: "7.3.1" + version: "2.10.4" built_collection: dependency: transitive description: @@ -101,18 +85,18 @@ packages: dependency: transitive description: name: built_value - sha256: ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4 + sha256: "426cf75afdb23aa74bd4e471704de3f9393f3c7b04c1e2d9c6f1073ae0b8b139" url: "https://pub.dev" source: hosted - version: "8.9.5" + version: "8.12.1" characters: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" checked_yaml: dependency: transitive description: @@ -125,42 +109,42 @@ packages: dependency: "direct main" description: name: chopper - sha256: "1b6280ec22841b844448bec8ef2644d9cbe9ea8dfce13ec9cab9e8d3aac3830d" + sha256: fb6106cd29553e34c811874efd8e8ee051ad7b9546e0d8c79394d2b6c9621b45 url: "https://pub.dev" source: hosted - version: "7.4.0" + version: "8.4.0" chopper_generator: dependency: "direct dev" description: name: chopper_generator - sha256: "2984ed8589132aa8fd8225482038cad2bd576405e3751aa237d466870f5dad42" + sha256: "83af68b9cd83db3f80d4f51efa9fd4d9c40d7e5e4a6bba0a49937c60d71724c3" url: "https://pub.dev" source: hosted - version: "7.4.0" + version: "8.4.0" clock: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" code_builder: dependency: transitive description: name: code_builder - sha256: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37 + sha256: "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243" url: "https://pub.dev" source: hosted - version: "4.10.0" + version: "4.11.0" collection: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.1" convert: dependency: transitive description: @@ -181,10 +165,10 @@ packages: dependency: transitive description: name: dart_style - sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9" + sha256: a9c30492da18ff84efe2422ba2d319a89942d93e58eb0b73d32abe822ef54b7b url: "https://pub.dev" source: hosted - version: "2.3.6" + version: "3.1.3" equatable: dependency: transitive description: @@ -197,10 +181,10 @@ packages: dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.3" file: dependency: transitive description: @@ -248,14 +232,6 @@ packages: description: flutter source: sdk version: "0.0.0" - frontend_server_client: - dependency: transitive - description: - name: frontend_server_client - sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694 - url: "https://pub.dev" - source: hosted - version: "4.0.0" glob: dependency: transitive description: @@ -276,10 +252,10 @@ packages: dependency: "direct main" description: name: http - sha256: "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b" + sha256: "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412" url: "https://pub.dev" source: hosted - version: "1.4.0" + version: "1.6.0" http_multi_server: dependency: transitive description: @@ -304,14 +280,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.5" - js: - dependency: transitive - description: - name: js - sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf - url: "https://pub.dev" - source: hosted - version: "0.7.1" json_annotation: dependency: "direct main" description: @@ -324,34 +292,34 @@ packages: dependency: "direct dev" description: name: json_serializable - sha256: ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b + sha256: c5b2ee75210a0f263c6c7b9eeea80553dbae96ea1bf57f02484e806a3ffdffa3 url: "https://pub.dev" source: hosted - version: "6.8.0" + version: "6.11.2" leak_tracker: dependency: transitive description: name: leak_tracker - sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de" url: "https://pub.dev" source: hosted - version: "10.0.4" + version: "11.0.2" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.10" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" lints: dependency: transitive description: @@ -372,26 +340,26 @@ packages: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.17" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.11.1" meta: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.17.0" mime: dependency: transitive description: @@ -412,10 +380,10 @@ packages: dependency: transitive description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" plugin_platform_interface: dependency: transitive description: @@ -452,18 +420,10 @@ packages: dependency: transitive description: name: qs_dart - sha256: "041c8ae470775b149ca3f7678adf9fb0752d1ab2c44c76aeb681f57379d30f62" - url: "https://pub.dev" - source: hosted - version: "1.3.5+1" - recursive_regex: - dependency: transitive - description: - name: recursive_regex - sha256: f7252e3d3dfd1665e594d9fe035eca6bc54139b1f2fee38256fa427ea41adc60 + sha256: "27da57e8b394163f96b74bccb6eb6115bfd2585de4b9ad6241bdf1a9797ab54f" url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.6.0" shelf: dependency: transitive description: @@ -484,23 +444,23 @@ packages: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_gen: dependency: transitive description: name: source_gen - sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832" + sha256: "07b277b67e0096c45196cbddddf2d8c6ffc49342e88bf31d460ce04605ddac75" url: "https://pub.dev" source: hosted - version: "1.5.0" + version: "4.1.1" source_helper: dependency: transitive description: name: source_helper - sha256: "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c" + sha256: "6a3c6cc82073a8797f8c4dc4572146114a39652851c157db37e964d9c7038723" url: "https://pub.dev" source: hosted - version: "1.3.5" + version: "1.3.8" source_span: dependency: transitive description: @@ -513,18 +473,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" stream_transform: dependency: transitive description: @@ -553,18 +513,10 @@ packages: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55 url: "https://pub.dev" source: hosted - version: "0.7.0" - timing: - dependency: transitive - description: - name: timing - sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe" - url: "https://pub.dev" - source: hosted - version: "1.0.2" + version: "0.7.7" typed_data: dependency: transitive description: @@ -641,31 +593,31 @@ packages: dependency: transitive description: name: vector_math - sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.2.0" vital_core_android: dependency: "direct main" description: path: "../vital_core_android" relative: true source: path - version: "4.5.2" + version: "4.5.6" vital_core_ios: dependency: "direct main" description: path: "../vital_core_ios" relative: true source: path - version: "4.5.2" + version: "4.5.6" vital_core_platform_interface: dependency: "direct main" description: path: "../vital_core_platform_interface" relative: true source: path - version: "4.5.2" + version: "4.5.6" vm_service: dependency: transitive description: @@ -723,5 +675,5 @@ packages: source: hosted version: "3.1.3" sdks: - dart: ">=3.4.0 <4.0.0" + dart: ">=3.9.0 <4.0.0" flutter: ">=3.22.0" diff --git a/packages/vital_core/vital_core/pubspec.yaml b/packages/vital_core/vital_core/pubspec.yaml index 3d3773a0..d770229b 100644 --- a/packages/vital_core/vital_core/pubspec.yaml +++ b/packages/vital_core/vital_core/pubspec.yaml @@ -19,7 +19,7 @@ flutter: dependencies: flutter: sdk: flutter - chopper: ^7.0.7+1 + chopper: ^8.4.0 http: ^1.1.0 json_annotation: ^4.8.1 url_launcher: ">=6.2.3 <7.0.0" @@ -31,7 +31,7 @@ dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^2.0.1 - build: ^2.1.1 + build: ^4.0.3 build_runner: ^2.4.6 - chopper_generator: ^7.0.5+1 + chopper_generator: ^8.4.0 json_serializable: ^6.1.1 diff --git a/packages/vital_core/vital_core_android/pubspec.lock b/packages/vital_core/vital_core_android/pubspec.lock index b60246c3..499a339a 100644 --- a/packages/vital_core/vital_core_android/pubspec.lock +++ b/packages/vital_core/vital_core_android/pubspec.lock @@ -21,34 +21,34 @@ packages: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" clock: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" collection: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.1" fake_async: dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.3" flutter: dependency: "direct main" description: flutter @@ -71,26 +71,26 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de" url: "https://pub.dev" source: hosted - version: "10.0.4" + version: "11.0.2" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.10" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" lints: dependency: transitive description: @@ -103,34 +103,34 @@ packages: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.17" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.11.1" meta: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.17.0" path: dependency: transitive description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" plugin_platform_interface: dependency: "direct main" description: @@ -143,7 +143,7 @@ packages: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_span: dependency: transitive description: @@ -156,18 +156,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" string_scanner: dependency: transitive description: @@ -188,18 +188,18 @@ packages: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55 url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.7.7" vector_math: dependency: transitive description: name: vector_math - sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.2.0" vm_service: dependency: transitive description: @@ -209,5 +209,5 @@ packages: source: hosted version: "14.2.1" sdks: - dart: ">=3.3.0 <4.0.0" + dart: ">=3.8.0-0 <4.0.0" flutter: ">=3.18.0-18.0.pre.54" diff --git a/packages/vital_core/vital_core_ios/pubspec.lock b/packages/vital_core/vital_core_ios/pubspec.lock index c12c2b2f..ec9b30a7 100644 --- a/packages/vital_core/vital_core_ios/pubspec.lock +++ b/packages/vital_core/vital_core_ios/pubspec.lock @@ -21,34 +21,34 @@ packages: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" clock: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" collection: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.1" fake_async: dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.3" fimber: dependency: "direct dev" description: @@ -79,26 +79,26 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de" url: "https://pub.dev" source: hosted - version: "10.0.4" + version: "11.0.2" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.10" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" lints: dependency: transitive description: @@ -111,39 +111,39 @@ packages: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.17" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.11.1" meta: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.17.0" path: dependency: transitive description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" sky_engine: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_span: dependency: transitive description: @@ -156,18 +156,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" string_scanner: dependency: transitive description: @@ -188,18 +188,18 @@ packages: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55 url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.7.7" vector_math: dependency: transitive description: name: vector_math - sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.2.0" vm_service: dependency: transitive description: @@ -209,5 +209,5 @@ packages: source: hosted version: "14.2.1" sdks: - dart: ">=3.3.0 <4.0.0" + dart: ">=3.8.0-0 <4.0.0" flutter: ">=3.18.0-18.0.pre.54" diff --git a/packages/vital_core/vital_core_platform_interface/pubspec.lock b/packages/vital_core/vital_core_platform_interface/pubspec.lock index f07ee4d7..ac774143 100644 --- a/packages/vital_core/vital_core_platform_interface/pubspec.lock +++ b/packages/vital_core/vital_core_platform_interface/pubspec.lock @@ -21,34 +21,34 @@ packages: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" clock: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" collection: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.1" fake_async: dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.3" fimber: dependency: "direct main" description: @@ -79,26 +79,26 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de" url: "https://pub.dev" source: hosted - version: "10.0.4" + version: "11.0.2" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.10" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" lints: dependency: transitive description: @@ -111,34 +111,34 @@ packages: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.17" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.11.1" meta: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.17.0" path: dependency: transitive description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" plugin_platform_interface: dependency: "direct main" description: @@ -151,7 +151,7 @@ packages: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_span: dependency: transitive description: @@ -164,18 +164,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" string_scanner: dependency: transitive description: @@ -196,18 +196,18 @@ packages: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55 url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.7.7" vector_math: dependency: transitive description: name: vector_math - sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.2.0" vm_service: dependency: transitive description: @@ -217,5 +217,5 @@ packages: source: hosted version: "14.2.1" sdks: - dart: ">=3.3.0 <4.0.0" + dart: ">=3.8.0-0 <4.0.0" flutter: ">=3.18.0-18.0.pre.54" diff --git a/packages/vital_health/vital_health/pubspec.yaml b/packages/vital_health/vital_health/pubspec.yaml index 34ce6822..f452b975 100644 --- a/packages/vital_health/vital_health/pubspec.yaml +++ b/packages/vital_health/vital_health/pubspec.yaml @@ -29,4 +29,4 @@ dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^2.0.1 - build: ^2.1.1 + build: ^4.0.3