build!: Migrate to pub workspace

Signed-off-by: provokateurin <kate@provokateurin.de>

.github/workflows/conventional_commits.yaml

@@ -15,9 +15,9 @@ jobs:
       - name: Install dart
         uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 # v1
         with:
-          sdk: 3.5
+          sdk: 3.6
       - name: Install commitlint_cli
-        run: dart pub get
+        run: dart pub global activate commitlint_cli
 
       - name: Lint conventional commits
-        run: dart run commitlint_cli --from=${{ github.event.pull_request.head.sha }}~${{ github.event.pull_request.commits }} --to=${{ github.event.pull_request.head.sha }}
+        run: dart pub global run commitlint_cli --from=${{ github.event.pull_request.head.sha }}~${{ github.event.pull_request.commits }} --to=${{ github.event.pull_request.head.sha }}

.github/workflows/dart.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Install dart
         uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 # v1
         with:
-          sdk: 3.5
+          sdk: 3.6
       - name: Setup
         run: ./tool/setup.sh
 
@@ -48,7 +48,7 @@ jobs:
         if: ${{ matrix.dependencies == 'downgrade' }}
         run: |
           git apply .github/workflows/dependency_overrides.patch
-          melos exec dart pub downgrade
+          fvm dart pub downgrade
       - name: Check formatting
         run: melos run format:check
       - name: Lint code

.github/workflows/generate.yaml

@@ -41,7 +41,7 @@ jobs:
       - name: Install dart
         uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 # v1
         with:
-          sdk: 3.5
+          sdk: 3.6
       - name: Setup
         run: ./tool/setup.sh
 

.github/workflows/publish.yaml

@@ -25,7 +25,7 @@ jobs:
       - name: Install dart
         uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 # v1
         with:
-          sdk: 3.5
+          sdk: 3.6
       - name: Setup
         run: ./tool/setup.sh
 
@@ -103,7 +103,7 @@ jobs:
       - name: Install dart
         uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 # v1
         with:
-          sdk: 3.5
+          sdk: 3.6
       - name: Setup
         run: ./tool/setup.sh
       - name: Build

.github/workflows/update_presets.yaml

@@ -16,7 +16,7 @@ jobs:
       - name: Install dart
         uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 # v1
         with:
-          sdk: 3.5
+          sdk: 3.6
       - name: Setup
         run: ./tool/setup.sh
 

.gitignore

@@ -1,20 +1,17 @@
 .dart_tool
-pubspec.lock
+.flutter-plugins
+.flutter-plugins-dependencies
 
 packages/**/.idea
 packages/**/*.iml
 packages/**/*.symbols
 packages/**/*.log
-packages/**/.flutter-plugins
-packages/**/.flutter-plugins-dependencies
 packages/**/coverage
 packages/**/build
 packages/**/build-dir
 packages/**/.flatpak-builder
 packages/**/doc/api
 
-!packages/neon_framework/example/pubspec.lock
-
 # Melos recommends adding them, but renovate does not generate them which would end up with broken lockfiles
 # **/pubspec_overrides.yaml
 

docs/workflows.md

@@ -5,8 +5,8 @@
 If you need to add a new package to the Neon project please make sure to execute all the following steps:
 1. Use the according template by running `fvm dart create -t package package_name` or `fvm flutter create -t package package_name`.
 2. Make sure to activate our strict linting by adding it to the package.
-3. Regenerate the dependency overrides by executing `melos bootstrap`.
-4. Add a Symlink to our main [license](../assets/AGPL-3.0.txt).
+3. Add a Symlink to our main [license](../assets/AGPL-3.0.txt).
+4. Update the workspace [pubspec.yaml](../pubspec.yaml) by adding the new package path.
 5. Update [commitlint.yaml](../commitlint.yaml) by adding the new package name.
 6. Remove the package `.gitignore` (a global `.gitignore` for all packages is used instead).
 

melos.yaml

@@ -24,9 +24,6 @@ command:
       post: melos run format
   version:
     hooks:
-      preCommit: |
-        melos bootstrap
-        git add packages/neon_framework/example/pubspec.lock
       # Needed until https://github.com/invertase/melos/issues/591 is supported
       post: |
         git commit --amend --signoff --no-edit
@@ -44,7 +41,7 @@ scripts:
   test:dart: >
     melos exec --no-flutter --concurrency=1 --fail-fast --dir-exists=test -- "
       dart test --concurrency=$(nproc --all) --coverage=coverage &&
-      dart pub global run coverage:format_coverage --packages=.dart_tool/package_config.json --report-on=lib --lcov -o ./coverage/lcov.info -i ./coverage
+      dart pub global run coverage:format_coverage --packages=MELOS_ROOT_PATH/.dart_tool/package_config.json --report-on=lib --lcov -o ./coverage/lcov.info -i ./coverage
     "
   test:flutter: melos exec --flutter --concurrency=1 --fail-fast --dir-exists=test -- flutter test --concurrency=$(nproc --all) --coverage
   generate:neon:build_runner: melos exec --scope="neon*" --file-exists="build.yaml" -- dart run build_runner build --delete-conflicting-outputs && melos run format

packages/cookie_store/packages/cookie_store_conformance_tests/pubspec.yaml

@@ -3,19 +3,17 @@ description: >-
   A library that tests whether implementations of package:cookie_store's `CookieStore`
   class behave as expected.
 publish_to: none
+resolution: workspace
+
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.5.0
 
 dependencies:
   cookie_store:
-    git:
-      url: https://github.com/nextcloud/neon
-      path: packages/cookie_store
+    path: ../..
   meta: ^1.0.0
   test: ^1.21.2
 
 dev_dependencies:
   neon_lints:
-    git:
-      url: https://github.com/nextcloud/neon
-      path: packages/neon_lints
+    path: ../../../neon_lints

packages/cookie_store/pubspec.yaml

@@ -2,21 +2,18 @@ name: cookie_store
 description: A RFC compliant cookie store
 version: 0.1.0
 publish_to: none
+resolution: workspace
 
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.5.0
 
 dependencies:
   meta: ^1.0.0
   timezone: ^0.9.4
 
 dev_dependencies:
   cookie_store_conformance_tests:
-    git:
-      url: https://github.com/nextcloud/neon
-      path: packages/cookie_store/packages/cookie_store_conformance_tests
+    path: packages/cookie_store_conformance_tests
   neon_lints:
-    git:
-      url: https://github.com/nextcloud/neon
-      path: packages/neon_lints
-  test: ^1.25.8
+    path: ../neon_lints
+  test: ^1.24.0

packages/dynamite/example/pubspec.yaml

@@ -2,9 +2,10 @@ name: dynamite_petstore_example
 description: An example showing how to use dynamite for the Petstore example API.
 version: 1.0.0
 publish_to: none
+resolution: workspace
 
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.5.0
 
 dependencies:
   built_collection: ^5.0.0
@@ -19,6 +20,4 @@ dev_dependencies:
   built_value_generator: ^8.9.2
   dynamite: ^0.5.0+1
   neon_lints:
-    git:
-      url: https://github.com/nextcloud/neon
-      path: packages/neon_lints
+    path: ../../neon_lints

packages/dynamite/packages/dynamite_end_to_end_test/pubspec.yaml

@@ -2,9 +2,10 @@ name: dynamite_end_to_end_test
 publish_to: none
 description: Tests for dynamite. Not meant for publishing.
 version: 1.0.0
+resolution: workspace
 
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.5.0
 
 dependencies:
   built_collection: ^5.0.0
@@ -21,7 +22,6 @@ dev_dependencies:
   built_value_test: ^8.9.2
   dynamite: ^0.5.0+1
   neon_lints:
-    git:
-      url: https://github.com/nextcloud/neon
-      path: packages/neon_lints
-  test: ^1.25.8
+    path: ../../../neon_lints
+  test: ^1.24.0
+

packages/dynamite/packages/dynamite_runtime/pubspec.yaml

@@ -7,9 +7,10 @@ topics:
   - openapi
   - codegen
   - build-runner
+resolution: workspace
 
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.5.0
 
 dependencies:
   built_collection: ^5.0.0
@@ -24,10 +25,9 @@ dev_dependencies:
   build_runner: ^2.4.13
   built_value_generator: ^8.9.2
   neon_lints:
-    git:
-      url: https://github.com/nextcloud/neon
-      path: packages/neon_lints
-  test: ^1.25.8
+    path: ../../../neon_lints
+  test: ^1.24.0
+
 
 platforms:
   windows:

packages/dynamite/pubspec.yaml

@@ -7,9 +7,10 @@ topics:
   - openapi
   - codegen
   - build-runner
+resolution: workspace
 
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.5.0
 
 dependencies:
   build: ^2.0.0
@@ -35,7 +36,5 @@ dev_dependencies:
   built_value_generator: ^8.9.2
   built_value_test: ^8.9.2
   neon_lints:
-    git:
-      url: https://github.com/nextcloud/neon
-      path: packages/neon_lints
-  test: ^1.25.8
+    path: ../neon_lints
+  test: ^1.24.0

packages/interceptor_http_client/pubspec.yaml

@@ -2,16 +2,15 @@ name: interceptor_http_client
 description: A http client with request and response interceptors.
 version: 0.1.0
 publish_to: none
+resolution: workspace
 
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.5.0
 
 dependencies:
   built_collection: ^5.0.0
   cookie_store:
-    git:
-      url: https://github.com/nextcloud/neon
-      path: packages/cookie_store
+    path: ../cookie_store
   http: ^1.0.0
   meta: ^1.0.0
 
@@ -23,7 +22,6 @@ dev_dependencies:
       ref: 76512c4cbf987361421030349fd1946e63e33359
   mocktail: ^1.0.4
   neon_lints:
-    git:
-      url: https://github.com/nextcloud/neon
-      path: packages/neon_lints
-  test: ^1.25.8
+    path: ../neon_lints
+  test: ^1.24.0
+