From cb028ddf4523db5900f362ec310a04ec4bf5000d Mon Sep 17 00:00:00 2001 From: Parker Lougheed Date: Thu, 13 Jun 2024 00:56:41 -0500 Subject: [PATCH 1/2] Update and tighten dependency constraints --- pkgs/dart_services/pubspec.yaml | 24 +++++++++---------- pkgs/dart_services/test/server_test.dart | 6 +---- .../dependencies/pub_dependencies_beta.json | 10 ++++---- .../dependencies/pub_dependencies_main.json | 23 +++++++++--------- .../dependencies/pub_dependencies_stable.json | 17 +++++++------ pkgs/dartpad_shared/pubspec.yaml | 8 +++---- pkgs/dartpad_ui/pubspec.yaml | 12 +++++----- pkgs/samples/pubspec.yaml | 12 +++++----- 8 files changed, 53 insertions(+), 59 deletions(-) diff --git a/pkgs/dart_services/pubspec.yaml b/pkgs/dart_services/pubspec.yaml index 7a3109de7..d67718fa4 100644 --- a/pkgs/dart_services/pubspec.yaml +++ b/pkgs/dart_services/pubspec.yaml @@ -3,20 +3,20 @@ description: The backend service for DartPad. publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.4.0 dependencies: analysis_server_lib: ^0.2.5 - analyzer: ^6.4.1 - args: ^2.4.2 + analyzer: ^6.4.0 + args: ^2.5.0 bazel_worker: ^1.1.1 - dartpad_shared: any + dartpad_shared: ^0.0.0 encrypt: ^5.0.3 - google_generative_ai: ^0.4.0 + google_generative_ai: ^0.4.3 http: ^1.2.1 - json_annotation: any + json_annotation: ^4.9.0 logging: ^1.2.0 - meta: ^1.13.0 + meta: ^1.15.0 path: ^1.9.0 resp_client: ^1.2.0 shelf: ^1.4.1 @@ -25,15 +25,15 @@ dependencies: yaml: ^3.1.2 dev_dependencies: - build_runner: ^2.4.9 + build_runner: ^2.4.11 collection: ^1.18.0 - dart_flutter_team_lints: ^3.0.0 + dart_flutter_team_lints: ^3.1.0 grinder: ^0.9.5 - json_serializable: any + json_serializable: ^6.8.0 package_config: ^2.1.0 shelf_router_generator: ^1.1.0 - synchronized: ^3.1.0 - test: ^1.25.2 + synchronized: ^3.1.0+1 + test: ^1.25.7 test_descriptor: ^2.0.1 dependency_overrides: diff --git a/pkgs/dart_services/test/server_test.dart b/pkgs/dart_services/test/server_test.dart index b6c05faaf..a3cc17c5b 100644 --- a/pkgs/dart_services/test/server_test.dart +++ b/pkgs/dart_services/test/server_test.dart @@ -275,11 +275,7 @@ void main() { expect( result.dartdoc!.toLowerCase(), - anyOf( - // Support both pre and post Dart 3.3.0. - contains('prints a string representation'), - contains('prints an object to the console'), - ), + contains('prints an object to the console'), ); expect(result.containingLibraryName, 'dart:core'); expect(result.elementDescription, isNotNull); diff --git a/pkgs/dart_services/tool/dependencies/pub_dependencies_beta.json b/pkgs/dart_services/tool/dependencies/pub_dependencies_beta.json index ad4d65ea7..f91d2d3ca 100644 --- a/pkgs/dart_services/tool/dependencies/pub_dependencies_beta.json +++ b/pkgs/dart_services/tool/dependencies/pub_dependencies_beta.json @@ -32,10 +32,10 @@ "flame_splash_screen": "0.3.0", "flame_tiled": "1.20.2", "flutter_adaptive_scaffold": "0.1.11", - "flutter_bloc": "8.1.5", + "flutter_bloc": "8.1.6", "flutter_hooks": "0.20.5", - "flutter_map": "7.0.0", - "flutter_markdown": "0.7.1", + "flutter_map": "7.0.1", + "flutter_markdown": "0.7.2", "flutter_riverpod": "2.5.1", "flutter_svg": "2.0.10+1", "forge2d": "0.13.0", @@ -80,7 +80,7 @@ "path_provider_platform_interface": "2.1.2", "path_provider_windows": "2.2.1", "petitparser": "6.0.2", - "platform": "3.1.4", + "platform": "3.1.5", "plugin_platform_interface": "2.1.8", "polylabel": "1.0.1", "pool": "1.5.1", @@ -130,7 +130,7 @@ "vector_graphics_codec": "1.1.11+1", "vector_graphics_compiler": "1.1.11+1", "vector_math": "2.1.4", - "video_player": "2.8.6", + "video_player": "2.8.7", "video_player_android": "2.5.0", "video_player_avfoundation": "2.6.1", "video_player_platform_interface": "6.2.2", diff --git a/pkgs/dart_services/tool/dependencies/pub_dependencies_main.json b/pkgs/dart_services/tool/dependencies/pub_dependencies_main.json index 4bf116e24..cc8e14879 100644 --- a/pkgs/dart_services/tool/dependencies/pub_dependencies_main.json +++ b/pkgs/dart_services/tool/dependencies/pub_dependencies_main.json @@ -32,11 +32,10 @@ "flame_splash_screen": "0.3.0", "flame_tiled": "1.20.2", "flutter_adaptive_scaffold": "0.1.11", - "flutter_bloc": "8.1.5", + "flutter_bloc": "8.1.6", "flutter_hooks": "0.20.5", - "flutter_map": "7.0.0", - "flutter_markdown": "0.7.1", - "flutter_plugin_android_lifecycle": "2.0.20", + "flutter_map": "7.0.1", + "flutter_markdown": "0.7.2", "flutter_riverpod": "2.5.1", "flutter_svg": "2.0.10+1", "forge2d": "0.13.0", @@ -44,7 +43,7 @@ "glob": "2.1.2", "go_router": "14.1.4", "google_fonts": "6.2.1", - "google_generative_ai": "0.4.2", + "google_generative_ai": "0.4.3", "hooks_riverpod": "2.5.1", "html": "0.15.4", "http": "1.2.1", @@ -81,7 +80,7 @@ "path_provider_platform_interface": "2.1.2", "path_provider_windows": "2.2.1", "petitparser": "6.0.2", - "platform": "3.1.4", + "platform": "3.1.5", "plugin_platform_interface": "2.1.8", "polylabel": "1.0.1", "pool": "1.5.1", @@ -112,14 +111,14 @@ "stream_channel": "2.1.2", "string_scanner": "1.2.0", "term_glyph": "1.2.1", - "test": "1.25.5", - "test_api": "0.7.1", - "test_core": "0.6.2", + "test": "1.25.7", + "test_api": "0.7.2", + "test_core": "0.6.4", "tiled": "0.10.2", "timezone": "0.9.3", "typed_data": "1.3.2", "unicode": "0.3.1", - "url_launcher": "6.2.6", + "url_launcher": "6.3.0", "url_launcher_android": "6.3.3", "url_launcher_ios": "6.3.0", "url_launcher_linux": "3.1.1", @@ -131,8 +130,8 @@ "vector_graphics_codec": "1.1.11+1", "vector_graphics_compiler": "1.1.11+1", "vector_math": "2.1.4", - "video_player": "2.8.6", - "video_player_android": "2.4.16", + "video_player": "2.8.7", + "video_player_android": "2.5.0", "video_player_avfoundation": "2.6.1", "video_player_platform_interface": "6.2.2", "video_player_web": "2.3.1", diff --git a/pkgs/dart_services/tool/dependencies/pub_dependencies_stable.json b/pkgs/dart_services/tool/dependencies/pub_dependencies_stable.json index e3147440a..7f6f3d3bb 100644 --- a/pkgs/dart_services/tool/dependencies/pub_dependencies_stable.json +++ b/pkgs/dart_services/tool/dependencies/pub_dependencies_stable.json @@ -32,11 +32,10 @@ "flame_splash_screen": "0.3.0", "flame_tiled": "1.20.2", "flutter_adaptive_scaffold": "0.1.11", - "flutter_bloc": "8.1.5", + "flutter_bloc": "8.1.6", "flutter_hooks": "0.20.5", - "flutter_map": "7.0.0", - "flutter_markdown": "0.7.1", - "flutter_plugin_android_lifecycle": "2.0.20", + "flutter_map": "7.0.1", + "flutter_markdown": "0.7.2", "flutter_riverpod": "2.5.1", "flutter_svg": "2.0.10+1", "forge2d": "0.13.0", @@ -44,7 +43,7 @@ "glob": "2.1.2", "go_router": "14.1.4", "google_fonts": "6.2.1", - "google_generative_ai": "0.4.2", + "google_generative_ai": "0.4.3", "hooks_riverpod": "2.5.1", "html": "0.15.4", "http": "1.2.1", @@ -80,7 +79,7 @@ "path_provider_platform_interface": "2.1.2", "path_provider_windows": "2.2.1", "petitparser": "6.0.2", - "platform": "3.1.4", + "platform": "3.1.5", "plugin_platform_interface": "2.1.8", "polylabel": "1.0.1", "pool": "1.5.1", @@ -118,7 +117,7 @@ "timezone": "0.9.3", "typed_data": "1.3.2", "unicode": "0.3.1", - "url_launcher": "6.2.6", + "url_launcher": "6.3.0", "url_launcher_android": "6.3.3", "url_launcher_ios": "6.3.0", "url_launcher_linux": "3.1.1", @@ -130,8 +129,8 @@ "vector_graphics_codec": "1.1.11+1", "vector_graphics_compiler": "1.1.11+1", "vector_math": "2.1.4", - "video_player": "2.8.6", - "video_player_android": "2.4.16", + "video_player": "2.8.7", + "video_player_android": "2.5.0", "video_player_avfoundation": "2.6.1", "video_player_platform_interface": "6.2.2", "video_player_web": "2.3.1", diff --git a/pkgs/dartpad_shared/pubspec.yaml b/pkgs/dartpad_shared/pubspec.yaml index 6dee4481a..cca44fc81 100644 --- a/pkgs/dartpad_shared/pubspec.yaml +++ b/pkgs/dartpad_shared/pubspec.yaml @@ -3,14 +3,14 @@ description: Shared code between the DartPad frontend and backend. publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.4.0 dependencies: http: ^1.2.1 json_annotation: ^4.9.0 - meta: ^1.14.0 + meta: ^1.15.0 dev_dependencies: - build_runner: ^2.4.9 - dart_flutter_team_lints: ^3.0.0 + build_runner: ^2.4.11 + dart_flutter_team_lints: ^3.1.0 json_serializable: ^6.8.0 diff --git a/pkgs/dartpad_ui/pubspec.yaml b/pkgs/dartpad_ui/pubspec.yaml index 675ece2a1..04f3a92f8 100644 --- a/pkgs/dartpad_ui/pubspec.yaml +++ b/pkgs/dartpad_ui/pubspec.yaml @@ -3,24 +3,24 @@ description: The front-end UI of DartPad. publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.4.0 dependencies: collection: any dartpad_shared: any flutter: sdk: flutter - flutter_markdown: ^0.7.1 + flutter_markdown: ^0.7.2 flutter_web_plugins: sdk: flutter fluttering_phrases: ^1.0.0 go_router: ^14.1.4 - google_fonts: ^6.2.0 + google_fonts: ^6.2.1 http: ^1.2.1 json_annotation: ^4.9.0 - pointer_interceptor: ^0.10.0 + pointer_interceptor: ^0.10.1 provider: ^6.1.2 - split_view: ^3.2.0 + split_view: ^3.2.1 url_launcher: ^6.3.0 vtable: ^0.4.0 web: ^0.5.1 @@ -29,7 +29,7 @@ dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^4.0.0 - test: any + test: ^1.25.7 flutter: uses-material-design: true diff --git a/pkgs/samples/pubspec.yaml b/pkgs/samples/pubspec.yaml index 10af3285a..fb28befa7 100644 --- a/pkgs/samples/pubspec.yaml +++ b/pkgs/samples/pubspec.yaml @@ -3,19 +3,19 @@ description: Sample code snippets for DartPad. publish_to: none environment: - sdk: ^3.3.0 + sdk: ^3.4.0 dependencies: - flame: ^1.17.0 + flame: ^1.18.0 flutter: sdk: flutter - flutter_markdown: ^0.7.1 - google_generative_ai: ^0.4.2 + flutter_markdown: ^0.7.2 + google_generative_ai: ^0.4.3 url_launcher: ^6.3.0 dev_dependencies: - args: ^2.4.0 - flutter_lints: ^3.0.0 + args: ^2.5.0 + flutter_lints: ^4.0.2 path: ^1.9.0 flutter: From 3278aacc501cacc5888e0e1aff26db1514bfc428 Mon Sep 17 00:00:00 2001 From: Parker Lougheed Date: Thu, 13 Jun 2024 01:03:23 -0500 Subject: [PATCH 2/2] Fix flutter_lints constraint --- pkgs/samples/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/samples/pubspec.yaml b/pkgs/samples/pubspec.yaml index fb28befa7..43f17871d 100644 --- a/pkgs/samples/pubspec.yaml +++ b/pkgs/samples/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: dev_dependencies: args: ^2.5.0 - flutter_lints: ^4.0.2 + flutter_lints: ^4.0.0 path: ^1.9.0 flutter: