diff --git a/dart/.gitignore b/dart/.gitignore index 5919bf76..d8d06263 100644 --- a/dart/.gitignore +++ b/dart/.gitignore @@ -4,3 +4,6 @@ .idea *.iml + +# https://melos.invertase.dev/getting-started#configure-the-workspace +pubspec_overrides.yaml diff --git a/dart/frontend/pubspec.lock b/dart/frontend/pubspec.lock index dd977108..d85d3e25 100644 --- a/dart/frontend/pubspec.lock +++ b/dart/frontend/pubspec.lock @@ -807,5 +807,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.2.6 <4.0.0" + dart: ">=3.2.0 <4.0.0" flutter: ">=3.7.0" diff --git a/dart/frontend/pubspec_overrides.yaml b/dart/frontend/pubspec_overrides.yaml new file mode 100644 index 00000000..a25737a2 --- /dev/null +++ b/dart/frontend/pubspec_overrides.yaml @@ -0,0 +1,6 @@ +# melos_managed_dependency_overrides: shrapnel_common,shrapnel_test_lib +dependency_overrides: + shrapnel_common: + path: ../shrapnel_common + shrapnel_test_lib: + path: ../shrapnel_test_lib diff --git a/dart/shrapnel_common/pubspec.yaml b/dart/shrapnel_common/pubspec.yaml index 60f24e80..2209c902 100644 --- a/dart/shrapnel_common/pubspec.yaml +++ b/dart/shrapnel_common/pubspec.yaml @@ -10,7 +10,7 @@ dependencies: esp_softap_provisioning: git: url: https://github.com/ShrapnelDSP/esp_softap_provisioning.git - ref: no-flutter + ref: shrapnel freezed_annotation: ^2.4.4 logging: ^1.2.0 diff --git a/dart/shrapnel_test_lib/pubspec.yaml b/dart/shrapnel_test_lib/pubspec.yaml index 9239c634..ca0b019c 100644 --- a/dart/shrapnel_test_lib/pubspec.yaml +++ b/dart/shrapnel_test_lib/pubspec.yaml @@ -11,7 +11,7 @@ dependencies: esp_softap_provisioning: git: url: https://github.com/ShrapnelDSP/esp_softap_provisioning.git - ref: no-flutter + ref: shrapnel flutter_libserialport: ^0.4.0 logging: ^1.2.0 path: ^1.8.0 diff --git a/dart/shrapnel_test_tool/pubspec.lock b/dart/shrapnel_test_tool/pubspec.lock index 4a4d05c4..02eecc07 100644 --- a/dart/shrapnel_test_tool/pubspec.lock +++ b/dart/shrapnel_test_tool/pubspec.lock @@ -101,8 +101,8 @@ packages: dependency: transitive description: path: "." - ref: no-flutter - resolved-ref: "9edee663e053efb8668dd591b09a0c989b0a21c6" + ref: shrapnel + resolved-ref: "8ea4d4b87d31f19a6a14d10193df2b8d44204cf2" url: "https://github.com/ShrapnelDSP/esp_softap_provisioning.git" source: git version: "1.0.1" @@ -368,7 +368,7 @@ packages: source: hosted version: "1.0.4" shrapnel_common: - dependency: transitive + dependency: "direct overridden" description: path: "../shrapnel_common" relative: true