From 9a8e9c228bbba4318039318b8c045129c46c721d Mon Sep 17 00:00:00 2001 From: Fabian Freund Date: Wed, 27 Aug 2025 09:31:46 +0200 Subject: [PATCH] update to pub workspaces --- app/pubspec.yaml | 1 + app/pubspec_overrides.yaml | 6 --- melos.yaml | 50 ----------------- .../example/pubspec.yaml | 1 + .../example/pubspec_overrides.yaml | 4 -- .../flutter_mozilla_components/pubspec.yaml | 3 +- .../example/pubspec.yaml | 1 + .../example/pubspec_overrides.yaml | 4 -- packages/simple_intent_receiver/pubspec.yaml | 3 +- pubspec.yaml | 54 ++++++++++++++++++- 10 files changed, 60 insertions(+), 67 deletions(-) delete mode 100644 app/pubspec_overrides.yaml delete mode 100644 melos.yaml delete mode 100644 packages/flutter_mozilla_components/example/pubspec_overrides.yaml delete mode 100644 packages/simple_intent_receiver/example/pubspec_overrides.yaml diff --git a/app/pubspec.yaml b/app/pubspec.yaml index 9c8dca35..4b2ab912 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -1,6 +1,7 @@ name: weblibre description: "The Privacy-Focused & AI-Powered Research Browser" publish_to: 'none' +resolution: workspace version: 0.9.21+25 environment: diff --git a/app/pubspec_overrides.yaml b/app/pubspec_overrides.yaml deleted file mode 100644 index d1cf0013..00000000 --- a/app/pubspec_overrides.yaml +++ /dev/null @@ -1,6 +0,0 @@ -# melos_managed_dependency_overrides: flutter_mozilla_components,simple_intent_receiver -dependency_overrides: - flutter_mozilla_components: - path: ../packages/flutter_mozilla_components - simple_intent_receiver: - path: ../packages/simple_intent_receiver diff --git a/melos.yaml b/melos.yaml deleted file mode 100644 index 75b83f8a..00000000 --- a/melos.yaml +++ /dev/null @@ -1,50 +0,0 @@ -name: weblibre_project - -command: - clean: - hooks: - pre: melos exec -c 1 -- "flutter clean" - -scripts: - upgrade-major-tighten: - run: | - dart pub upgrade --major-versions --tighten - exec: - concurrency: 1 - validate-dependencies: - description: Validates dependcies in the workspace - packageFilters: - noDependsOn: melos - exec: | - dart pub global run dependency_validator - build-watch: - description: Generate and watch files with build_runner in the workspace - packageFilters: - dependsOn: build_runner - exec: | - dart run build_runner watch --delete-conflicting-outputs - build: - description: Generate files with build_runner in the workspace - packageFilters: - dependsOn: build_runner - run: | - dart run build_runner build --delete-conflicting-outputs - exec: - failFast: true - concurrency: 1 - build-pigeons: - description: Running pigeon for files in pigeons directory - exec: | - echo "Running pigeon for files in pigeons directory:" - for file in ./pigeons/*; do - if [ -f "\$file" ]; then - echo "Processing \$file" - flutter pub run pigeon --input "\$file" - fi - done - packageFilters: - dirExists: 'pigeons' - -packages: - - app/ - - packages/** diff --git a/packages/flutter_mozilla_components/example/pubspec.yaml b/packages/flutter_mozilla_components/example/pubspec.yaml index cedf4f14..8302d4ab 100644 --- a/packages/flutter_mozilla_components/example/pubspec.yaml +++ b/packages/flutter_mozilla_components/example/pubspec.yaml @@ -3,6 +3,7 @@ description: "Demonstrates how to use the flutter_mozilla_components plugin." # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. publish_to: 'none' # Remove this line if you wish to publish to pub.dev +resolution: workspace environment: sdk: '>=3.8.0 <4.0.0' diff --git a/packages/flutter_mozilla_components/example/pubspec_overrides.yaml b/packages/flutter_mozilla_components/example/pubspec_overrides.yaml deleted file mode 100644 index cd7ef4bd..00000000 --- a/packages/flutter_mozilla_components/example/pubspec_overrides.yaml +++ /dev/null @@ -1,4 +0,0 @@ -# melos_managed_dependency_overrides: flutter_mozilla_components -dependency_overrides: - flutter_mozilla_components: - path: .. diff --git a/packages/flutter_mozilla_components/pubspec.yaml b/packages/flutter_mozilla_components/pubspec.yaml index cf6a59de..476fbd11 100644 --- a/packages/flutter_mozilla_components/pubspec.yaml +++ b/packages/flutter_mozilla_components/pubspec.yaml @@ -1,7 +1,8 @@ name: flutter_mozilla_components description: "A new Flutter plugin project." version: 0.0.1 -homepage: +publish_to: 'none' +resolution: workspace environment: sdk: '>=3.8.0 <4.0.0' diff --git a/packages/simple_intent_receiver/example/pubspec.yaml b/packages/simple_intent_receiver/example/pubspec.yaml index a1c4c243..f118d8d0 100644 --- a/packages/simple_intent_receiver/example/pubspec.yaml +++ b/packages/simple_intent_receiver/example/pubspec.yaml @@ -3,6 +3,7 @@ description: "Demonstrates how to use the simple_intent_receiver plugin." # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. publish_to: 'none' # Remove this line if you wish to publish to pub.dev +resolution: workspace environment: sdk: ^3.8.0 diff --git a/packages/simple_intent_receiver/example/pubspec_overrides.yaml b/packages/simple_intent_receiver/example/pubspec_overrides.yaml deleted file mode 100644 index d707d84b..00000000 --- a/packages/simple_intent_receiver/example/pubspec_overrides.yaml +++ /dev/null @@ -1,4 +0,0 @@ -# melos_managed_dependency_overrides: simple_intent_receiver -dependency_overrides: - simple_intent_receiver: - path: .. diff --git a/packages/simple_intent_receiver/pubspec.yaml b/packages/simple_intent_receiver/pubspec.yaml index 87dc1ec3..fad0b621 100644 --- a/packages/simple_intent_receiver/pubspec.yaml +++ b/packages/simple_intent_receiver/pubspec.yaml @@ -1,7 +1,8 @@ name: simple_intent_receiver description: "A new Flutter plugin project." version: 0.0.1 -homepage: +publish_to: 'none' +resolution: workspace environment: sdk: ^3.8.0 diff --git a/pubspec.yaml b/pubspec.yaml index 4e5d1920..63f9a322 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,5 +2,57 @@ name: weblibre_project environment: sdk: '>=3.8.0 <4.0.0' +workspace: + - app/ + - packages/flutter_mozilla_components + - packages/simple_intent_receiver dev_dependencies: - melos: ^6.3.2 + melos: ^7.1.0 + +melos: + name: weblibre_project + + command: + clean: + hooks: + pre: melos exec -c 1 -- "flutter clean" + + scripts: + upgrade-major-tighten: + run: | + dart pub upgrade --major-versions --tighten + exec: + concurrency: 1 + validate-dependencies: + description: Validates dependcies in the workspace + packageFilters: + noDependsOn: melos + exec: | + dart pub global run dependency_validator + build-watch: + description: Generate and watch files with build_runner in the workspace + packageFilters: + dependsOn: build_runner + exec: | + dart run build_runner watch --delete-conflicting-outputs + build: + description: Generate files with build_runner in the workspace + packageFilters: + dependsOn: build_runner + run: | + dart run build_runner build --delete-conflicting-outputs + exec: + failFast: true + concurrency: 1 + build-pigeons: + description: Running pigeon for files in pigeons directory + exec: | + echo "Running pigeon for files in pigeons directory:" + for file in ./pigeons/*; do + if [ -f "\$file" ]; then + echo "Processing \$file" + flutter pub run pigeon --input "\$file" + fi + done + packageFilters: + dirExists: 'pigeons'