diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index df4736a9..0a60def1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,8 +22,7 @@ jobs: channel: - master pub: - # TODO - uncomment this after the SDK bumps its dependencies - # - get + - get - upgrade steps: @@ -36,16 +35,16 @@ jobs: - name: Add pub cache bin to PATH run: echo "$HOME/.pub-cache/bin" >> $GITHUB_PATH - - name: Add pub cache to PATH - run: echo "PUB_CACHE="$HOME/.pub-cache"" >> $GITHUB_ENV - - - name: Add pubspec_overrides to the analyzer_plugin starter - run: "echo \"dependency_overrides:\n custom_lint:\n path: ${{github.workspace}}/packages/custom_lint\" > packages/custom_lint/tools/analyzer_plugin/pubspec_overrides.yaml" + - name: Add pub cache to env + run: echo "PUB_CACHE=\"$HOME/.pub-cache\"" >> $GITHUB_ENV - run: dart pub global activate melos - name: Install dependencies - run: melos exec -- "dart pub ${{ matrix.pub }}" + run: | + dart pub ${{ matrix.pub }} + cd packages/custom_lint/example/example_lint/ dart pub ${{ matrix.pub }} + cd ../../../custom_lint_builder/example/example_lint/ dart pub ${{ matrix.pub }} - name: Check format run: dart format --set-exit-if-changed . diff --git a/melos.yaml b/melos.yaml deleted file mode 100644 index b087ccfa..00000000 --- a/melos.yaml +++ /dev/null @@ -1,6 +0,0 @@ -name: custom_lint_workspace - -packages: - - packages/custom_lint* - - packages/custom_lint*/example** - - packages/lint_visitor_generator diff --git a/packages/custom_lint/example/example_lint/pubspec.yaml b/packages/custom_lint/example/example_lint/pubspec.yaml index 081bec23..162a7003 100644 --- a/packages/custom_lint/example/example_lint/pubspec.yaml +++ b/packages/custom_lint/example/example_lint/pubspec.yaml @@ -2,7 +2,7 @@ name: custom_lint_example_lint publish_to: none environment: - sdk: '>=3.0.0 <4.0.0' + sdk: ">=3.5.0 <4.0.0" dependencies: analyzer: ^7.5.0 diff --git a/packages/custom_lint/example/example_lint/pubspec_overrides.yaml b/packages/custom_lint/example/example_lint/pubspec_overrides.yaml deleted file mode 100644 index dc7d23ca..00000000 --- a/packages/custom_lint/example/example_lint/pubspec_overrides.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# melos_managed_dependency_overrides: custom_lint,custom_lint_builder,custom_lint_core,custom_lint_visitor -dependency_overrides: - custom_lint: - path: ../.. - custom_lint_builder: - path: ../../../custom_lint_builder - custom_lint_core: - path: ../../../custom_lint_core diff --git a/packages/custom_lint/example/pubspec.yaml b/packages/custom_lint/example/pubspec.yaml index 47fac126..8458aa4d 100644 --- a/packages/custom_lint/example/pubspec.yaml +++ b/packages/custom_lint/example/pubspec.yaml @@ -2,7 +2,9 @@ name: custom_lint_example_app publish_to: none environment: - sdk: '>=3.0.0 <4.0.0' + sdk: ">=3.5.0 <4.0.0" + +resolution: workspace dependencies: riverpod: ^2.0.0 diff --git a/packages/custom_lint/example/pubspec_overrides.yaml b/packages/custom_lint/example/pubspec_overrides.yaml deleted file mode 100644 index 53aa5353..00000000 --- a/packages/custom_lint/example/pubspec_overrides.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# melos_managed_dependency_overrides: custom_lint,custom_lint_builder,custom_lint_core,custom_lint_example_lint,custom_lint_visitor -dependency_overrides: - custom_lint: - path: .. - custom_lint_builder: - path: ../../custom_lint_builder - custom_lint_core: - path: ../../custom_lint_core - custom_lint_example_lint: - path: example_lint diff --git a/packages/custom_lint/pubspec.yaml b/packages/custom_lint/pubspec.yaml index ab79f28c..40fc7b71 100644 --- a/packages/custom_lint/pubspec.yaml +++ b/packages/custom_lint/pubspec.yaml @@ -5,7 +5,9 @@ repository: https://github.com/invertase/dart_custom_lint issue_tracker: https://github.com/invertase/dart_custom_lint/issues environment: - sdk: ">=3.0.0 <4.0.0" + sdk: ">=3.5.0 <4.0.0" + +resolution: workspace dependencies: analyzer: ^7.5.0 diff --git a/packages/custom_lint/pubspec_overrides.yaml b/packages/custom_lint/pubspec_overrides.yaml deleted file mode 100644 index e5ecc242..00000000 --- a/packages/custom_lint/pubspec_overrides.yaml +++ /dev/null @@ -1,4 +0,0 @@ -# melos_managed_dependency_overrides: custom_lint_core,custom_lint_visitor -dependency_overrides: - custom_lint_core: - path: ../custom_lint_core diff --git a/packages/custom_lint/tools/analyzer_plugin/pubspec.yaml b/packages/custom_lint/tools/analyzer_plugin/pubspec.yaml index f632453b..571200bb 100644 --- a/packages/custom_lint/tools/analyzer_plugin/pubspec.yaml +++ b/packages/custom_lint/tools/analyzer_plugin/pubspec.yaml @@ -4,13 +4,9 @@ version: 0.8.0 publish_to: none environment: - sdk: ">=3.0.0 <4.0.0" + sdk: ">=3.5.0 <4.0.0" + +resolution: workspace dependencies: custom_lint: 0.8.0 - -# TODO: If you want to contribute to custom_lint, add a pubspec_overrides.yaml file -# in this folder, containing the following: -# dependency_overrides: -# custom_lint: -# path: /absolute/path/to/custom_lint/folder diff --git a/packages/custom_lint_builder/example/example_lint/pubspec.yaml b/packages/custom_lint_builder/example/example_lint/pubspec.yaml index 51a1f789..c91d18f6 100644 --- a/packages/custom_lint_builder/example/example_lint/pubspec.yaml +++ b/packages/custom_lint_builder/example/example_lint/pubspec.yaml @@ -2,7 +2,9 @@ name: custom_lint_builder_example_lint publish_to: none environment: - sdk: '>=3.0.0 <4.0.0' + sdk: ">=3.5.0 <4.0.0" + +resolution: workspace dependencies: analyzer: ^7.5.0 diff --git a/packages/custom_lint_builder/example/example_lint/pubspec_overrides.yaml b/packages/custom_lint_builder/example/example_lint/pubspec_overrides.yaml deleted file mode 100644 index ee6fd0f4..00000000 --- a/packages/custom_lint_builder/example/example_lint/pubspec_overrides.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# melos_managed_dependency_overrides: custom_lint,custom_lint_builder,custom_lint_core,custom_lint_visitor -dependency_overrides: - custom_lint: - path: ../../../custom_lint - custom_lint_builder: - path: ../.. - custom_lint_core: - path: ../../../custom_lint_core diff --git a/packages/custom_lint_builder/example/pubspec.yaml b/packages/custom_lint_builder/example/pubspec.yaml index 2113819e..8d596b21 100644 --- a/packages/custom_lint_builder/example/pubspec.yaml +++ b/packages/custom_lint_builder/example/pubspec.yaml @@ -2,7 +2,9 @@ name: custom_lint_builder_example_app publish_to: none environment: - sdk: '>=3.0.0 <4.0.0' + sdk: ">=3.5.0 <4.0.0" + +resolution: workspace dependencies: riverpod: ^2.0.0 diff --git a/packages/custom_lint_builder/example/pubspec_overrides.yaml b/packages/custom_lint_builder/example/pubspec_overrides.yaml deleted file mode 100644 index 091a138f..00000000 --- a/packages/custom_lint_builder/example/pubspec_overrides.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# melos_managed_dependency_overrides: custom_lint,custom_lint_builder,custom_lint_builder_example_lint,custom_lint_core,custom_lint_visitor -dependency_overrides: - custom_lint: - path: ../../custom_lint - custom_lint_builder: - path: .. - custom_lint_builder_example_lint: - path: example_lint - custom_lint_core: - path: ../../custom_lint_core diff --git a/packages/custom_lint_builder/pubspec.yaml b/packages/custom_lint_builder/pubspec.yaml index a052862c..473372fb 100644 --- a/packages/custom_lint_builder/pubspec.yaml +++ b/packages/custom_lint_builder/pubspec.yaml @@ -4,7 +4,9 @@ description: A package to help writing custom linters repository: https://github.com/invertase/dart_custom_lint environment: - sdk: ">=3.0.0 <4.0.0" + sdk: ">=3.5.0 <4.0.0" + +resolution: workspace dependencies: analyzer: ^7.5.0 diff --git a/packages/custom_lint_builder/pubspec_overrides.yaml b/packages/custom_lint_builder/pubspec_overrides.yaml deleted file mode 100644 index aac3d839..00000000 --- a/packages/custom_lint_builder/pubspec_overrides.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# melos_managed_dependency_overrides: custom_lint_visitor -dependency_overrides: - custom_lint: - path: ../custom_lint - custom_lint_core: - path: ../custom_lint_core - lint_visitor_generator: - path: ../lint_visitor_generator diff --git a/packages/custom_lint_core/pubspec.yaml b/packages/custom_lint_core/pubspec.yaml index c12a24a9..7f6bd20e 100644 --- a/packages/custom_lint_core/pubspec.yaml +++ b/packages/custom_lint_core/pubspec.yaml @@ -4,7 +4,9 @@ description: A package to help writing custom linters repository: https://github.com/invertase/dart_custom_lint environment: - sdk: ">=3.0.0 <4.0.0" + sdk: ">=3.5.0 <4.0.0" + +resolution: workspace dependencies: analyzer: ^7.5.0 diff --git a/packages/custom_lint_core/pubspec_overrides.yaml b/packages/custom_lint_core/pubspec_overrides.yaml deleted file mode 100644 index fa38855e..00000000 --- a/packages/custom_lint_core/pubspec_overrides.yaml +++ /dev/null @@ -1,6 +0,0 @@ -# melos_managed_dependency_overrides: lint_visitor_generator,custom_lint_visitor -dependency_overrides: - custom_lint: - path: ../custom_lint - lint_visitor_generator: - path: ../lint_visitor_generator diff --git a/packages/custom_lint_visitor/pubspec.yaml b/packages/custom_lint_visitor/pubspec.yaml index f0db96cf..4b1f5367 100644 --- a/packages/custom_lint_visitor/pubspec.yaml +++ b/packages/custom_lint_visitor/pubspec.yaml @@ -4,7 +4,9 @@ description: A package that exports visitors for CustomLint. repository: https://github.com/invertase/dart_custom_lint environment: - sdk: ">=3.0.0 <4.0.0" + sdk: ">=3.5.0 <4.0.0" + +resolution: workspace dependencies: analyzer: ">=7.4.5 <7.7.0" @@ -12,5 +14,4 @@ dependencies: dev_dependencies: build_runner: ^2.5.0 lint_visitor_generator: - path: ../lint_visitor_generator test: ^1.22.2 diff --git a/packages/custom_lint_visitor/pubspec_overrides.yaml b/packages/custom_lint_visitor/pubspec_overrides.yaml deleted file mode 100644 index 42255ad1..00000000 --- a/packages/custom_lint_visitor/pubspec_overrides.yaml +++ /dev/null @@ -1,4 +0,0 @@ -# melos_managed_dependency_overrides: lint_visitor_generator -dependency_overrides: - lint_visitor_generator: - path: ../lint_visitor_generator diff --git a/packages/lint_visitor_generator/pubspec.yaml b/packages/lint_visitor_generator/pubspec.yaml index 4d203d66..e26adc86 100644 --- a/packages/lint_visitor_generator/pubspec.yaml +++ b/packages/lint_visitor_generator/pubspec.yaml @@ -2,7 +2,9 @@ name: lint_visitor_generator publish_to: none environment: - sdk: ">=3.0.0 <4.0.0" + sdk: ">=3.5.0 <4.0.0" + +resolution: workspace dependencies: analyzer: ^7.5.0 diff --git a/pubspec.yaml b/pubspec.yaml index d10df1bd..221beb78 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,6 +2,17 @@ name: melos_root publish_to: none environment: - sdk: ">=3.0.0 <4.0.0" + sdk: ^3.5.0 + +workspace: + - packages/custom_lint + - packages/custom_lint/example + - packages/custom_lint/tools/analyzer_plugin + - packages/custom_lint_builder + - packages/custom_lint_builder/example + - packages/custom_lint_core + - packages/custom_lint_visitor + - packages/lint_visitor_generator + dev_dependencies: - melos: ^3.0.0 + melos: ^7.1.0