From f2c249de1f6516b02962b50322256e7a9c642973 Mon Sep 17 00:00:00 2001 From: Craig Labenz Date: Tue, 10 Sep 2024 08:43:46 -0700 Subject: [PATCH 1/3] adds pkg:mix dependency --- pkgs/dart_services/pubspec.yaml | 1 + .../dart_services/tool/dependencies/pub_dependencies_beta.json | 3 ++- .../dart_services/tool/dependencies/pub_dependencies_main.json | 3 ++- .../tool/dependencies/pub_dependencies_stable.json | 3 ++- pkgs/samples/pubspec.yaml | 1 + 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/dart_services/pubspec.yaml b/pkgs/dart_services/pubspec.yaml index dcf39327f..f9e066862 100644 --- a/pkgs/dart_services/pubspec.yaml +++ b/pkgs/dart_services/pubspec.yaml @@ -17,6 +17,7 @@ dependencies: json_annotation: ^4.9.0 logging: ^1.2.0 meta: ^1.15.0 + mix: ^1.4.6 path: ^1.9.0 resp_client: ^1.2.0 shelf: ^1.4.1 diff --git a/pkgs/dart_services/tool/dependencies/pub_dependencies_beta.json b/pkgs/dart_services/tool/dependencies/pub_dependencies_beta.json index 27a21acb8..5c9dbc340 100644 --- a/pkgs/dart_services/tool/dependencies/pub_dependencies_beta.json +++ b/pkgs/dart_services/tool/dependencies/pub_dependencies_beta.json @@ -67,6 +67,7 @@ "meta": "1.15.0", "mgrs_dart": "2.0.0", "mime": "1.0.6", + "mix": "1.4.6", "nested": "1.0.0", "node_preamble": "2.0.2", "ordered_set": "6.0.1", @@ -149,4 +150,4 @@ "xml": "6.5.0", "yaml": "3.1.2", "yaml_edit": "2.2.1" -} +} \ No newline at end of file diff --git a/pkgs/dart_services/tool/dependencies/pub_dependencies_main.json b/pkgs/dart_services/tool/dependencies/pub_dependencies_main.json index 2c1d559ac..2a7525b40 100644 --- a/pkgs/dart_services/tool/dependencies/pub_dependencies_main.json +++ b/pkgs/dart_services/tool/dependencies/pub_dependencies_main.json @@ -67,6 +67,7 @@ "meta": "1.15.0", "mgrs_dart": "2.0.0", "mime": "1.0.6", + "mix": "1.4.6", "nested": "1.0.0", "node_preamble": "2.0.2", "ordered_set": "6.0.1", @@ -149,4 +150,4 @@ "xml": "6.5.0", "yaml": "3.1.2", "yaml_edit": "2.2.1" -} +} \ No newline at end of file diff --git a/pkgs/dart_services/tool/dependencies/pub_dependencies_stable.json b/pkgs/dart_services/tool/dependencies/pub_dependencies_stable.json index c282272aa..c3c73f406 100644 --- a/pkgs/dart_services/tool/dependencies/pub_dependencies_stable.json +++ b/pkgs/dart_services/tool/dependencies/pub_dependencies_stable.json @@ -67,6 +67,7 @@ "meta": "1.15.0", "mgrs_dart": "2.0.0", "mime": "1.0.6", + "mix": "1.4.6", "nested": "1.0.0", "node_preamble": "2.0.2", "ordered_set": "6.0.1", @@ -149,4 +150,4 @@ "xml": "6.5.0", "yaml": "3.1.2", "yaml_edit": "2.2.1" -} +} \ No newline at end of file diff --git a/pkgs/samples/pubspec.yaml b/pkgs/samples/pubspec.yaml index cb3f6d6f1..cb66cf083 100644 --- a/pkgs/samples/pubspec.yaml +++ b/pkgs/samples/pubspec.yaml @@ -11,6 +11,7 @@ dependencies: sdk: flutter flutter_markdown: ^0.7.3 google_generative_ai: ^0.4.5 + mix: ^1.4.6 url_launcher: ^6.3.0 dev_dependencies: From f3829eb8da16050530b3b9979ae21105090b103a Mon Sep 17 00:00:00 2001 From: Parker Lougheed Date: Tue, 10 Sep 2024 16:23:44 -0500 Subject: [PATCH 2/3] Undo unnecessary changes --- pkgs/dart_services/pubspec.yaml | 1 - .../dart_services/tool/dependencies/pub_dependencies_beta.json | 3 +-- .../dart_services/tool/dependencies/pub_dependencies_main.json | 3 +-- .../tool/dependencies/pub_dependencies_stable.json | 3 +-- pkgs/samples/pubspec.yaml | 1 - 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/dart_services/pubspec.yaml b/pkgs/dart_services/pubspec.yaml index f9e066862..dcf39327f 100644 --- a/pkgs/dart_services/pubspec.yaml +++ b/pkgs/dart_services/pubspec.yaml @@ -17,7 +17,6 @@ dependencies: json_annotation: ^4.9.0 logging: ^1.2.0 meta: ^1.15.0 - mix: ^1.4.6 path: ^1.9.0 resp_client: ^1.2.0 shelf: ^1.4.1 diff --git a/pkgs/dart_services/tool/dependencies/pub_dependencies_beta.json b/pkgs/dart_services/tool/dependencies/pub_dependencies_beta.json index 5c9dbc340..27a21acb8 100644 --- a/pkgs/dart_services/tool/dependencies/pub_dependencies_beta.json +++ b/pkgs/dart_services/tool/dependencies/pub_dependencies_beta.json @@ -67,7 +67,6 @@ "meta": "1.15.0", "mgrs_dart": "2.0.0", "mime": "1.0.6", - "mix": "1.4.6", "nested": "1.0.0", "node_preamble": "2.0.2", "ordered_set": "6.0.1", @@ -150,4 +149,4 @@ "xml": "6.5.0", "yaml": "3.1.2", "yaml_edit": "2.2.1" -} \ No newline at end of file +} diff --git a/pkgs/dart_services/tool/dependencies/pub_dependencies_main.json b/pkgs/dart_services/tool/dependencies/pub_dependencies_main.json index 2a7525b40..2c1d559ac 100644 --- a/pkgs/dart_services/tool/dependencies/pub_dependencies_main.json +++ b/pkgs/dart_services/tool/dependencies/pub_dependencies_main.json @@ -67,7 +67,6 @@ "meta": "1.15.0", "mgrs_dart": "2.0.0", "mime": "1.0.6", - "mix": "1.4.6", "nested": "1.0.0", "node_preamble": "2.0.2", "ordered_set": "6.0.1", @@ -150,4 +149,4 @@ "xml": "6.5.0", "yaml": "3.1.2", "yaml_edit": "2.2.1" -} \ No newline at end of file +} diff --git a/pkgs/dart_services/tool/dependencies/pub_dependencies_stable.json b/pkgs/dart_services/tool/dependencies/pub_dependencies_stable.json index c3c73f406..c282272aa 100644 --- a/pkgs/dart_services/tool/dependencies/pub_dependencies_stable.json +++ b/pkgs/dart_services/tool/dependencies/pub_dependencies_stable.json @@ -67,7 +67,6 @@ "meta": "1.15.0", "mgrs_dart": "2.0.0", "mime": "1.0.6", - "mix": "1.4.6", "nested": "1.0.0", "node_preamble": "2.0.2", "ordered_set": "6.0.1", @@ -150,4 +149,4 @@ "xml": "6.5.0", "yaml": "3.1.2", "yaml_edit": "2.2.1" -} \ No newline at end of file +} diff --git a/pkgs/samples/pubspec.yaml b/pkgs/samples/pubspec.yaml index cb66cf083..cb3f6d6f1 100644 --- a/pkgs/samples/pubspec.yaml +++ b/pkgs/samples/pubspec.yaml @@ -11,7 +11,6 @@ dependencies: sdk: flutter flutter_markdown: ^0.7.3 google_generative_ai: ^0.4.5 - mix: ^1.4.6 url_launcher: ^6.3.0 dev_dependencies: From a2fd60083c83a94e0b8bdacbd36dbe4ef1db9753 Mon Sep 17 00:00:00 2001 From: Parker Lougheed Date: Tue, 10 Sep 2024 16:34:29 -0500 Subject: [PATCH 3/3] Add mix to template dependencies and regenerate deps files --- .../lib/src/project_templates.dart | 1 + .../dependencies/pub_dependencies_beta.json | 18 +++++++------- .../dependencies/pub_dependencies_main.json | 24 ++++++++++--------- .../dependencies/pub_dependencies_stable.json | 18 +++++++------- 4 files changed, 34 insertions(+), 27 deletions(-) diff --git a/pkgs/dart_services/lib/src/project_templates.dart b/pkgs/dart_services/lib/src/project_templates.dart index d03be1d0b..15b228a56 100644 --- a/pkgs/dart_services/lib/src/project_templates.dart +++ b/pkgs/dart_services/lib/src/project_templates.dart @@ -64,6 +64,7 @@ const Set supportedFlutterPackages = { 'google_fonts', 'google_generative_ai', 'hooks_riverpod', + 'mix', 'provider', 'shared_preferences', 'url_launcher', diff --git a/pkgs/dart_services/tool/dependencies/pub_dependencies_beta.json b/pkgs/dart_services/tool/dependencies/pub_dependencies_beta.json index 27a21acb8..95e67eb56 100644 --- a/pkgs/dart_services/tool/dependencies/pub_dependencies_beta.json +++ b/pkgs/dart_services/tool/dependencies/pub_dependencies_beta.json @@ -31,7 +31,7 @@ "flame_forge2d": "0.18.2", "flame_splash_screen": "0.3.1", "flame_tiled": "1.20.3", - "flutter_adaptive_scaffold": "0.2.3", + "flutter_adaptive_scaffold": "0.2.6", "flutter_bloc": "8.1.6", "flutter_hooks": "0.20.5", "flutter_map": "7.0.2", @@ -43,7 +43,7 @@ "glob": "2.1.2", "go_router": "14.2.7", "google_fonts": "6.2.1", - "google_generative_ai": "0.4.5", + "google_generative_ai": "0.4.6", "hooks_riverpod": "2.5.2", "html": "0.15.4", "http": "1.2.2", @@ -67,9 +67,11 @@ "meta": "1.15.0", "mgrs_dart": "2.0.0", "mime": "1.0.6", + "mix": "1.4.6", + "mix_annotations": "0.3.0", "nested": "1.0.0", "node_preamble": "2.0.2", - "ordered_set": "6.0.1", + "ordered_set": "6.1.0", "package_config": "2.1.0", "path": "1.9.0", "path_parsing": "1.0.1", @@ -101,11 +103,11 @@ "shared_preferences_windows": "2.4.1", "shelf": "1.4.2", "shelf_packages_handler": "3.0.2", - "shelf_static": "1.1.2", + "shelf_static": "1.1.3", "shelf_web_socket": "2.0.0", - "signals": "5.4.0", - "signals_core": "5.4.0", - "signals_flutter": "5.4.0", + "signals": "5.5.0", + "signals_core": "5.5.0", + "signals_flutter": "5.5.0", "source_map_stack_trace": "2.1.2", "source_maps": "0.10.12", "source_span": "1.10.0", @@ -134,7 +136,7 @@ "vector_graphics_compiler": "1.1.11+1", "vector_math": "2.1.4", "video_player": "2.9.1", - "video_player_android": "2.7.2", + "video_player_android": "2.7.3", "video_player_avfoundation": "2.6.1", "video_player_platform_interface": "6.2.2", "video_player_web": "2.3.2", diff --git a/pkgs/dart_services/tool/dependencies/pub_dependencies_main.json b/pkgs/dart_services/tool/dependencies/pub_dependencies_main.json index 2c1d559ac..4fbe81bed 100644 --- a/pkgs/dart_services/tool/dependencies/pub_dependencies_main.json +++ b/pkgs/dart_services/tool/dependencies/pub_dependencies_main.json @@ -1,6 +1,6 @@ { - "_fe_analyzer_shared": "73.0.0", - "analyzer": "6.8.0", + "_fe_analyzer_shared": "74.0.0", + "analyzer": "6.9.0", "animations": "2.0.11", "archive": "3.6.1", "args": "2.5.0", @@ -31,7 +31,7 @@ "flame_forge2d": "0.18.2", "flame_splash_screen": "0.3.1", "flame_tiled": "1.20.3", - "flutter_adaptive_scaffold": "0.2.3", + "flutter_adaptive_scaffold": "0.2.6", "flutter_bloc": "8.1.6", "flutter_hooks": "0.20.5", "flutter_map": "7.0.2", @@ -43,7 +43,7 @@ "glob": "2.1.2", "go_router": "14.2.7", "google_fonts": "6.2.1", - "google_generative_ai": "0.4.5", + "google_generative_ai": "0.4.6", "hooks_riverpod": "2.5.2", "html": "0.15.4", "http": "1.2.2", @@ -60,16 +60,18 @@ "lists": "1.0.1", "logger": "2.4.0", "logging": "1.2.0", - "macros": "0.1.2-main.4", + "macros": "0.1.3-main.0", "markdown": "7.2.2", "matcher": "0.12.16+1", "material_color_utilities": "0.11.1", "meta": "1.15.0", "mgrs_dart": "2.0.0", "mime": "1.0.6", + "mix": "1.4.6", + "mix_annotations": "0.3.0", "nested": "1.0.0", "node_preamble": "2.0.2", - "ordered_set": "6.0.1", + "ordered_set": "6.1.0", "package_config": "2.1.0", "path": "1.9.0", "path_parsing": "1.0.1", @@ -101,11 +103,11 @@ "shared_preferences_windows": "2.4.1", "shelf": "1.4.2", "shelf_packages_handler": "3.0.2", - "shelf_static": "1.1.2", + "shelf_static": "1.1.3", "shelf_web_socket": "2.0.0", - "signals": "5.4.0", - "signals_core": "5.4.0", - "signals_flutter": "5.4.0", + "signals": "5.5.0", + "signals_core": "5.5.0", + "signals_flutter": "5.5.0", "source_map_stack_trace": "2.1.2", "source_maps": "0.10.12", "source_span": "1.10.0", @@ -134,7 +136,7 @@ "vector_graphics_compiler": "1.1.11+1", "vector_math": "2.1.4", "video_player": "2.9.1", - "video_player_android": "2.7.2", + "video_player_android": "2.7.3", "video_player_avfoundation": "2.6.1", "video_player_platform_interface": "6.2.2", "video_player_web": "2.3.2", diff --git a/pkgs/dart_services/tool/dependencies/pub_dependencies_stable.json b/pkgs/dart_services/tool/dependencies/pub_dependencies_stable.json index c282272aa..bd4bd1ed8 100644 --- a/pkgs/dart_services/tool/dependencies/pub_dependencies_stable.json +++ b/pkgs/dart_services/tool/dependencies/pub_dependencies_stable.json @@ -31,7 +31,7 @@ "flame_forge2d": "0.18.2", "flame_splash_screen": "0.3.1", "flame_tiled": "1.20.3", - "flutter_adaptive_scaffold": "0.2.3", + "flutter_adaptive_scaffold": "0.2.6", "flutter_bloc": "8.1.6", "flutter_hooks": "0.20.5", "flutter_map": "7.0.2", @@ -43,7 +43,7 @@ "glob": "2.1.2", "go_router": "14.2.7", "google_fonts": "6.2.1", - "google_generative_ai": "0.4.5", + "google_generative_ai": "0.4.6", "hooks_riverpod": "2.5.2", "html": "0.15.4", "http": "1.2.2", @@ -67,9 +67,11 @@ "meta": "1.15.0", "mgrs_dart": "2.0.0", "mime": "1.0.6", + "mix": "1.4.6", + "mix_annotations": "0.3.0", "nested": "1.0.0", "node_preamble": "2.0.2", - "ordered_set": "6.0.1", + "ordered_set": "6.1.0", "package_config": "2.1.0", "path": "1.9.0", "path_parsing": "1.0.1", @@ -101,11 +103,11 @@ "shared_preferences_windows": "2.4.1", "shelf": "1.4.1", "shelf_packages_handler": "3.0.2", - "shelf_static": "1.1.2", + "shelf_static": "1.1.3", "shelf_web_socket": "2.0.0", - "signals": "5.4.0", - "signals_core": "5.4.0", - "signals_flutter": "5.4.0", + "signals": "5.5.0", + "signals_core": "5.5.0", + "signals_flutter": "5.5.0", "source_map_stack_trace": "2.1.2", "source_maps": "0.10.12", "source_span": "1.10.0", @@ -134,7 +136,7 @@ "vector_graphics_compiler": "1.1.11+1", "vector_math": "2.1.4", "video_player": "2.9.1", - "video_player_android": "2.7.2", + "video_player_android": "2.7.3", "video_player_avfoundation": "2.6.1", "video_player_platform_interface": "6.2.2", "video_player_web": "2.3.2",