From 26d879371709c4c2edebcaa413ebf94591438077 Mon Sep 17 00:00:00 2001 From: provokateurin Date: Thu, 12 Dec 2024 10:25:17 +0100 Subject: [PATCH] build!: Migrate to pub workspace Signed-off-by: provokateurin --- .github/workflows/conventional_commits.yaml | 6 +- .github/workflows/dart.yml | 4 +- .github/workflows/dependency_overrides.patch | 457 +-------------- .github/workflows/generate.yaml | 2 +- .github/workflows/publish.yaml | 4 +- .github/workflows/update_presets.yaml | 2 +- .gitignore | 7 +- docs/workflows.md | 4 +- melos.yaml | 5 +- .../pubspec.yaml | 12 +- .../pubspec_overrides.yaml | 6 - packages/cookie_store/pubspec.yaml | 13 +- packages/cookie_store/pubspec_overrides.yaml | 6 - packages/dynamite/example/pubspec.yaml | 7 +- .../dynamite/example/pubspec_overrides.yaml | 8 - .../dynamite_end_to_end_test/pubspec.yaml | 10 +- .../pubspec_overrides.yaml | 8 - .../packages/dynamite_runtime/pubspec.yaml | 10 +- .../dynamite_runtime/pubspec_overrides.yaml | 4 - packages/dynamite/pubspec.yaml | 9 +- packages/dynamite/pubspec_overrides.yaml | 4 - packages/interceptor_http_client/pubspec.yaml | 14 +- .../pubspec_overrides.yaml | 6 - packages/neon_framework/example/pubspec.yaml | 35 +- .../example/pubspec_overrides.yaml | 36 -- .../packages/account_repository/pubspec.yaml | 15 +- .../account_repository/pubspec_overrides.yaml | 20 - .../packages/dashboard_app/pubspec.yaml | 11 +- .../dashboard_app/pubspec_overrides.yaml | 22 - .../packages/files_app/pubspec.yaml | 11 +- .../packages/files_app/pubspec_overrides.yaml | 22 - .../packages/neon_http_client/pubspec.yaml | 18 +- .../neon_http_client/pubspec_overrides.yaml | 12 - .../packages/neon_rich_text/pubspec.yaml | 11 +- .../neon_rich_text/pubspec_overrides.yaml | 22 - .../packages/neon_storage/pubspec.yaml | 18 +- .../neon_storage/pubspec_overrides.yaml | 12 - .../packages/news_app/pubspec.yaml | 11 +- .../packages/news_app/pubspec_overrides.yaml | 22 - .../packages/notes_app/pubspec.yaml | 11 +- .../packages/notes_app/pubspec_overrides.yaml | 22 - .../packages/notifications_app/pubspec.yaml | 15 +- .../notifications_app/pubspec_overrides.yaml | 24 - .../pubspec.yaml | 15 +- .../pubspec_overrides.yaml | 20 - .../packages/sort_box/pubspec.yaml | 10 +- .../packages/sort_box/pubspec_overrides.yaml | 4 - .../packages/talk_app/pubspec.yaml | 15 +- .../packages/talk_app/pubspec_overrides.yaml | 24 - packages/neon_framework/pubspec.yaml | 31 +- .../neon_framework/pubspec_overrides.yaml | 22 - packages/neon_lints/example/pubspec.yaml | 7 +- .../neon_lints/example/pubspec_overrides.yaml | 8 - packages/neon_lints/pubspec.yaml | 3 +- .../lib/src/models/version_check.dart | 2 +- .../packages/nextcloud_test/pubspec.yaml | 15 +- .../nextcloud_test/pubspec_overrides.yaml | 12 - .../nextcloud_test_presets/pubspec.yaml | 7 +- .../pubspec_overrides.yaml | 8 - packages/nextcloud/pubspec.yaml | 17 +- packages/nextcloud/pubspec_overrides.yaml | 14 - .../example/pubspec.lock => pubspec.lock | 530 ++++++++++++++---- pubspec.yaml | 37 +- tool/setup.sh | 15 +- 64 files changed, 601 insertions(+), 1193 deletions(-) delete mode 100644 packages/cookie_store/packages/cookie_store_conformance_tests/pubspec_overrides.yaml delete mode 100644 packages/cookie_store/pubspec_overrides.yaml delete mode 100644 packages/dynamite/example/pubspec_overrides.yaml delete mode 100644 packages/dynamite/packages/dynamite_end_to_end_test/pubspec_overrides.yaml delete mode 100644 packages/dynamite/packages/dynamite_runtime/pubspec_overrides.yaml delete mode 100644 packages/dynamite/pubspec_overrides.yaml delete mode 100644 packages/interceptor_http_client/pubspec_overrides.yaml delete mode 100644 packages/neon_framework/example/pubspec_overrides.yaml delete mode 100644 packages/neon_framework/packages/account_repository/pubspec_overrides.yaml delete mode 100644 packages/neon_framework/packages/dashboard_app/pubspec_overrides.yaml delete mode 100644 packages/neon_framework/packages/files_app/pubspec_overrides.yaml delete mode 100644 packages/neon_framework/packages/neon_http_client/pubspec_overrides.yaml delete mode 100644 packages/neon_framework/packages/neon_rich_text/pubspec_overrides.yaml delete mode 100644 packages/neon_framework/packages/neon_storage/pubspec_overrides.yaml delete mode 100644 packages/neon_framework/packages/news_app/pubspec_overrides.yaml delete mode 100644 packages/neon_framework/packages/notes_app/pubspec_overrides.yaml delete mode 100644 packages/neon_framework/packages/notifications_app/pubspec_overrides.yaml delete mode 100644 packages/neon_framework/packages/notifications_push_repository/pubspec_overrides.yaml delete mode 100644 packages/neon_framework/packages/sort_box/pubspec_overrides.yaml delete mode 100644 packages/neon_framework/packages/talk_app/pubspec_overrides.yaml delete mode 100644 packages/neon_framework/pubspec_overrides.yaml delete mode 100644 packages/neon_lints/example/pubspec_overrides.yaml delete mode 100644 packages/nextcloud/packages/nextcloud_test/pubspec_overrides.yaml delete mode 100644 packages/nextcloud/packages/nextcloud_test_presets/pubspec_overrides.yaml delete mode 100644 packages/nextcloud/pubspec_overrides.yaml rename packages/neon_framework/example/pubspec.lock => pubspec.lock (81%) diff --git a/.github/workflows/conventional_commits.yaml b/.github/workflows/conventional_commits.yaml index 0b4c7d5e27e..5fe1f6630d2 100644 --- a/.github/workflows/conventional_commits.yaml +++ b/.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 0.8.1 - 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 }} diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 24e48060d53..7417795e75e 100644 --- a/.github/workflows/dart.yml +++ b/.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 diff --git a/.github/workflows/dependency_overrides.patch b/.github/workflows/dependency_overrides.patch index 81c48c38acf..52405c19c56 100644 --- a/.github/workflows/dependency_overrides.patch +++ b/.github/workflows/dependency_overrides.patch @@ -1,458 +1,15 @@ -diff --git a/packages/cookie_store/pubspec.yaml b/packages/cookie_store/pubspec.yaml ---- a/packages/cookie_store/pubspec.yaml -+++ b/packages/cookie_store/pubspec.yaml -@@ -20,3 +20,6 @@ dev_dependencies: - url: https://github.com/nextcloud/neon - path: packages/neon_lints - test: ^1.25.8 +diff --git a/pubspec.yaml b/pubspec.yaml +--- a/pubspec.yaml ++++ b/pubspec.yaml +@@ -35,3 +35,11 @@ workspace: + + dev_dependencies: + melos: 6.2.0 + +dependency_overrides: -+ frontend_server_client: ^4.0.0 -diff --git a/packages/cookie_store/pubspec_overrides.yaml b/packages/cookie_store/pubspec_overrides.yaml ---- a/packages/cookie_store/pubspec_overrides.yaml -+++ b/packages/cookie_store/pubspec_overrides.yaml -@@ -1,6 +1,7 @@ --# melos_managed_dependency_overrides: cookie_store_conformance_tests,neon_lints -+# melos_managed_dependency_overrides: cookie_store_conformance_tests,neon_lints,frontend_server_client - dependency_overrides: - cookie_store_conformance_tests: - path: packages/cookie_store_conformance_tests - neon_lints: - path: ../neon_lints -+ frontend_server_client: ^4.0.0 -diff --git a/packages/dynamite/packages/dynamite_end_to_end_test/pubspec.yaml b/packages/dynamite/packages/dynamite_end_to_end_test/pubspec.yaml ---- a/packages/dynamite/packages/dynamite_end_to_end_test/pubspec.yaml -+++ b/packages/dynamite/packages/dynamite_end_to_end_test/pubspec.yaml -@@ -25,3 +25,7 @@ dev_dependencies: - url: https://github.com/nextcloud/neon - path: packages/neon_lints - test: ^1.25.8 -+ -+dependency_overrides: -+ frontend_server_client: ^4.0.0 -+ quiver: ^3.2.1 -diff --git a/packages/dynamite/packages/dynamite_end_to_end_test/pubspec_overrides.yaml b/packages/dynamite/packages/dynamite_end_to_end_test/pubspec_overrides.yaml ---- a/packages/dynamite/packages/dynamite_end_to_end_test/pubspec_overrides.yaml -+++ b/packages/dynamite/packages/dynamite_end_to_end_test/pubspec_overrides.yaml -@@ -1,4 +1,4 @@ --# melos_managed_dependency_overrides: dynamite,dynamite_runtime,neon_lints -+# melos_managed_dependency_overrides: dynamite,dynamite_runtime,neon_lints,frontend_server_client,quiver - dependency_overrides: - dynamite: - path: ../.. -@@ -6,3 +6,5 @@ dependency_overrides: - path: ../dynamite_runtime - neon_lints: - path: ../../../neon_lints -+ frontend_server_client: ^4.0.0 -+ quiver: ^3.2.1 -diff --git a/packages/dynamite/packages/dynamite_runtime/pubspec.yaml b/packages/dynamite/packages/dynamite_runtime/pubspec.yaml ---- a/packages/dynamite/packages/dynamite_runtime/pubspec.yaml -+++ b/packages/dynamite/packages/dynamite_runtime/pubspec.yaml -@@ -29,6 +29,9 @@ dev_dependencies: - path: packages/neon_lints - test: ^1.25.8 - -+dependency_overrides: -+ frontend_server_client: ^4.0.0 -+ - platforms: - windows: - linux: -diff --git a/packages/dynamite/packages/dynamite_runtime/pubspec_overrides.yaml b/packages/dynamite/packages/dynamite_runtime/pubspec_overrides.yaml ---- a/packages/dynamite/packages/dynamite_runtime/pubspec_overrides.yaml -+++ b/packages/dynamite/packages/dynamite_runtime/pubspec_overrides.yaml -@@ -1,4 +1,5 @@ --# melos_managed_dependency_overrides: neon_lints -+# melos_managed_dependency_overrides: neon_lints,frontend_server_client - dependency_overrides: - neon_lints: - path: ../../../neon_lints -+ frontend_server_client: ^4.0.0 -diff --git a/packages/dynamite/pubspec.yaml b/packages/dynamite/pubspec.yaml ---- a/packages/dynamite/pubspec.yaml -+++ b/packages/dynamite/pubspec.yaml -@@ -39,3 +39,7 @@ dev_dependencies: - url: https://github.com/nextcloud/neon - path: packages/neon_lints - test: ^1.25.8 -+ -+dependency_overrides: -+ frontend_server_client: ^4.0.0 -+ quiver: ^3.2.1 -diff --git a/packages/dynamite/pubspec_overrides.yaml b/packages/dynamite/pubspec_overrides.yaml ---- a/packages/dynamite/pubspec_overrides.yaml -+++ b/packages/dynamite/pubspec_overrides.yaml -@@ -1,4 +1,6 @@ --# melos_managed_dependency_overrides: neon_lints -+# melos_managed_dependency_overrides: neon_lints,frontend_server_client,quiver - dependency_overrides: - neon_lints: - path: ../neon_lints -+ frontend_server_client: ^4.0.0 -+ quiver: ^3.2.1 -diff --git a/packages/interceptor_http_client/pubspec.yaml b/packages/interceptor_http_client/pubspec.yaml ---- a/packages/interceptor_http_client/pubspec.yaml -+++ b/packages/interceptor_http_client/pubspec.yaml -@@ -27,3 +27,7 @@ dev_dependencies: - url: https://github.com/nextcloud/neon - path: packages/neon_lints - test: ^1.25.8 -+ -+dependency_overrides: -+ frontend_server_client: ^4.0.0 -+ web: ">=0.5.0 <2.0.0" -diff --git a/packages/interceptor_http_client/pubspec_overrides.yaml b/packages/interceptor_http_client/pubspec_overrides.yaml ---- a/packages/interceptor_http_client/pubspec_overrides.yaml -+++ b/packages/interceptor_http_client/pubspec_overrides.yaml -@@ -1,6 +1,8 @@ --# melos_managed_dependency_overrides: cookie_store,neon_lints -+# melos_managed_dependency_overrides: cookie_store,neon_lints,frontend_server_client,web - dependency_overrides: - cookie_store: - path: ../cookie_store - neon_lints: - path: ../neon_lints -+ frontend_server_client: ^4.0.0 -+ web: ">=0.5.0 <2.0.0" -diff --git a/packages/neon_framework/packages/account_repository/pubspec.yaml b/packages/neon_framework/packages/account_repository/pubspec.yaml ---- a/packages/neon_framework/packages/account_repository/pubspec.yaml -+++ b/packages/neon_framework/packages/account_repository/pubspec.yaml -@@ -37,3 +37,10 @@ dev_dependencies: - url: https://github.com/nextcloud/neon - path: packages/neon_lints - test: ^1.25.2 -+ -+dependency_overrides: -+ archive: ^3.5.0 -+ image_picker: ^0.8.2 -+ platform: ^3.1.0 -+ quiver: ^3.2.1 -+ win32: ^5.5.1 -diff --git a/packages/neon_framework/packages/account_repository/pubspec_overrides.yaml b/packages/neon_framework/packages/account_repository/pubspec_overrides.yaml ---- a/packages/neon_framework/packages/account_repository/pubspec_overrides.yaml -+++ b/packages/neon_framework/packages/account_repository/pubspec_overrides.yaml -@@ -1,4 +1,4 @@ --# melos_managed_dependency_overrides: cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,nextcloud,notifications_push_repository,sort_box -+# melos_managed_dependency_overrides: cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,nextcloud,notifications_push_repository,sort_box,archive,image_picker,platform,quiver,win32 - dependency_overrides: - cookie_store: - path: ../../../cookie_store -@@ -18,3 +18,8 @@ dependency_overrides: - path: ../notifications_push_repository - sort_box: - path: ../sort_box -+ archive: ^3.5.0 -+ image_picker: ^0.8.2 -+ platform: ^3.1.0 -+ quiver: ^3.2.1 -+ win32: ^5.5.1 -diff --git a/packages/neon_framework/packages/dashboard_app/pubspec.yaml b/packages/neon_framework/packages/dashboard_app/pubspec.yaml ---- a/packages/neon_framework/packages/dashboard_app/pubspec.yaml -+++ b/packages/neon_framework/packages/dashboard_app/pubspec.yaml -@@ -39,6 +39,13 @@ dev_dependencies: - url_launcher_platform_interface: ^2.3.2 - vector_graphics_compiler: ^1.1.16 - -+dependency_overrides: -+ archive: ^3.5.0 -+ image_picker: ^0.8.2 -+ platform: ^3.1.0 -+ quiver: ^3.2.1 -+ win32: ^5.5.1 -+ - flutter: - uses-material-design: true - assets: -diff --git a/packages/neon_framework/packages/dashboard_app/pubspec_overrides.yaml b/packages/neon_framework/packages/dashboard_app/pubspec_overrides.yaml ---- a/packages/neon_framework/packages/dashboard_app/pubspec_overrides.yaml -+++ b/packages/neon_framework/packages/dashboard_app/pubspec_overrides.yaml -@@ -1,4 +1,4 @@ --# melos_managed_dependency_overrides: account_repository,cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,nextcloud,notifications_push_repository,sort_box -+# melos_managed_dependency_overrides: account_repository,cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,nextcloud,notifications_push_repository,sort_box,archive,image_picker,platform,quiver,win32 - dependency_overrides: - account_repository: - path: ../account_repository -@@ -20,3 +20,8 @@ dependency_overrides: - path: ../notifications_push_repository - sort_box: - path: ../sort_box -+ archive: ^3.5.0 -+ image_picker: ^0.8.2 -+ platform: ^3.1.0 -+ quiver: ^3.2.1 -+ win32: ^5.5.1 -diff --git a/packages/neon_framework/packages/neon_http_client/pubspec.yaml b/packages/neon_framework/packages/neon_http_client/pubspec.yaml ---- a/packages/neon_framework/packages/neon_http_client/pubspec.yaml -+++ b/packages/neon_framework/packages/neon_http_client/pubspec.yaml -@@ -34,3 +34,8 @@ dev_dependencies: - url: https://github.com/nextcloud/neon - path: packages/neon_lints - test: ^1.25.8 -+ -+dependency_overrides: -+ frontend_server_client: ^4.0.0 -+ quiver: ^3.2.1 -+ web: ">=0.5.0 <2.0.0" -diff --git a/packages/neon_framework/packages/neon_http_client/pubspec_overrides.yaml b/packages/neon_framework/packages/neon_http_client/pubspec_overrides.yaml ---- a/packages/neon_framework/packages/neon_http_client/pubspec_overrides.yaml -+++ b/packages/neon_framework/packages/neon_http_client/pubspec_overrides.yaml -@@ -1,4 +1,4 @@ --# melos_managed_dependency_overrides: cookie_store,dynamite_runtime,interceptor_http_client,neon_lints,nextcloud -+# melos_managed_dependency_overrides: cookie_store,dynamite_runtime,interceptor_http_client,neon_lints,nextcloud,frontend_server_client,quiver,web - dependency_overrides: - cookie_store: - path: ../../../cookie_store -@@ -10,3 +10,6 @@ dependency_overrides: - path: ../../../neon_lints - nextcloud: - path: ../../../nextcloud -+ frontend_server_client: ^4.0.0 -+ quiver: ^3.2.1 -+ web: ">=0.5.0 <2.0.0" -diff --git a/packages/neon_framework/packages/neon_rich_text/pubspec.yaml b/packages/neon_framework/packages/neon_rich_text/pubspec.yaml ---- a/packages/neon_framework/packages/neon_rich_text/pubspec.yaml -+++ b/packages/neon_framework/packages/neon_rich_text/pubspec.yaml -@@ -34,5 +34,12 @@ dev_dependencies: - rxdart: ^0.28.0 - url_launcher_platform_interface: ^2.3.2 - -+dependency_overrides: -+ archive: ^3.5.0 -+ image_picker: ^0.8.2 -+ platform: ^3.1.0 -+ quiver: ^3.2.1 -+ win32: ^5.5.1 -+ - flutter: - uses-material-design: true -diff --git a/packages/neon_framework/packages/neon_rich_text/pubspec_overrides.yaml b/packages/neon_framework/packages/neon_rich_text/pubspec_overrides.yaml ---- a/packages/neon_framework/packages/neon_rich_text/pubspec_overrides.yaml -+++ b/packages/neon_framework/packages/neon_rich_text/pubspec_overrides.yaml -@@ -1,4 +1,4 @@ --# melos_managed_dependency_overrides: account_repository,cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,nextcloud,notifications_push_repository,sort_box -+# melos_managed_dependency_overrides: account_repository,cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,nextcloud,notifications_push_repository,sort_box,archive,image_picker,platform,quiver,win32 - dependency_overrides: - account_repository: - path: ../account_repository -@@ -20,3 +20,8 @@ dependency_overrides: - path: ../notifications_push_repository - sort_box: - path: ../sort_box -+ archive: ^3.5.0 -+ image_picker: ^0.8.2 -+ platform: ^3.1.0 -+ quiver: ^3.2.1 -+ win32: ^5.5.1 -diff --git a/packages/neon_framework/packages/neon_storage/pubspec.yaml b/packages/neon_framework/packages/neon_storage/pubspec.yaml ---- a/packages/neon_framework/packages/neon_storage/pubspec.yaml -+++ b/packages/neon_framework/packages/neon_storage/pubspec.yaml -@@ -32,3 +32,6 @@ dev_dependencies: - url: https://github.com/nextcloud/neon - path: packages/neon_lints - test: ^1.25.8 -+ -+dependency_overrides: -+ frontend_server_client: ^4.0.0 -diff --git a/packages/neon_framework/packages/neon_storage/pubspec_overrides.yaml b/packages/neon_framework/packages/neon_storage/pubspec_overrides.yaml ---- a/packages/neon_framework/packages/neon_storage/pubspec_overrides.yaml -+++ b/packages/neon_framework/packages/neon_storage/pubspec_overrides.yaml -@@ -1,4 +1,4 @@ --# melos_managed_dependency_overrides: cookie_store,cookie_store_conformance_tests,dynamite_runtime,neon_lints,nextcloud -+# melos_managed_dependency_overrides: cookie_store,cookie_store_conformance_tests,dynamite_runtime,neon_lints,nextcloud,frontend_server_client - dependency_overrides: - cookie_store: - path: ../../../cookie_store -@@ -10,3 +10,4 @@ dependency_overrides: - path: ../../../neon_lints - nextcloud: - path: ../../../nextcloud -+ frontend_server_client: ^4.0.0 -diff --git a/packages/neon_framework/packages/notifications_app/pubspec.yaml b/packages/neon_framework/packages/notifications_app/pubspec.yaml ---- a/packages/neon_framework/packages/notifications_app/pubspec.yaml -+++ b/packages/neon_framework/packages/notifications_app/pubspec.yaml -@@ -48,6 +48,13 @@ dev_dependencies: - url_launcher_platform_interface: ^2.3.2 - vector_graphics_compiler: ^1.1.16 - -+dependency_overrides: -+ archive: ^3.5.0 -+ image_picker: ^0.8.2 -+ platform: ^3.1.0 -+ quiver: ^3.2.1 -+ win32: ^5.5.1 -+ - flutter: - uses-material-design: true - assets: -diff --git a/packages/neon_framework/packages/notifications_app/pubspec_overrides.yaml b/packages/neon_framework/packages/notifications_app/pubspec_overrides.yaml ---- a/packages/neon_framework/packages/notifications_app/pubspec_overrides.yaml -+++ b/packages/neon_framework/packages/notifications_app/pubspec_overrides.yaml -@@ -1,4 +1,4 @@ --# melos_managed_dependency_overrides: account_repository,cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,neon_rich_text,nextcloud,notifications_push_repository,sort_box -+# melos_managed_dependency_overrides: account_repository,cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,neon_rich_text,nextcloud,notifications_push_repository,sort_box,archive,image_picker,platform,quiver,win32 - dependency_overrides: - account_repository: - path: ../account_repository -@@ -22,3 +22,8 @@ dependency_overrides: - path: ../notifications_push_repository - sort_box: - path: ../sort_box + archive: ^3.5.0 -+ image_picker: ^0.8.2 -+ platform: ^3.1.0 -+ quiver: ^3.2.1 -+ win32: ^5.5.1 -diff --git a/packages/neon_framework/packages/notifications_push_repository/pubspec.yaml b/packages/neon_framework/packages/notifications_push_repository/pubspec.yaml ---- a/packages/neon_framework/packages/notifications_push_repository/pubspec.yaml -+++ b/packages/neon_framework/packages/notifications_push_repository/pubspec.yaml -@@ -44,3 +44,10 @@ dev_dependencies: - path: packages/neon_lints - plugin_platform_interface: ^2.1.8 - unifiedpush_platform_interface: ^2.0.2 -+ -+dependency_overrides: -+ archive: ^3.5.0 -+ image_picker: ^0.8.2 -+ platform: ^3.1.0 -+ quiver: ^3.2.1 -+ win32: ^5.5.1 -diff --git a/packages/neon_framework/packages/notifications_push_repository/pubspec_overrides.yaml b/packages/neon_framework/packages/notifications_push_repository/pubspec_overrides.yaml ---- a/packages/neon_framework/packages/notifications_push_repository/pubspec_overrides.yaml -+++ b/packages/neon_framework/packages/notifications_push_repository/pubspec_overrides.yaml -@@ -1,4 +1,4 @@ --# melos_managed_dependency_overrides: account_repository,cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,nextcloud,sort_box -+# melos_managed_dependency_overrides: account_repository,cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,nextcloud,sort_box,archive,image_picker,platform,quiver,win32 - dependency_overrides: - account_repository: - path: ../account_repository -@@ -18,3 +18,8 @@ dependency_overrides: - path: ../../../nextcloud - sort_box: - path: ../sort_box -+ archive: ^3.5.0 -+ image_picker: ^0.8.2 -+ platform: ^3.1.0 -+ quiver: ^3.2.1 -+ win32: ^5.5.1 -diff --git a/packages/neon_framework/packages/sort_box/pubspec.yaml b/packages/neon_framework/packages/sort_box/pubspec.yaml ---- a/packages/neon_framework/packages/sort_box/pubspec.yaml -+++ b/packages/neon_framework/packages/sort_box/pubspec.yaml -@@ -15,3 +15,6 @@ dev_dependencies: - url: https://github.com/nextcloud/neon - path: packages/neon_lints - test: ^1.25.8 -+ -+dependency_overrides: -+ frontend_server_client: ^4.0.0 -diff --git a/packages/neon_framework/packages/sort_box/pubspec_overrides.yaml b/packages/neon_framework/packages/sort_box/pubspec_overrides.yaml ---- a/packages/neon_framework/packages/sort_box/pubspec_overrides.yaml -+++ b/packages/neon_framework/packages/sort_box/pubspec_overrides.yaml -@@ -1,4 +1,5 @@ --# melos_managed_dependency_overrides: neon_lints -+# melos_managed_dependency_overrides: neon_lints,frontend_server_client - dependency_overrides: - neon_lints: - path: ../../../neon_lints + frontend_server_client: ^4.0.0 -diff --git a/packages/neon_framework/packages/talk_app/pubspec.yaml b/packages/neon_framework/packages/talk_app/pubspec.yaml ---- a/packages/neon_framework/packages/talk_app/pubspec.yaml -+++ b/packages/neon_framework/packages/talk_app/pubspec.yaml -@@ -51,6 +51,14 @@ dev_dependencies: - url_launcher_platform_interface: ^2.3.2 - vector_graphics_compiler: ^1.1.16 - -+dependency_overrides: -+ archive: ^3.5.0 -+ image_picker: ^0.8.2 -+ platform: ^3.1.0 -+ pointer_interceptor: ^0.10.1+1 -+ quiver: ^3.2.1 -+ win32: ^5.5.1 -+ - flutter: - uses-material-design: true - assets: -diff --git a/packages/neon_framework/packages/talk_app/pubspec_overrides.yaml b/packages/neon_framework/packages/talk_app/pubspec_overrides.yaml ---- a/packages/neon_framework/packages/talk_app/pubspec_overrides.yaml -+++ b/packages/neon_framework/packages/talk_app/pubspec_overrides.yaml -@@ -1,4 +1,4 @@ --# melos_managed_dependency_overrides: account_repository,cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,neon_rich_text,nextcloud,notifications_push_repository,sort_box -+# melos_managed_dependency_overrides: account_repository,cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,neon_rich_text,nextcloud,notifications_push_repository,sort_box,archive,image_picker,platform,pointer_interceptor,quiver,win32 - dependency_overrides: - account_repository: - path: ../account_repository -@@ -22,3 +22,9 @@ dependency_overrides: - path: ../notifications_push_repository - sort_box: - path: ../sort_box -+ archive: ^3.5.0 -+ image_picker: ^0.8.2 -+ platform: ^3.1.0 -+ pointer_interceptor: ^0.10.1+1 -+ quiver: ^3.2.1 -+ win32: ^5.5.1 -diff --git a/packages/neon_framework/pubspec.yaml b/packages/neon_framework/pubspec.yaml ---- a/packages/neon_framework/pubspec.yaml -+++ b/packages/neon_framework/pubspec.yaml -@@ -107,6 +107,13 @@ dev_dependencies: - vector_graphics_compiler: ^1.1.16 - version: ^3.0.2 - -+dependency_overrides: -+ archive: ^3.5.0 + image_picker: ^0.8.2 + platform: ^3.1.0 + quiver: ^3.2.1 + win32: ^5.5.1 -+ - flutter: - uses-material-design: true - assets: -diff --git a/packages/neon_framework/pubspec_overrides.yaml b/packages/neon_framework/pubspec_overrides.yaml ---- a/packages/neon_framework/pubspec_overrides.yaml -+++ b/packages/neon_framework/pubspec_overrides.yaml -@@ -1,4 +1,4 @@ --# melos_managed_dependency_overrides: account_repository,cookie_store,cookie_store_conformance_tests,dynamite_runtime,interceptor_http_client,neon_http_client,neon_lints,nextcloud,notifications_push_repository,sort_box -+# melos_managed_dependency_overrides: account_repository,cookie_store,cookie_store_conformance_tests,dynamite_runtime,interceptor_http_client,neon_http_client,neon_lints,nextcloud,notifications_push_repository,sort_box,archive,image_picker,platform,quiver,win32 - dependency_overrides: - account_repository: - path: packages/account_repository -@@ -20,3 +20,8 @@ dependency_overrides: - path: packages/notifications_push_repository - sort_box: - path: packages/sort_box -+ archive: ^3.5.0 -+ image_picker: ^0.8.2 -+ platform: ^3.1.0 -+ quiver: ^3.2.1 -+ win32: ^5.5.1 -diff --git a/packages/nextcloud/pubspec.yaml b/packages/nextcloud/pubspec.yaml ---- a/packages/nextcloud/pubspec.yaml -+++ b/packages/nextcloud/pubspec.yaml -@@ -57,6 +57,10 @@ dev_dependencies: - test_api: ^0.7.3 - xml_serializable: ^2.5.3 - -+dependency_overrides: -+ frontend_server_client: ^4.0.0 -+ quiver: ^3.2.1 -+ - platforms: - windows: - linux: -diff --git a/packages/nextcloud/pubspec_overrides.yaml b/packages/nextcloud/pubspec_overrides.yaml ---- a/packages/nextcloud/pubspec_overrides.yaml -+++ b/packages/nextcloud/pubspec_overrides.yaml -@@ -1,4 +1,4 @@ --# melos_managed_dependency_overrides: cookie_store,dynamite,dynamite_runtime,interceptor_http_client,neon_lints,nextcloud_test -+# melos_managed_dependency_overrides: cookie_store,dynamite,dynamite_runtime,interceptor_http_client,neon_lints,nextcloud_test,frontend_server_client,quiver - dependency_overrides: - cookie_store: - path: ../cookie_store -@@ -12,3 +12,5 @@ dependency_overrides: - path: ../neon_lints - nextcloud_test: - path: packages/nextcloud_test -+ frontend_server_client: ^4.0.0 -+ quiver: ^3.2.1 diff --git a/.github/workflows/generate.yaml b/.github/workflows/generate.yaml index b45feec8d74..c138e463ebc 100644 --- a/.github/workflows/generate.yaml +++ b/.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 diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 580a177a874..6a19c17c5c8 100644 --- a/.github/workflows/publish.yaml +++ b/.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 diff --git a/.github/workflows/update_presets.yaml b/.github/workflows/update_presets.yaml index c83218c63f5..54005a6ccb5 100644 --- a/.github/workflows/update_presets.yaml +++ b/.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 diff --git a/.gitignore b/.gitignore index c0129bc824a..82e0611cc51 100644 --- a/.gitignore +++ b/.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 diff --git a/docs/workflows.md b/docs/workflows.md index 22682f25e41..e56e8240170 100644 --- a/docs/workflows.md +++ b/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). diff --git a/melos.yaml b/melos.yaml index 63c27aaec2d..133fa9a6561 100644 --- a/melos.yaml +++ b/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 diff --git a/packages/cookie_store/packages/cookie_store_conformance_tests/pubspec.yaml b/packages/cookie_store/packages/cookie_store_conformance_tests/pubspec.yaml index e38c0348bb3..e155630493f 100644 --- a/packages/cookie_store/packages/cookie_store_conformance_tests/pubspec.yaml +++ b/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 diff --git a/packages/cookie_store/packages/cookie_store_conformance_tests/pubspec_overrides.yaml b/packages/cookie_store/packages/cookie_store_conformance_tests/pubspec_overrides.yaml deleted file mode 100644 index d6f09bca76c..00000000000 --- a/packages/cookie_store/packages/cookie_store_conformance_tests/pubspec_overrides.yaml +++ /dev/null @@ -1,6 +0,0 @@ -# melos_managed_dependency_overrides: cookie_store,neon_lints -dependency_overrides: - cookie_store: - path: ../.. - neon_lints: - path: ../../../neon_lints diff --git a/packages/cookie_store/pubspec.yaml b/packages/cookie_store/pubspec.yaml index 4db810d7c97..8d51e362bdf 100644 --- a/packages/cookie_store/pubspec.yaml +++ b/packages/cookie_store/pubspec.yaml @@ -2,9 +2,10 @@ 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 @@ -12,11 +13,7 @@ dependencies: 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 diff --git a/packages/cookie_store/pubspec_overrides.yaml b/packages/cookie_store/pubspec_overrides.yaml deleted file mode 100644 index 3d66c7094c7..00000000000 --- a/packages/cookie_store/pubspec_overrides.yaml +++ /dev/null @@ -1,6 +0,0 @@ -# melos_managed_dependency_overrides: cookie_store_conformance_tests,neon_lints -dependency_overrides: - cookie_store_conformance_tests: - path: packages/cookie_store_conformance_tests - neon_lints: - path: ../neon_lints diff --git a/packages/dynamite/example/pubspec.yaml b/packages/dynamite/example/pubspec.yaml index a7e00d920d7..96669f1c044 100644 --- a/packages/dynamite/example/pubspec.yaml +++ b/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.3 dynamite: ^0.5.0+1 neon_lints: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_lints + path: ../../neon_lints diff --git a/packages/dynamite/example/pubspec_overrides.yaml b/packages/dynamite/example/pubspec_overrides.yaml deleted file mode 100644 index 0f0bf64f6b1..00000000000 --- a/packages/dynamite/example/pubspec_overrides.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# melos_managed_dependency_overrides: dynamite,dynamite_runtime,neon_lints -dependency_overrides: - dynamite: - path: .. - dynamite_runtime: - path: ../packages/dynamite_runtime - neon_lints: - path: ../../neon_lints diff --git a/packages/dynamite/packages/dynamite_end_to_end_test/pubspec.yaml b/packages/dynamite/packages/dynamite_end_to_end_test/pubspec.yaml index cb128080f37..b1d1da59937 100644 --- a/packages/dynamite/packages/dynamite_end_to_end_test/pubspec.yaml +++ b/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.3 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 + diff --git a/packages/dynamite/packages/dynamite_end_to_end_test/pubspec_overrides.yaml b/packages/dynamite/packages/dynamite_end_to_end_test/pubspec_overrides.yaml deleted file mode 100644 index 9b80778757a..00000000000 --- a/packages/dynamite/packages/dynamite_end_to_end_test/pubspec_overrides.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# melos_managed_dependency_overrides: dynamite,dynamite_runtime,neon_lints -dependency_overrides: - dynamite: - path: ../.. - dynamite_runtime: - path: ../dynamite_runtime - neon_lints: - path: ../../../neon_lints diff --git a/packages/dynamite/packages/dynamite_runtime/pubspec.yaml b/packages/dynamite/packages/dynamite_runtime/pubspec.yaml index 5ea1c0ec789..89ae39dc9bd 100644 --- a/packages/dynamite/packages/dynamite_runtime/pubspec.yaml +++ b/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.14 built_value_generator: ^8.9.3 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: diff --git a/packages/dynamite/packages/dynamite_runtime/pubspec_overrides.yaml b/packages/dynamite/packages/dynamite_runtime/pubspec_overrides.yaml deleted file mode 100644 index 0e5d8123538..00000000000 --- a/packages/dynamite/packages/dynamite_runtime/pubspec_overrides.yaml +++ /dev/null @@ -1,4 +0,0 @@ -# melos_managed_dependency_overrides: neon_lints -dependency_overrides: - neon_lints: - path: ../../../neon_lints diff --git a/packages/dynamite/pubspec.yaml b/packages/dynamite/pubspec.yaml index 9c4e5e135f2..7812a39b0ad 100644 --- a/packages/dynamite/pubspec.yaml +++ b/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.3 built_value_test: ^8.9.3 neon_lints: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_lints - test: ^1.25.8 + path: ../neon_lints + test: ^1.24.0 diff --git a/packages/dynamite/pubspec_overrides.yaml b/packages/dynamite/pubspec_overrides.yaml deleted file mode 100644 index 4abc9fdcbad..00000000000 --- a/packages/dynamite/pubspec_overrides.yaml +++ /dev/null @@ -1,4 +0,0 @@ -# melos_managed_dependency_overrides: neon_lints -dependency_overrides: - neon_lints: - path: ../neon_lints diff --git a/packages/interceptor_http_client/pubspec.yaml b/packages/interceptor_http_client/pubspec.yaml index a6225cf8b4f..8ef3bab34d9 100644 --- a/packages/interceptor_http_client/pubspec.yaml +++ b/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 + diff --git a/packages/interceptor_http_client/pubspec_overrides.yaml b/packages/interceptor_http_client/pubspec_overrides.yaml deleted file mode 100644 index 8c5a77e9f0c..00000000000 --- a/packages/interceptor_http_client/pubspec_overrides.yaml +++ /dev/null @@ -1,6 +0,0 @@ -# melos_managed_dependency_overrides: cookie_store,neon_lints -dependency_overrides: - cookie_store: - path: ../cookie_store - neon_lints: - path: ../neon_lints diff --git a/packages/neon_framework/example/pubspec.yaml b/packages/neon_framework/example/pubspec.yaml index e35eb847675..f2fb7c60a55 100644 --- a/packages/neon_framework/example/pubspec.yaml +++ b/packages/neon_framework/example/pubspec.yaml @@ -1,51 +1,36 @@ name: example version: 1.0.0 publish_to: 'none' +resolution: workspace environment: - sdk: ^3.0.0 + sdk: ^3.5.0 flutter: ^3.27.0 dependencies: built_collection: ^5.0.0 dashboard_app: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_framework/packages/dashboard_app + path: ../packages/dashboard_app files_app: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_framework/packages/files_app + path: ../packages/files_app flutter: sdk: flutter neon_framework: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_framework + path: .. news_app: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_framework/packages/news_app + path: ../packages/news_app notes_app: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_framework/packages/notes_app + path: ../packages/notes_app notifications_app: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_framework/packages/notifications_app + path: ../packages/notifications_app talk_app: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_framework/packages/talk_app + path: ../packages/talk_app vector_graphics: any dev_dependencies: custom_lint: ^0.7.0 neon_lints: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_lints + path: ../../neon_lints vector_graphics_compiler: any flutter: diff --git a/packages/neon_framework/example/pubspec_overrides.yaml b/packages/neon_framework/example/pubspec_overrides.yaml deleted file mode 100644 index 0d99c7ffaa8..00000000000 --- a/packages/neon_framework/example/pubspec_overrides.yaml +++ /dev/null @@ -1,36 +0,0 @@ -# melos_managed_dependency_overrides: account_repository,cookie_store,dashboard_app,dynamite_runtime,files_app,interceptor_http_client,neon_framework,neon_http_client,neon_lints,neon_rich_text,news_app,nextcloud,notes_app,notifications_app,notifications_push_repository,sort_box,talk_app -dependency_overrides: - account_repository: - path: ../packages/account_repository - cookie_store: - path: ../../cookie_store - dashboard_app: - path: ../packages/dashboard_app - dynamite_runtime: - path: ../../dynamite/packages/dynamite_runtime - files_app: - path: ../packages/files_app - interceptor_http_client: - path: ../../interceptor_http_client - neon_framework: - path: .. - neon_http_client: - path: ../packages/neon_http_client - neon_lints: - path: ../../neon_lints - neon_rich_text: - path: ../packages/neon_rich_text - news_app: - path: ../packages/news_app - nextcloud: - path: ../../nextcloud - notes_app: - path: ../packages/notes_app - notifications_app: - path: ../packages/notifications_app - notifications_push_repository: - path: ../packages/notifications_push_repository - sort_box: - path: ../packages/sort_box - talk_app: - path: ../packages/talk_app diff --git a/packages/neon_framework/packages/account_repository/pubspec.yaml b/packages/neon_framework/packages/account_repository/pubspec.yaml index 641c809af73..f36e5fadd72 100644 --- a/packages/neon_framework/packages/account_repository/pubspec.yaml +++ b/packages/neon_framework/packages/account_repository/pubspec.yaml @@ -2,9 +2,10 @@ name: account_repository description: Data repository for the neon account management. version: 0.1.0 publish_to: none +resolution: workspace environment: - sdk: ^3.0.0 + sdk: ^3.5.0 flutter: ^3.27.0 dependencies: @@ -15,13 +16,9 @@ dependencies: http: ^1.2.2 meta: ^1.0.0 neon_framework: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_framework + path: ../.. neon_http_client: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_framework/packages/neon_http_client + path: ../neon_http_client nextcloud: ^8.1.0 rxdart: ^0.28.0 @@ -33,7 +30,5 @@ dev_dependencies: sdk: flutter mocktail: ^1.0.4 neon_lints: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_lints + path: ../../../neon_lints test: ^1.25.2 diff --git a/packages/neon_framework/packages/account_repository/pubspec_overrides.yaml b/packages/neon_framework/packages/account_repository/pubspec_overrides.yaml deleted file mode 100644 index 807b7b55fe5..00000000000 --- a/packages/neon_framework/packages/account_repository/pubspec_overrides.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# melos_managed_dependency_overrides: cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,nextcloud,notifications_push_repository,sort_box -dependency_overrides: - cookie_store: - path: ../../../cookie_store - dynamite_runtime: - path: ../../../dynamite/packages/dynamite_runtime - interceptor_http_client: - path: ../../../interceptor_http_client - neon_framework: - path: ../.. - neon_http_client: - path: ../neon_http_client - neon_lints: - path: ../../../neon_lints - nextcloud: - path: ../../../nextcloud - notifications_push_repository: - path: ../notifications_push_repository - sort_box: - path: ../sort_box diff --git a/packages/neon_framework/packages/dashboard_app/pubspec.yaml b/packages/neon_framework/packages/dashboard_app/pubspec.yaml index bfa4053d760..b66471c59a3 100644 --- a/packages/neon_framework/packages/dashboard_app/pubspec.yaml +++ b/packages/neon_framework/packages/dashboard_app/pubspec.yaml @@ -1,9 +1,10 @@ name: dashboard_app version: 1.0.0 publish_to: 'none' +resolution: workspace environment: - sdk: ^3.0.0 + sdk: ^3.5.0 flutter: ^3.27.0 dependencies: @@ -16,9 +17,7 @@ dependencies: go_router: ^14.0.0 logging: ^1.0.0 neon_framework: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_framework + path: ../.. nextcloud: ^8.1.0 rxdart: ^0.28.0 @@ -31,9 +30,7 @@ dev_dependencies: http: ^1.2.2 mocktail: ^1.0.4 neon_lints: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_lints + path: ../../../neon_lints provider: ^6.1.2 url_launcher_platform_interface: ^2.3.2 vector_graphics_compiler: ^1.1.16 diff --git a/packages/neon_framework/packages/dashboard_app/pubspec_overrides.yaml b/packages/neon_framework/packages/dashboard_app/pubspec_overrides.yaml deleted file mode 100644 index 424806f913b..00000000000 --- a/packages/neon_framework/packages/dashboard_app/pubspec_overrides.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# melos_managed_dependency_overrides: account_repository,cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,nextcloud,notifications_push_repository,sort_box -dependency_overrides: - account_repository: - path: ../account_repository - cookie_store: - path: ../../../cookie_store - dynamite_runtime: - path: ../../../dynamite/packages/dynamite_runtime - interceptor_http_client: - path: ../../../interceptor_http_client - neon_framework: - path: ../.. - neon_http_client: - path: ../neon_http_client - neon_lints: - path: ../../../neon_lints - nextcloud: - path: ../../../nextcloud - notifications_push_repository: - path: ../notifications_push_repository - sort_box: - path: ../sort_box diff --git a/packages/neon_framework/packages/files_app/pubspec.yaml b/packages/neon_framework/packages/files_app/pubspec.yaml index f74428a1fbe..32ddd46deaf 100644 --- a/packages/neon_framework/packages/files_app/pubspec.yaml +++ b/packages/neon_framework/packages/files_app/pubspec.yaml @@ -1,9 +1,10 @@ name: files_app version: 1.0.0 publish_to: 'none' +resolution: workspace environment: - sdk: ^3.0.0 + sdk: ^3.5.0 flutter: ^3.27.0 dependencies: @@ -23,9 +24,7 @@ dependencies: logging: ^1.0.0 meta: ^1.0.0 neon_framework: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_framework + path: ../.. nextcloud: ^8.1.0 open_filex: ^4.4.0 path: ^1.0.0 @@ -41,9 +40,7 @@ dev_dependencies: custom_lint: ^0.7.0 go_router_builder: ^2.7.1 neon_lints: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_lints + path: ../../../neon_lints vector_graphics_compiler: ^1.1.16 flutter: diff --git a/packages/neon_framework/packages/files_app/pubspec_overrides.yaml b/packages/neon_framework/packages/files_app/pubspec_overrides.yaml deleted file mode 100644 index 424806f913b..00000000000 --- a/packages/neon_framework/packages/files_app/pubspec_overrides.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# melos_managed_dependency_overrides: account_repository,cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,nextcloud,notifications_push_repository,sort_box -dependency_overrides: - account_repository: - path: ../account_repository - cookie_store: - path: ../../../cookie_store - dynamite_runtime: - path: ../../../dynamite/packages/dynamite_runtime - interceptor_http_client: - path: ../../../interceptor_http_client - neon_framework: - path: ../.. - neon_http_client: - path: ../neon_http_client - neon_lints: - path: ../../../neon_lints - nextcloud: - path: ../../../nextcloud - notifications_push_repository: - path: ../notifications_push_repository - sort_box: - path: ../sort_box diff --git a/packages/neon_framework/packages/neon_http_client/pubspec.yaml b/packages/neon_framework/packages/neon_http_client/pubspec.yaml index 46e62327936..c9b72026e08 100644 --- a/packages/neon_framework/packages/neon_http_client/pubspec.yaml +++ b/packages/neon_framework/packages/neon_http_client/pubspec.yaml @@ -2,22 +2,19 @@ name: neon_http_client description: A http client for the Neon framework. 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 http_parser: ^4.0.0 interceptor_http_client: - git: - url: https://github.com/nextcloud/neon - path: packages/interceptor_http_client + path: ../../../interceptor_http_client logging: ^1.0.0 meta: ^1.0.0 nextcloud: ^8.1.0 @@ -30,7 +27,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 + diff --git a/packages/neon_framework/packages/neon_http_client/pubspec_overrides.yaml b/packages/neon_framework/packages/neon_http_client/pubspec_overrides.yaml deleted file mode 100644 index e7eb2fb277e..00000000000 --- a/packages/neon_framework/packages/neon_http_client/pubspec_overrides.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# melos_managed_dependency_overrides: cookie_store,dynamite_runtime,interceptor_http_client,neon_lints,nextcloud -dependency_overrides: - cookie_store: - path: ../../../cookie_store - dynamite_runtime: - path: ../../../dynamite/packages/dynamite_runtime - interceptor_http_client: - path: ../../../interceptor_http_client - neon_lints: - path: ../../../neon_lints - nextcloud: - path: ../../../nextcloud diff --git a/packages/neon_framework/packages/neon_rich_text/pubspec.yaml b/packages/neon_framework/packages/neon_rich_text/pubspec.yaml index 60e869f7282..ef09e4acd85 100644 --- a/packages/neon_framework/packages/neon_rich_text/pubspec.yaml +++ b/packages/neon_framework/packages/neon_rich_text/pubspec.yaml @@ -2,9 +2,10 @@ name: neon_rich_text description: A package for rendering rich text from Nextcloud version: 0.1.0 publish_to: none +resolution: workspace environment: - sdk: ^3.0.0 + sdk: ^3.5.0 flutter: ^3.27.0 dependencies: @@ -16,9 +17,7 @@ dependencies: intersperse: ^2.0.0 meta: ^1.0.0 neon_framework: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_framework + path: ../.. nextcloud: ^8.1.0 dev_dependencies: @@ -27,9 +26,7 @@ dev_dependencies: sdk: flutter mocktail: ^1.0.4 neon_lints: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_lints + path: ../../../neon_lints provider: ^6.1.2 rxdart: ^0.28.0 url_launcher_platform_interface: ^2.3.2 diff --git a/packages/neon_framework/packages/neon_rich_text/pubspec_overrides.yaml b/packages/neon_framework/packages/neon_rich_text/pubspec_overrides.yaml deleted file mode 100644 index 424806f913b..00000000000 --- a/packages/neon_framework/packages/neon_rich_text/pubspec_overrides.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# melos_managed_dependency_overrides: account_repository,cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,nextcloud,notifications_push_repository,sort_box -dependency_overrides: - account_repository: - path: ../account_repository - cookie_store: - path: ../../../cookie_store - dynamite_runtime: - path: ../../../dynamite/packages/dynamite_runtime - interceptor_http_client: - path: ../../../interceptor_http_client - neon_framework: - path: ../.. - neon_http_client: - path: ../neon_http_client - neon_lints: - path: ../../../neon_lints - nextcloud: - path: ../../../nextcloud - notifications_push_repository: - path: ../notifications_push_repository - sort_box: - path: ../sort_box diff --git a/packages/neon_framework/packages/neon_storage/pubspec.yaml b/packages/neon_framework/packages/neon_storage/pubspec.yaml index 18caeb2b59a..e0bd6039ab9 100644 --- a/packages/neon_framework/packages/neon_storage/pubspec.yaml +++ b/packages/neon_framework/packages/neon_storage/pubspec.yaml @@ -2,16 +2,15 @@ name: neon_storage description: Storage management and abstractions for the neon framework. 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 logging: ^1.0.0 meta: ^1.0.0 @@ -23,12 +22,9 @@ dependencies: dev_dependencies: cookie_store_conformance_tests: - git: - url: https://github.com/nextcloud/neon - path: packages/cookie_store_conformance_tests + path: ../../../cookie_store/packages/cookie_store_conformance_tests 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 + diff --git a/packages/neon_framework/packages/neon_storage/pubspec_overrides.yaml b/packages/neon_framework/packages/neon_storage/pubspec_overrides.yaml deleted file mode 100644 index fbf277d4fc5..00000000000 --- a/packages/neon_framework/packages/neon_storage/pubspec_overrides.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# melos_managed_dependency_overrides: cookie_store,cookie_store_conformance_tests,dynamite_runtime,neon_lints,nextcloud -dependency_overrides: - cookie_store: - path: ../../../cookie_store - cookie_store_conformance_tests: - path: ../../../cookie_store/packages/cookie_store_conformance_tests - dynamite_runtime: - path: ../../../dynamite/packages/dynamite_runtime - neon_lints: - path: ../../../neon_lints - nextcloud: - path: ../../../nextcloud diff --git a/packages/neon_framework/packages/news_app/pubspec.yaml b/packages/neon_framework/packages/news_app/pubspec.yaml index f5e97a96103..8e9aca7ac2d 100644 --- a/packages/neon_framework/packages/news_app/pubspec.yaml +++ b/packages/neon_framework/packages/news_app/pubspec.yaml @@ -1,9 +1,10 @@ name: news_app version: 1.0.0 publish_to: 'none' +resolution: workspace environment: - sdk: ^3.0.0 + sdk: ^3.5.0 flutter: ^3.27.0 dependencies: @@ -20,9 +21,7 @@ dependencies: intl: ^0.19.0 logging: ^1.0.0 neon_framework: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_framework + path: ../.. nextcloud: ^8.1.0 rxdart: ^0.28.0 share_plus: ^10.0.0 @@ -35,9 +34,7 @@ dev_dependencies: custom_lint: ^0.7.0 go_router_builder: ^2.7.1 neon_lints: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_lints + path: ../../../neon_lints vector_graphics_compiler: ^1.1.16 flutter: diff --git a/packages/neon_framework/packages/news_app/pubspec_overrides.yaml b/packages/neon_framework/packages/news_app/pubspec_overrides.yaml deleted file mode 100644 index 424806f913b..00000000000 --- a/packages/neon_framework/packages/news_app/pubspec_overrides.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# melos_managed_dependency_overrides: account_repository,cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,nextcloud,notifications_push_repository,sort_box -dependency_overrides: - account_repository: - path: ../account_repository - cookie_store: - path: ../../../cookie_store - dynamite_runtime: - path: ../../../dynamite/packages/dynamite_runtime - interceptor_http_client: - path: ../../../interceptor_http_client - neon_framework: - path: ../.. - neon_http_client: - path: ../neon_http_client - neon_lints: - path: ../../../neon_lints - nextcloud: - path: ../../../nextcloud - notifications_push_repository: - path: ../notifications_push_repository - sort_box: - path: ../sort_box diff --git a/packages/neon_framework/packages/notes_app/pubspec.yaml b/packages/neon_framework/packages/notes_app/pubspec.yaml index f3e4ea3944a..ed14f667ab1 100644 --- a/packages/neon_framework/packages/notes_app/pubspec.yaml +++ b/packages/neon_framework/packages/notes_app/pubspec.yaml @@ -1,9 +1,10 @@ name: notes_app version: 1.0.0 publish_to: 'none' +resolution: workspace environment: - sdk: ^3.0.0 + sdk: ^3.5.0 flutter: ^3.27.0 dependencies: @@ -20,9 +21,7 @@ dependencies: intl: ^0.19.0 logging: ^1.0.0 neon_framework: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_framework + path: ../.. nextcloud: ^8.1.0 queue: ^3.0.0 rxdart: ^0.28.0 @@ -34,9 +33,7 @@ dev_dependencies: custom_lint: ^0.7.0 go_router_builder: ^2.7.1 neon_lints: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_lints + path: ../../../neon_lints vector_graphics_compiler: ^1.1.16 flutter: diff --git a/packages/neon_framework/packages/notes_app/pubspec_overrides.yaml b/packages/neon_framework/packages/notes_app/pubspec_overrides.yaml deleted file mode 100644 index 424806f913b..00000000000 --- a/packages/neon_framework/packages/notes_app/pubspec_overrides.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# melos_managed_dependency_overrides: account_repository,cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,nextcloud,notifications_push_repository,sort_box -dependency_overrides: - account_repository: - path: ../account_repository - cookie_store: - path: ../../../cookie_store - dynamite_runtime: - path: ../../../dynamite/packages/dynamite_runtime - interceptor_http_client: - path: ../../../interceptor_http_client - neon_framework: - path: ../.. - neon_http_client: - path: ../neon_http_client - neon_lints: - path: ../../../neon_lints - nextcloud: - path: ../../../nextcloud - notifications_push_repository: - path: ../notifications_push_repository - sort_box: - path: ../sort_box diff --git a/packages/neon_framework/packages/notifications_app/pubspec.yaml b/packages/neon_framework/packages/notifications_app/pubspec.yaml index c6410072afc..8e1b108e308 100644 --- a/packages/neon_framework/packages/notifications_app/pubspec.yaml +++ b/packages/neon_framework/packages/notifications_app/pubspec.yaml @@ -1,9 +1,10 @@ name: notifications_app version: 1.0.0 publish_to: 'none' +resolution: workspace environment: - sdk: ^3.0.0 + sdk: ^3.5.0 flutter: ^3.27.0 dependencies: @@ -19,13 +20,9 @@ dependencies: logging: ^1.0.0 meta: ^1.0.0 neon_framework: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_framework + path: ../.. neon_rich_text: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_framework/packages/neon_rich_text + path: ../neon_rich_text nextcloud: ^8.1.0 rxdart: ^0.28.0 timezone: ^0.10.0 @@ -40,9 +37,7 @@ dev_dependencies: http: ^1.2.2 mocktail: ^1.0.4 neon_lints: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_lints + path: ../../../neon_lints provider: ^6.1.2 url_launcher_platform_interface: ^2.3.2 vector_graphics_compiler: ^1.1.16 diff --git a/packages/neon_framework/packages/notifications_app/pubspec_overrides.yaml b/packages/neon_framework/packages/notifications_app/pubspec_overrides.yaml deleted file mode 100644 index c26f7798841..00000000000 --- a/packages/neon_framework/packages/notifications_app/pubspec_overrides.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# melos_managed_dependency_overrides: account_repository,cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,neon_rich_text,nextcloud,notifications_push_repository,sort_box -dependency_overrides: - account_repository: - path: ../account_repository - cookie_store: - path: ../../../cookie_store - dynamite_runtime: - path: ../../../dynamite/packages/dynamite_runtime - interceptor_http_client: - path: ../../../interceptor_http_client - neon_framework: - path: ../.. - neon_http_client: - path: ../neon_http_client - neon_lints: - path: ../../../neon_lints - neon_rich_text: - path: ../neon_rich_text - nextcloud: - path: ../../../nextcloud - notifications_push_repository: - path: ../notifications_push_repository - sort_box: - path: ../sort_box diff --git a/packages/neon_framework/packages/notifications_push_repository/pubspec.yaml b/packages/neon_framework/packages/notifications_push_repository/pubspec.yaml index adc889c8e22..c2ac742f0b6 100644 --- a/packages/neon_framework/packages/notifications_push_repository/pubspec.yaml +++ b/packages/neon_framework/packages/notifications_push_repository/pubspec.yaml @@ -2,16 +2,15 @@ name: notifications_push_repository description: Data repository for the neon push notifications version: 0.1.0 publish_to: none +resolution: workspace environment: - sdk: ^3.0.0 + sdk: ^3.5.0 flutter: ^3.27.0 dependencies: account_repository: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_framework/packages/account_repository + path: ../account_repository built_collection: ^5.0.0 built_value: ^8.9.2 collection: ^1.0.0 @@ -20,9 +19,7 @@ dependencies: logging: ^1.0.0 meta: ^1.0.0 neon_framework: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_framework + path: ../.. nextcloud: ^8.1.0 rxdart: ^0.28.0 unifiedpush: ^5.0.0 @@ -39,8 +36,6 @@ dev_dependencies: sdk: flutter mocktail: ^1.0.4 neon_lints: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_lints + path: ../../../neon_lints plugin_platform_interface: ^2.1.8 unifiedpush_platform_interface: ^2.0.2 diff --git a/packages/neon_framework/packages/notifications_push_repository/pubspec_overrides.yaml b/packages/neon_framework/packages/notifications_push_repository/pubspec_overrides.yaml deleted file mode 100644 index 0abe46d2bdd..00000000000 --- a/packages/neon_framework/packages/notifications_push_repository/pubspec_overrides.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# melos_managed_dependency_overrides: account_repository,cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,nextcloud,sort_box -dependency_overrides: - account_repository: - path: ../account_repository - cookie_store: - path: ../../../cookie_store - dynamite_runtime: - path: ../../../dynamite/packages/dynamite_runtime - interceptor_http_client: - path: ../../../interceptor_http_client - neon_framework: - path: ../.. - neon_http_client: - path: ../neon_http_client - neon_lints: - path: ../../../neon_lints - nextcloud: - path: ../../../nextcloud - sort_box: - path: ../sort_box diff --git a/packages/neon_framework/packages/sort_box/pubspec.yaml b/packages/neon_framework/packages/sort_box/pubspec.yaml index c97175a3103..db7fcf36b31 100644 --- a/packages/neon_framework/packages/sort_box/pubspec.yaml +++ b/packages/neon_framework/packages/sort_box/pubspec.yaml @@ -1,9 +1,10 @@ name: sort_box version: 1.0.0 publish_to: none +resolution: workspace environment: - sdk: ^3.0.0 + sdk: ^3.5.0 dependencies: built_collection: ^5.0.0 @@ -11,7 +12,6 @@ dependencies: dev_dependencies: neon_lints: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_lints - test: ^1.25.8 + path: ../../../neon_lints + test: ^1.24.0 + diff --git a/packages/neon_framework/packages/sort_box/pubspec_overrides.yaml b/packages/neon_framework/packages/sort_box/pubspec_overrides.yaml deleted file mode 100644 index 0e5d8123538..00000000000 --- a/packages/neon_framework/packages/sort_box/pubspec_overrides.yaml +++ /dev/null @@ -1,4 +0,0 @@ -# melos_managed_dependency_overrides: neon_lints -dependency_overrides: - neon_lints: - path: ../../../neon_lints diff --git a/packages/neon_framework/packages/talk_app/pubspec.yaml b/packages/neon_framework/packages/talk_app/pubspec.yaml index ecce3f07351..3795368444f 100644 --- a/packages/neon_framework/packages/talk_app/pubspec.yaml +++ b/packages/neon_framework/packages/talk_app/pubspec.yaml @@ -1,9 +1,10 @@ name: talk_app version: 1.0.0 publish_to: 'none' +resolution: workspace environment: - sdk: ^3.0.0 + sdk: ^3.5.0 flutter: ^3.27.0 dependencies: @@ -21,13 +22,9 @@ dependencies: logging: ^1.0.0 meta: ^1.0.0 neon_framework: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_framework + path: ../.. neon_rich_text: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_framework/packages/neon_rich_text + path: ../neon_rich_text nextcloud: ^8.1.0 rxdart: ^0.28.0 timezone: ^0.10.0 @@ -43,9 +40,7 @@ dev_dependencies: http: ^1.2.2 mocktail: ^1.0.4 neon_lints: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_lints + path: ../../../neon_lints provider: ^6.1.2 url_launcher_platform_interface: ^2.3.2 vector_graphics_compiler: ^1.1.16 diff --git a/packages/neon_framework/packages/talk_app/pubspec_overrides.yaml b/packages/neon_framework/packages/talk_app/pubspec_overrides.yaml deleted file mode 100644 index c26f7798841..00000000000 --- a/packages/neon_framework/packages/talk_app/pubspec_overrides.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# melos_managed_dependency_overrides: account_repository,cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,neon_rich_text,nextcloud,notifications_push_repository,sort_box -dependency_overrides: - account_repository: - path: ../account_repository - cookie_store: - path: ../../../cookie_store - dynamite_runtime: - path: ../../../dynamite/packages/dynamite_runtime - interceptor_http_client: - path: ../../../interceptor_http_client - neon_framework: - path: ../.. - neon_http_client: - path: ../neon_http_client - neon_lints: - path: ../../../neon_lints - neon_rich_text: - path: ../neon_rich_text - nextcloud: - path: ../../../nextcloud - notifications_push_repository: - path: ../notifications_push_repository - sort_box: - path: ../sort_box diff --git a/packages/neon_framework/pubspec.yaml b/packages/neon_framework/pubspec.yaml index 504ba3a4f76..56de66c7e35 100644 --- a/packages/neon_framework/pubspec.yaml +++ b/packages/neon_framework/pubspec.yaml @@ -1,25 +1,22 @@ name: neon_framework version: 1.0.0 publish_to: 'none' +resolution: workspace environment: - sdk: ^3.0.0 + sdk: ^3.5.0 flutter: ^3.27.0 dependencies: account_repository: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_framework/packages/account_repository + path: packages/account_repository bloc: ^8.1.4 bloc_concurrency: ^0.2.5 built_collection: ^5.0.0 built_value: ^8.9.0 collection: ^1.0.0 cookie_store: - git: - url: https://github.com/nextcloud/neon - path: packages/cookie_store + path: ../cookie_store crypto: ^3.0.0 cupertino_icons: ^1.0.0 # Do not remove this, is it needed on iOS/macOS. It will not include icons on other platforms because Apple forbids it. dynamic_color: ^1.0.0 @@ -45,14 +42,10 @@ dependencies: logging: ^1.0.0 meta: ^1.0.0 neon_http_client: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_http_client + path: packages/neon_http_client nextcloud: ^8.1.0 notifications_push_repository: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_framework/packages/notifications_push_repository + path: packages/notifications_push_repository package_info_plus: ^8.0.0 path: ^1.0.0 path_provider: ^2.1.0 @@ -63,9 +56,7 @@ dependencies: scrollable_positioned_list: ^0.3.0 shared_preferences_platform_interface: ^2.3.2 sort_box: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_framework/packages/sort_box + path: packages/sort_box sqflite: ^2.3.0 sqflite_common_ffi: ^2.3.2 sqflite_common_ffi_web: ^0.4.2+3 @@ -83,9 +74,7 @@ dev_dependencies: built_value_generator: ^8.9.3 code_builder: ^4.10.1 cookie_store_conformance_tests: - git: - url: https://github.com/nextcloud/neon - path: packages/cookie_store_conformance_tests + path: ../cookie_store/packages/cookie_store_conformance_tests crypton: ^2.2.1 custom_lint: ^0.7.0 dart_style: ^2.3.7 @@ -95,9 +84,7 @@ dev_dependencies: go_router_builder: ^2.7.1 mocktail: ^1.0.4 neon_lints: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_lints + path: ../neon_lints package_info_plus_platform_interface: ^3.0.2 permission_handler_platform_interface: ^4.2.3 plugin_platform_interface: ^2.1.8 diff --git a/packages/neon_framework/pubspec_overrides.yaml b/packages/neon_framework/pubspec_overrides.yaml deleted file mode 100644 index 741f5dd8de6..00000000000 --- a/packages/neon_framework/pubspec_overrides.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# melos_managed_dependency_overrides: account_repository,cookie_store,cookie_store_conformance_tests,dynamite_runtime,interceptor_http_client,neon_http_client,neon_lints,nextcloud,notifications_push_repository,sort_box -dependency_overrides: - account_repository: - path: packages/account_repository - cookie_store: - path: ../cookie_store - cookie_store_conformance_tests: - path: ../cookie_store/packages/cookie_store_conformance_tests - dynamite_runtime: - path: ../dynamite/packages/dynamite_runtime - interceptor_http_client: - path: ../interceptor_http_client - neon_http_client: - path: packages/neon_http_client - neon_lints: - path: ../neon_lints - nextcloud: - path: ../nextcloud - notifications_push_repository: - path: packages/notifications_push_repository - sort_box: - path: packages/sort_box diff --git a/packages/neon_lints/example/pubspec.yaml b/packages/neon_lints/example/pubspec.yaml index b6cdcf00e9c..395a04076d3 100644 --- a/packages/neon_lints/example/pubspec.yaml +++ b/packages/neon_lints/example/pubspec.yaml @@ -1,8 +1,9 @@ name: neon_lints_test publish_to: none +resolution: workspace environment: - sdk: ^3.0.0 + sdk: ^3.5.0 flutter: ^3.27.0 dependencies: @@ -16,6 +17,4 @@ dev_dependencies: sdk: flutter meta: ^1.11.0 neon_lints: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_lints + path: .. diff --git a/packages/neon_lints/example/pubspec_overrides.yaml b/packages/neon_lints/example/pubspec_overrides.yaml deleted file mode 100644 index 117e019f428..00000000000 --- a/packages/neon_lints/example/pubspec_overrides.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# melos_managed_dependency_overrides: dynamite_runtime,neon_lints,nextcloud -dependency_overrides: - dynamite_runtime: - path: ../../dynamite/packages/dynamite_runtime - neon_lints: - path: .. - nextcloud: - path: ../../nextcloud diff --git a/packages/neon_lints/pubspec.yaml b/packages/neon_lints/pubspec.yaml index 268a4f11560..ad3d1a8e1f9 100644 --- a/packages/neon_lints/pubspec.yaml +++ b/packages/neon_lints/pubspec.yaml @@ -2,9 +2,10 @@ name: neon_lints description: Linting package used in the nextcloud-neon project version: 1.0.0 publish_to: none +resolution: workspace environment: - sdk: ^3.0.0 + sdk: ^3.5.0 dependencies: analyzer: ^6.4.1 diff --git a/packages/nextcloud/lib/src/models/version_check.dart b/packages/nextcloud/lib/src/models/version_check.dart index 11b2888594a..317fd3aacea 100644 --- a/packages/nextcloud/lib/src/models/version_check.dart +++ b/packages/nextcloud/lib/src/models/version_check.dart @@ -27,7 +27,7 @@ class VersionCheck { /// Only one of the [versions] has to be supported to return `true`. bool get isSupported { if (_isSupportedOverride != null) { - return _isSupportedOverride!; + return _isSupportedOverride; } if (versions == null || versions!.isEmpty) { diff --git a/packages/nextcloud/packages/nextcloud_test/pubspec.yaml b/packages/nextcloud/packages/nextcloud_test/pubspec.yaml index 6acb725e8de..24c6e483c7a 100644 --- a/packages/nextcloud/packages/nextcloud_test/pubspec.yaml +++ b/packages/nextcloud/packages/nextcloud_test/pubspec.yaml @@ -1,23 +1,20 @@ name: nextcloud_test version: 1.0.0 publish_to: none +resolution: workspace environment: - sdk: ^3.0.0 + sdk: ^3.5.0 dependencies: built_collection: ^5.1.1 collection: ^1.0.0 cookie_store: - git: - url: https://github.com/nextcloud/neon - path: packages/cookie_store + path: ../../../cookie_store glob: ^2.1.2 http: ^1.2.0 interceptor_http_client: - git: - url: https://github.com/nextcloud/neon - path: packages/interceptor_http_client + path: ../../../interceptor_http_client matcher: ^0.12.0 meta: ^1.0.0 nextcloud: ^8.1.0 @@ -31,6 +28,4 @@ dependencies: dev_dependencies: neon_lints: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_lints + path: ../../../neon_lints diff --git a/packages/nextcloud/packages/nextcloud_test/pubspec_overrides.yaml b/packages/nextcloud/packages/nextcloud_test/pubspec_overrides.yaml deleted file mode 100644 index cfe67bc0b7e..00000000000 --- a/packages/nextcloud/packages/nextcloud_test/pubspec_overrides.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# melos_managed_dependency_overrides: cookie_store,dynamite_runtime,interceptor_http_client,neon_lints,nextcloud -dependency_overrides: - cookie_store: - path: ../../../cookie_store - dynamite_runtime: - path: ../../../dynamite/packages/dynamite_runtime - interceptor_http_client: - path: ../../../interceptor_http_client - neon_lints: - path: ../../../neon_lints - nextcloud: - path: ../.. diff --git a/packages/nextcloud/packages/nextcloud_test_presets/pubspec.yaml b/packages/nextcloud/packages/nextcloud_test_presets/pubspec.yaml index ee7c9becddc..d26e3f0ba5b 100644 --- a/packages/nextcloud/packages/nextcloud_test_presets/pubspec.yaml +++ b/packages/nextcloud/packages/nextcloud_test_presets/pubspec.yaml @@ -1,9 +1,10 @@ name: nextcloud_test_presets version: 1.0.0 publish_to: none +resolution: workspace environment: - sdk: ^3.0.0 + sdk: ^3.5.0 dependencies: crypto: ^3.0.0 @@ -14,6 +15,4 @@ dependencies: dev_dependencies: neon_lints: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_lints + path: ../../../neon_lints diff --git a/packages/nextcloud/packages/nextcloud_test_presets/pubspec_overrides.yaml b/packages/nextcloud/packages/nextcloud_test_presets/pubspec_overrides.yaml deleted file mode 100644 index 7a4dc9c79cb..00000000000 --- a/packages/nextcloud/packages/nextcloud_test_presets/pubspec_overrides.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# melos_managed_dependency_overrides: dynamite_runtime,neon_lints,nextcloud -dependency_overrides: - dynamite_runtime: - path: ../../../dynamite/packages/dynamite_runtime - neon_lints: - path: ../../../neon_lints - nextcloud: - path: ../.. diff --git a/packages/nextcloud/pubspec.yaml b/packages/nextcloud/pubspec.yaml index 2acec7dbb5e..48171337b5a 100644 --- a/packages/nextcloud/pubspec.yaml +++ b/packages/nextcloud/pubspec.yaml @@ -7,9 +7,10 @@ topics: - nextcloud - openapi - webdav +resolution: workspace environment: - sdk: ^3.0.0 + sdk: ^3.5.0 dependencies: built_collection: ^5.0.0 @@ -44,17 +45,13 @@ dev_dependencies: ref: 76512c4cbf987361421030349fd1946e63e33359 mocktail: ^1.0.4 neon_lints: - git: - url: https://github.com/nextcloud/neon - path: packages/neon_lints + path: ../neon_lints nextcloud_test: - git: - url: https://github.com/nextcloud/neon - path: packages/nextcloud/packages/nextcloud_test - path: ^1.9.1 + path: packages/nextcloud_test + path: ^1.9.0 process_run: ^1.2.2 - test: ^1.25.8 - test_api: ^0.7.3 + test: ^1.25.7 + test_api: ^0.7.2 xml_serializable: ^2.5.3 platforms: diff --git a/packages/nextcloud/pubspec_overrides.yaml b/packages/nextcloud/pubspec_overrides.yaml deleted file mode 100644 index d31cf22a4a6..00000000000 --- a/packages/nextcloud/pubspec_overrides.yaml +++ /dev/null @@ -1,14 +0,0 @@ -# melos_managed_dependency_overrides: cookie_store,dynamite,dynamite_runtime,interceptor_http_client,neon_lints,nextcloud_test -dependency_overrides: - cookie_store: - path: ../cookie_store - dynamite: - path: ../dynamite - dynamite_runtime: - path: ../dynamite/packages/dynamite_runtime - interceptor_http_client: - path: ../interceptor_http_client - neon_lints: - path: ../neon_lints - nextcloud_test: - path: packages/nextcloud_test diff --git a/packages/neon_framework/example/pubspec.lock b/pubspec.lock similarity index 81% rename from packages/neon_framework/example/pubspec.lock rename to pubspec.lock index 53635fe8e1c..249658a1f77 100644 --- a/packages/neon_framework/example/pubspec.lock +++ b/pubspec.lock @@ -14,13 +14,6 @@ packages: description: dart source: sdk version: "0.3.3" - account_repository: - dependency: "direct overridden" - description: - path: "../packages/account_repository" - relative: true - source: path - version: "0.1.0" analyzer: dependency: transitive description: @@ -37,6 +30,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.11.3" + ansi_styles: + dependency: transitive + description: + name: ansi_styles + sha256: "9c656cc12b3c27b17dd982b2cc5c0cfdfbdabd7bc8f3ae5e8542d9867b47ce8a" + url: "https://pub.dev" + source: hosted + version: "0.3.2+1" ansicolor: dependency: transitive description: @@ -93,6 +94,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.2.5" + bloc_test: + dependency: transitive + description: + name: bloc_test + sha256: "165a6ec950d9252ebe36dc5335f2e6eb13055f33d56db0eeb7642768849b43d2" + url: "https://pub.dev" + source: hosted + version: "9.1.7" boolean_selector: dependency: transitive description: @@ -101,8 +110,56 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.1" + build: + dependency: transitive + description: + name: build + sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + build_config: + dependency: transitive + description: + name: build_config + sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1 + url: "https://pub.dev" + source: hosted + version: "1.1.1" + build_daemon: + dependency: transitive + description: + name: build_daemon + sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9" + url: "https://pub.dev" + source: hosted + version: "4.0.2" + build_resolvers: + dependency: transitive + description: + name: build_resolvers + sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a" + url: "https://pub.dev" + source: hosted + version: "2.4.2" + build_runner: + dependency: transitive + description: + name: build_runner + sha256: "74691599a5bc750dc96a6b4bfd48f7d9d66453eab04c7f4063134800d6a5c573" + url: "https://pub.dev" + source: hosted + version: "2.4.14" + build_runner_core: + dependency: transitive + description: + name: build_runner_core + sha256: "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021" + url: "https://pub.dev" + source: hosted + version: "8.0.0" built_collection: - dependency: "direct main" + dependency: transitive description: name: built_collection sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100" @@ -117,6 +174,22 @@ packages: url: "https://pub.dev" source: hosted version: "8.9.3" + built_value_generator: + dependency: transitive + description: + name: built_value_generator + sha256: "6ba3effca656e7f88102142e7d62b71373504d654132ca2895896b3a7013e567" + url: "https://pub.dev" + source: hosted + version: "8.9.3" + built_value_test: + dependency: transitive + description: + name: built_value_test + sha256: "299a23fb62de21aae4af4e29fcf2cf5240b813e0bcbbc79756906fa119523309" + url: "https://pub.dev" + source: hosted + version: "8.9.3" camera: dependency: transitive description: @@ -165,6 +238,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.0" + charcode: + dependency: transitive + description: + name: charcode + sha256: fb0f1107cac15a5ea6ef0a6ef71a807b9e4267c713bb93e00e92d737cc8dbd8a + url: "https://pub.dev" + source: hosted + version: "1.4.0" checked_yaml: dependency: transitive description: @@ -181,6 +262,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.1.0" + cli_launcher: + dependency: transitive + description: + name: cli_launcher + sha256: "5e7e0282b79e8642edd6510ee468ae2976d847a0a29b3916e85f5fa1bfe24005" + url: "https://pub.dev" + source: hosted + version: "0.3.1" cli_util: dependency: transitive description: @@ -197,6 +286,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.1" + code_builder: + dependency: transitive + description: + name: code_builder + sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e" + url: "https://pub.dev" + source: hosted + version: "4.10.1" collection: dependency: transitive description: @@ -205,6 +302,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.19.0" + conventional_commit: + dependency: transitive + description: + name: conventional_commit + sha256: dec15ad1118f029c618651a4359eb9135d8b88f761aa24e4016d061cd45948f2 + url: "https://pub.dev" + source: hosted + version: "0.6.0+1" convert: dependency: transitive description: @@ -213,13 +318,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.2" - cookie_store: - dependency: "direct overridden" + coverage: + dependency: transitive description: - path: "../../cookie_store" - relative: true - source: path - version: "0.1.0" + name: coverage + sha256: e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43 + url: "https://pub.dev" + source: hosted + version: "1.11.1" cross_file: dependency: transitive description: @@ -261,7 +367,7 @@ packages: source: hosted version: "1.0.8" custom_lint: - dependency: "direct dev" + dependency: transitive description: name: custom_lint sha256: "3486c470bb93313a9417f926c7dd694a2e349220992d7b9d14534dc49c15bba9" @@ -300,13 +406,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.3.7" - dashboard_app: - dependency: "direct main" - description: - path: "../packages/dashboard_app" - relative: true - source: path - version: "1.0.0" dbus: dependency: transitive description: @@ -323,6 +422,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.1+4" + diff_match_patch: + dependency: transitive + description: + name: diff_match_patch + sha256: "2efc9e6e8f449d0abe15be240e2c2a3bcd977c8d126cfd70598aee60af35c0a4" + url: "https://pub.dev" + source: hosted + version: "0.4.1" dynamic_color: dependency: transitive description: @@ -331,13 +438,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.7.0" - dynamite_runtime: - dependency: "direct overridden" - description: - path: "../../dynamite/packages/dynamite_runtime" - relative: true - source: path - version: "0.5.0+1" equatable: dependency: transitive description: @@ -410,13 +510,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.9.3+3" - files_app: - dependency: "direct main" - description: - path: "../packages/files_app" - relative: true - source: path - version: "1.0.0" filesize: dependency: transitive description: @@ -434,7 +527,7 @@ packages: source: hosted version: "1.1.1" flutter: - dependency: "direct main" + dependency: transitive description: flutter source: sdk version: "0.0.0" @@ -613,6 +706,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.4.4" + frontend_server_client: + dependency: transitive + description: + name: frontend_server_client + sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694 + url: "https://pub.dev" + source: hosted + version: "4.0.0" glob: dependency: transitive description: @@ -629,6 +730,22 @@ packages: url: "https://pub.dev" source: hosted version: "14.6.2" + go_router_builder: + dependency: transitive + description: + name: go_router_builder + sha256: "3425b72dea69209754ac6b71b4da34165dcd4d4a2934713029945709a246427a" + url: "https://pub.dev" + source: hosted + version: "2.7.1" + graphs: + dependency: transitive + description: + name: graphs + sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0" + url: "https://pub.dev" + source: hosted + version: "2.3.2" hotreloader: dependency: transitive description: @@ -653,6 +770,23 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.2" + http_client_conformance_tests: + dependency: transitive + description: + path: "pkgs/http_client_conformance_tests" + ref: "76512c4cbf987361421030349fd1946e63e33359" + resolved-ref: "76512c4cbf987361421030349fd1946e63e33359" + url: "https://github.com/dart-lang/http" + source: git + version: "0.0.0" + http_multi_server: + dependency: transitive + description: + name: http_multi_server + sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b" + url: "https://pub.dev" + source: hosted + version: "3.2.1" http_parser: dependency: transitive description: @@ -733,13 +867,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.2.1+1" - interceptor_http_client: - dependency: "direct overridden" - description: - path: "../../interceptor_http_client" - relative: true - source: path - version: "0.1.0" intersperse: dependency: transitive description: @@ -756,6 +883,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.19.0" + io: + dependency: transitive + description: + name: io + sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b + url: "https://pub.dev" + source: hosted + version: "1.0.5" js: dependency: transitive description: @@ -764,6 +899,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.7.1" + json2yaml: + dependency: transitive + description: + name: json2yaml + sha256: da94630fbc56079426fdd167ae58373286f603371075b69bf46d848d63ba3e51 + url: "https://pub.dev" + source: hosted + version: "3.0.1" json_annotation: dependency: transitive description: @@ -796,6 +939,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.1" + lint_maker: + dependency: transitive + description: + name: lint_maker + sha256: "98a141dfe38f0da28a90ff820552c74bfbb49ae57fe4ebd2dda1b4581b5d31d1" + url: "https://pub.dev" + source: hosted + version: "0.2.3" list_counter: dependency: transitive description: @@ -844,6 +995,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.11.1" + melos: + dependency: "direct dev" + description: + name: melos + sha256: a62abfa8c7826cec927f8585572bb9adf591be152150494d879ca2c75118809d + url: "https://pub.dev" + source: hosted + version: "6.2.0" meta: dependency: transitive description: @@ -860,34 +1019,22 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.0" - neon_framework: - dependency: "direct main" - description: - path: ".." - relative: true - source: path - version: "1.0.0" - neon_http_client: - dependency: "direct overridden" - description: - path: "../packages/neon_http_client" - relative: true - source: path - version: "0.1.0" - neon_lints: - dependency: "direct dev" + mocktail: + dependency: transitive description: - path: "../../neon_lints" - relative: true - source: path - version: "1.0.0" - neon_rich_text: - dependency: "direct overridden" + name: mocktail + sha256: "890df3f9688106f25755f26b1c60589a92b3ab91a22b8b224947ad041bf172d8" + url: "https://pub.dev" + source: hosted + version: "1.0.4" + mustache_template: + dependency: transitive description: - path: "../packages/neon_rich_text" - relative: true - source: path - version: "0.1.0" + name: mustache_template + sha256: a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c + url: "https://pub.dev" + source: hosted + version: "2.0.0" nested: dependency: transitive description: @@ -896,41 +1043,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.0" - news_app: - dependency: "direct main" - description: - path: "../packages/news_app" - relative: true - source: path - version: "1.0.0" - nextcloud: - dependency: "direct overridden" - description: - path: "../../nextcloud" - relative: true - source: path - version: "8.1.0" - notes_app: - dependency: "direct main" - description: - path: "../packages/notes_app" - relative: true - source: path - version: "1.0.0" - notifications_app: - dependency: "direct main" - description: - path: "../packages/notifications_app" - relative: true - source: path - version: "1.0.0" - notifications_push_repository: - dependency: "direct overridden" + node_preamble: + dependency: transitive description: - path: "../packages/notifications_push_repository" - relative: true - source: path - version: "0.1.0" + name: node_preamble + sha256: "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db" + url: "https://pub.dev" + source: hosted + version: "2.0.2" open_filex: dependency: transitive description: @@ -1155,6 +1275,14 @@ packages: url: "https://pub.dev" source: hosted version: "6.0.1" + process: + dependency: transitive + description: + name: process + sha256: "107d8be718f120bbba9dcd1e95e3bd325b1b4a4f07db64154635ba03f2567a0d" + url: "https://pub.dev" + source: hosted + version: "5.0.3" process_run: dependency: transitive description: @@ -1163,6 +1291,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.2+1" + prompts: + dependency: transitive + description: + name: prompts + sha256: "3773b845e85a849f01e793c4fc18a45d52d7783b4cb6c0569fad19f9d0a774a1" + url: "https://pub.dev" + source: hosted + version: "2.0.0" provider: dependency: transitive description: @@ -1179,6 +1315,22 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.5" + pub_updater: + dependency: transitive + description: + name: pub_updater + sha256: "54e8dc865349059ebe7f163d6acce7c89eb958b8047e6d6e80ce93b13d7c9e60" + url: "https://pub.dev" + source: hosted + version: "0.4.0" + pubspec: + dependency: transitive + description: + name: pubspec + sha256: f534a50a2b4d48dc3bc0ec147c8bd7c304280fff23b153f3f11803c4d49d927e + url: "https://pub.dev" + source: hosted + version: "2.3.0" pubspec_parse: dependency: transitive description: @@ -1235,6 +1387,22 @@ packages: url: "https://pub.dev" source: hosted version: "3.2.2" + recase: + dependency: transitive + description: + name: recase + sha256: e4eb4ec2dcdee52dcf99cb4ceabaffc631d7424ee55e56f280bc039737f89213 + url: "https://pub.dev" + source: hosted + version: "4.1.0" + rfc_6901: + dependency: transitive + description: + name: rfc_6901 + sha256: df1bbfa3d023009598f19636d6114c6ac1e0b7bb7bf6a260f0e6e6ce91416820 + url: "https://pub.dev" + source: hosted + version: "0.2.0" rxdart: dependency: transitive description: @@ -1363,18 +1531,75 @@ packages: url: "https://pub.dev" source: hosted version: "2.4.1" + shelf: + dependency: transitive + description: + name: shelf + sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4 + url: "https://pub.dev" + source: hosted + version: "1.4.1" + shelf_packages_handler: + dependency: transitive + description: + name: shelf_packages_handler + sha256: "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e" + url: "https://pub.dev" + source: hosted + version: "3.0.2" + shelf_static: + dependency: transitive + description: + name: shelf_static + sha256: c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3 + url: "https://pub.dev" + source: hosted + version: "1.1.3" + shelf_web_socket: + dependency: transitive + description: + name: shelf_web_socket + sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67 + url: "https://pub.dev" + source: hosted + version: "2.0.1" sky_engine: dependency: transitive description: flutter source: sdk version: "0.0.0" - sort_box: - dependency: "direct overridden" + source_gen: + dependency: transitive description: - path: "../packages/sort_box" - relative: true - source: path - version: "1.0.0" + name: source_gen + sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832" + url: "https://pub.dev" + source: hosted + version: "1.5.0" + source_helper: + dependency: transitive + description: + name: source_helper + sha256: "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd" + url: "https://pub.dev" + source: hosted + version: "1.3.4" + source_map_stack_trace: + dependency: transitive + description: + name: source_map_stack_trace + sha256: c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b + url: "https://pub.dev" + source: hosted + version: "2.1.2" + source_maps: + dependency: transitive + description: + name: source_maps + sha256: "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812" + url: "https://pub.dev" + source: hosted + version: "0.10.13" source_span: dependency: transitive description: @@ -1479,6 +1704,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.1" + string_normalizer: + dependency: transitive + description: + name: string_normalizer + sha256: "7f4eae9d44acb273d7d316e384952556a687ae61ab43bb5e7161d24e3440ffe2" + url: "https://pub.dev" + source: hosted + version: "0.3.4" string_scanner: dependency: transitive description: @@ -1495,13 +1728,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.3.0+3" - talk_app: - dependency: "direct main" - description: - path: "../packages/talk_app" - relative: true - source: path - version: "1.0.0" term_glyph: dependency: transitive description: @@ -1510,6 +1736,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.1" + test: + dependency: transitive + description: + name: test + sha256: "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f" + url: "https://pub.dev" + source: hosted + version: "1.25.8" test_api: dependency: transitive description: @@ -1518,6 +1752,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.7.3" + test_core: + dependency: transitive + description: + name: test_core + sha256: "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d" + url: "https://pub.dev" + source: hosted + version: "0.6.5" timezone: dependency: transitive description: @@ -1526,6 +1768,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.10.0" + timing: + dependency: transitive + description: + name: timing + sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe" + url: "https://pub.dev" + source: hosted + version: "1.0.2" typed_data: dependency: transitive description: @@ -1647,7 +1897,7 @@ packages: source: hosted version: "4.5.1" vector_graphics: - dependency: "direct main" + dependency: transitive description: name: vector_graphics sha256: "27d5fefe86fb9aace4a9f8375b56b3c292b64d8c04510df230f849850d912cb7" @@ -1663,7 +1913,7 @@ packages: source: hosted version: "1.1.12" vector_graphics_compiler: - dependency: "direct dev" + dependency: transitive description: name: vector_graphics_compiler sha256: "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad" @@ -1726,6 +1976,30 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" + web_socket: + dependency: transitive + description: + name: web_socket + sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83" + url: "https://pub.dev" + source: hosted + version: "0.1.6" + web_socket_channel: + dependency: transitive + description: + name: web_socket_channel + sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f" + url: "https://pub.dev" + source: hosted + version: "3.0.1" + webkit_inspection_protocol: + dependency: transitive + description: + name: webkit_inspection_protocol + sha256: "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572" + url: "https://pub.dev" + source: hosted + version: "1.2.1" webview_flutter: dependency: transitive description: @@ -1798,6 +2072,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.4.0" + xml_serializable: + dependency: transitive + description: + name: xml_serializable + sha256: f03e60e1fa2afa1ed6bca9cce1ed4f2ca735dba7c1c9bd99902c77932863bf99 + url: "https://pub.dev" + source: hosted + version: "2.5.3" yaml: dependency: transitive description: @@ -1806,6 +2088,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.3" + yaml_edit: + dependency: transitive + description: + name: yaml_edit + sha256: fb38626579fb345ad00e674e2af3a5c9b0cc4b9bfb8fd7f7ff322c7c9e62aef5 + url: "https://pub.dev" + source: hosted + version: "2.2.2" sdks: - dart: ">=3.5.0 <4.0.0" + dart: ">=3.6.0 <4.0.0" flutter: ">=3.27.0" diff --git a/pubspec.yaml b/pubspec.yaml index a7b0ce03ad5..6f65f3a5cfa 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,11 +2,36 @@ name: neon_workspace publish_to: none environment: - sdk: ^3.0.0 + sdk: ^3.5.0 + flutter: ^3.27.0 + +workspace: + - packages/cookie_store + - packages/cookie_store/packages/cookie_store_conformance_tests + - packages/dynamite + - packages/dynamite/example + - packages/dynamite/packages/dynamite_end_to_end_test + - packages/dynamite/packages/dynamite_runtime + - packages/interceptor_http_client + - packages/neon_framework + - packages/neon_framework/example + - packages/neon_framework/packages/account_repository + - packages/neon_framework/packages/dashboard_app + - packages/neon_framework/packages/files_app + - packages/neon_framework/packages/neon_http_client + - packages/neon_framework/packages/neon_rich_text + - packages/neon_framework/packages/neon_storage + - packages/neon_framework/packages/news_app + - packages/neon_framework/packages/notes_app + - packages/neon_framework/packages/notifications_app + - packages/neon_framework/packages/notifications_push_repository + - packages/neon_framework/packages/sort_box + - packages/neon_framework/packages/talk_app + - packages/neon_lints + - packages/neon_lints/example + - packages/nextcloud + - packages/nextcloud/packages/nextcloud_test + - packages/nextcloud/packages/nextcloud_test_presets dev_dependencies: - commitlint_cli: ^0.8.1 - fvm: ^3.2.1 - melos: ^6.0.0 - custom_lint: ^0.7.0 - coverage: ^1.11.1 + melos: 6.2.0 diff --git a/tool/setup.sh b/tool/setup.sh index fd8b0a67e62..8fb477865f7 100755 --- a/tool/setup.sh +++ b/tool/setup.sh @@ -2,16 +2,15 @@ set -euxo pipefail cd "$(dirname "$0")/.." -for package in $(yq -r ".dev_dependencies | keys | .[]" pubspec.yaml); do - version="$(yq -r ".dev_dependencies.$package" pubspec.yaml)" - dart pub global activate "$package" "$version" -done +dart pub global activate coverage 1.11.1 +dart pub global activate custom_lint 0.7.0 +dart pub global activate fvm 3.2.1 +dart pub global activate melos 6.2.0 + echo "y" | fvm install if [ ! -v GITHUB_REPOSITORY ]; then fvm flutter precache - melos bootstrap -else - melos exec -c1 -- flutter pub get - melos run format fi + +fvm flutter pub get