Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update test #2680

Merged
merged 3 commits into from
Mar 13, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 36 additions & 24 deletions .github/workflows/dependency_overrides.patch
Original file line number Diff line number Diff line change
@@ -1,32 +1,36 @@
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:
@@ -20,3 +20,8 @@ dev_dependencies:
url: https://github.com/nextcloud/neon
path: packages/neon_lints
test: ^1.25.8
test: ^1.25.15
+
+dependency_overrides:
+ frontend_server_client: ^4.0.0
+ shelf_web_socket: ^2.0.0
+ web_socket_channel: ^3.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 @@
@@ -1,6 +1,9 @@
-# melos_managed_dependency_overrides: cookie_store_conformance_tests,neon_lints
+# melos_managed_dependency_overrides: cookie_store_conformance_tests,neon_lints,frontend_server_client
+# melos_managed_dependency_overrides: cookie_store_conformance_tests,neon_lints,frontend_server_client,shelf_web_socket,web_socket_channel
dependency_overrides:
cookie_store_conformance_tests:
path: packages/cookie_store_conformance_tests
neon_lints:
path: ../neon_lints
+ frontend_server_client: ^4.0.0
+ shelf_web_socket: ^2.0.0
+ web_socket_channel: ^3.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
test: ^1.25.15
+
+dependency_overrides:
+ frontend_server_client: ^4.0.0
@@ -51,7 +55,7 @@ diff --git a/packages/dynamite/packages/dynamite_runtime/pubspec.yaml b/packages
+++ b/packages/dynamite/packages/dynamite_runtime/pubspec.yaml
@@ -29,6 +29,9 @@ dev_dependencies:
path: packages/neon_lints
test: ^1.25.8
test: ^1.25.15

+dependency_overrides:
+ frontend_server_client: ^4.0.0
@@ -75,7 +79,7 @@ diff --git 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
test: ^1.25.15
+
+dependency_overrides:
+ frontend_server_client: ^4.0.0
@@ -94,34 +98,38 @@ diff --git a/packages/dynamite/pubspec_overrides.yaml b/packages/dynamite/pubspe
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:
@@ -27,3 +27,9 @@ dev_dependencies:
url: https://github.com/nextcloud/neon
path: packages/neon_lints
test: ^1.25.8
test: ^1.25.15
+
+dependency_overrides:
+ frontend_server_client: ^4.0.0
+ shelf_web_socket: ^2.0.0
+ web: ">=0.5.0 <2.0.0"
+ web_socket_channel: ^3.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 @@
@@ -1,6 +1,10 @@
-# melos_managed_dependency_overrides: cookie_store,neon_lints
+# melos_managed_dependency_overrides: cookie_store,neon_lints,frontend_server_client,web
+# melos_managed_dependency_overrides: cookie_store,neon_lints,frontend_server_client,shelf_web_socket,web,web_socket_channel
dependency_overrides:
cookie_store:
path: ../cookie_store
neon_lints:
path: ../neon_lints
+ frontend_server_client: ^4.0.0
+ shelf_web_socket: ^2.0.0
+ web: ">=0.5.0 <2.0.0"
+ web_socket_channel: ^3.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:
@@ -38,3 +38,10 @@ dev_dependencies:
git:
url: https://github.com/nextcloud/neon
path: packages/neon_lints
test: ^1.25.2
+
+dependency_overrides:
+ archive: ^3.5.0
@@ -150,7 +158,7 @@ diff --git a/packages/neon_framework/packages/account_repository/pubspec_overrid
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:
@@ -38,6 +38,13 @@ dev_dependencies:
url_launcher_platform_interface: ^2.3.2
vector_graphics_compiler: ^1.1.16

@@ -185,31 +193,35 @@ diff --git a/packages/neon_framework/packages/dashboard_app/pubspec_overrides.ya
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:
@@ -34,3 +34,10 @@ dev_dependencies:
url: https://github.com/nextcloud/neon
path: packages/neon_lints
test: ^1.25.8
test: ^1.25.15
+
+dependency_overrides:
+ frontend_server_client: ^4.0.0
+ quiver: ^3.2.1
+ shelf_web_socket: ^2.0.0
+ web: ">=0.5.0 <2.0.0"
+ web_socket_channel: ^3.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
+# melos_managed_dependency_overrides: cookie_store,dynamite_runtime,interceptor_http_client,neon_lints,nextcloud,frontend_server_client,quiver,shelf_web_socket,web,web_socket_channel
dependency_overrides:
cookie_store:
path: ../../../cookie_store
@@ -10,3 +10,6 @@ dependency_overrides:
@@ -10,3 +10,8 @@ dependency_overrides:
path: ../../../neon_lints
nextcloud:
path: ../../../nextcloud
+ frontend_server_client: ^4.0.0
+ quiver: ^3.2.1
+ shelf_web_socket: ^2.0.0
+ web: ">=0.5.0 <2.0.0"
+ web_socket_channel: ^3.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
@@ -250,7 +262,7 @@ diff --git a/packages/neon_framework/packages/neon_storage/pubspec.yaml b/packag
@@ -32,3 +32,6 @@ dev_dependencies:
url: https://github.com/nextcloud/neon
path: packages/neon_lints
test: ^1.25.8
test: ^1.25.15
+
+dependency_overrides:
+ frontend_server_client: ^4.0.0
@@ -271,7 +283,7 @@ diff --git a/packages/neon_framework/packages/neon_storage/pubspec_overrides.yam
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:
@@ -47,6 +47,13 @@ dev_dependencies:
url_launcher_platform_interface: ^2.3.2
vector_graphics_compiler: ^1.1.16

@@ -341,7 +353,7 @@ diff --git a/packages/neon_framework/packages/sort_box/pubspec.yaml b/packages/n
@@ -15,3 +15,6 @@ dev_dependencies:
url: https://github.com/nextcloud/neon
path: packages/neon_lints
test: ^1.25.8
test: ^1.25.15
+
+dependency_overrides:
+ frontend_server_client: ^4.0.0
@@ -358,7 +370,7 @@ diff --git a/packages/neon_framework/packages/sort_box/pubspec_overrides.yaml b/
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:
@@ -50,6 +50,14 @@ dev_dependencies:
url_launcher_platform_interface: ^2.3.2
vector_graphics_compiler: ^1.1.16

@@ -395,7 +407,7 @@ diff --git a/packages/neon_framework/packages/talk_app/pubspec_overrides.yaml b/
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:
@@ -111,6 +111,13 @@ dev_dependencies:
vector_graphics_compiler: ^1.1.16
version: ^3.0.2

@@ -431,7 +443,7 @@ 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
test_api: ^0.7.4
xml_serializable: ^2.5.4

+dependency_overrides:
2 changes: 1 addition & 1 deletion packages/cookie_store/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -19,4 +19,4 @@ dev_dependencies:
git:
url: https://github.com/nextcloud/neon
path: packages/neon_lints
test: ^1.25.8
test: ^1.25.15
Original file line number Diff line number Diff line change
@@ -24,4 +24,4 @@ dev_dependencies:
git:
url: https://github.com/nextcloud/neon
path: packages/neon_lints
test: ^1.25.8
test: ^1.25.15
2 changes: 1 addition & 1 deletion packages/dynamite/packages/dynamite_runtime/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ dev_dependencies:
git:
url: https://github.com/nextcloud/neon
path: packages/neon_lints
test: ^1.25.8
test: ^1.25.15

platforms:
windows:
2 changes: 1 addition & 1 deletion packages/dynamite/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -38,4 +38,4 @@ dev_dependencies:
git:
url: https://github.com/nextcloud/neon
path: packages/neon_lints
test: ^1.25.8
test: ^1.25.15
2 changes: 1 addition & 1 deletion packages/interceptor_http_client/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -26,4 +26,4 @@ dev_dependencies:
git:
url: https://github.com/nextcloud/neon
path: packages/neon_lints
test: ^1.25.8
test: ^1.25.15
46 changes: 5 additions & 41 deletions packages/neon_framework/example/pubspec.lock
Original file line number Diff line number Diff line change
@@ -321,10 +321,11 @@ packages:
dynamic_color:
dependency: transitive
description:
name: dynamic_color
sha256: eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d
url: "https://pub.dev"
source: hosted
path: "packages/dynamic_color"
ref: faeecdf6c6b748af308c8eece8b3681c8cb6fbd8
resolved-ref: faeecdf6c6b748af308c8eece8b3681c8cb6fbd8
url: "https://github.com/provokateurin/flutter-packages"
source: git
version: "1.7.0"
dynamite_runtime:
dependency: "direct overridden"
@@ -341,14 +342,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.0.7"
fake_async:
dependency: transitive
description:
name: fake_async
sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
url: "https://pub.dev"
source: hosted
version: "1.3.2"
ffi:
dependency: transitive
description:
@@ -574,11 +567,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.0.17"
flutter_test:
dependency: transitive
description: flutter
source: sdk
version: "0.0.0"
flutter_typeahead:
dependency: transitive
description:
@@ -767,30 +755,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "4.9.0"
leak_tracker:
dependency: transitive
description:
name: leak_tracker
sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
url: "https://pub.dev"
source: hosted
version: "10.0.8"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
url: "https://pub.dev"
source: hosted
version: "3.0.9"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
url: "https://pub.dev"
source: hosted
version: "3.0.1"
list_counter:
dependency: transitive
description:
Original file line number Diff line number Diff line change
@@ -31,9 +31,10 @@ dev_dependencies:
built_value_test: ^8.9.5
flutter:
sdk: flutter
flutter_test:
sdk: flutter
mocktail: ^1.0.4
neon_lints:
git:
url: https://github.com/nextcloud/neon
path: packages/neon_lints
test: ^1.25.2
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@ import 'package:account_repository/src/testing/testing.dart';
import 'package:account_repository/src/utils/authentication_client.dart';
import 'package:built_collection/built_collection.dart';
import 'package:built_value_test/matcher.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:http/http.dart' as http;
import 'package:mocktail/mocktail.dart';
import 'package:neon_framework/testing.dart' show MockNeonStorage;
import 'package:nextcloud/core.dart' as core;
import 'package:nextcloud/nextcloud.dart';
import 'package:nextcloud/provisioning_api.dart' as provisioning_api;
import 'package:test/test.dart';

class _FakeStatus extends Fake implements core.Status {}

Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import 'package:account_repository/account_repository.dart';
import 'package:built_collection/built_collection.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mocktail/mocktail.dart';
import 'package:neon_framework/storage.dart';
import 'package:test/test.dart';

// ignore: avoid_implementing_value_types
class _FakeBuiltList extends Fake implements BuiltList<String> {}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:account_repository/testing.dart';
import 'package:test/test.dart';
import 'package:flutter_test/flutter_test.dart';

void main() {
group('Account', () {
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:account_repository/src/models/models.dart';
import 'package:account_repository/testing.dart';
import 'package:built_value_test/matcher.dart';
import 'package:test/test.dart';
import 'package:flutter_test/flutter_test.dart';

void main() {
group('Credentials', () {
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:account_repository/src/models/models.dart';
import 'package:test/test.dart';
import 'package:flutter_test/flutter_test.dart';

void main() {
group('LoginQRcode', () {
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:account_repository/src/utils/utils.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:nextcloud/nextcloud.dart';
import 'package:test/test.dart';

void main() {
group('AuthenticationClient', () {
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import 'package:account_repository/src/models/models.dart';
import 'package:account_repository/src/utils/utils.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:http/http.dart' as http;
import 'package:mocktail/mocktail.dart';
import 'package:neon_framework/storage.dart';
import 'package:neon_http_client/neon_http_client.dart';
import 'package:nextcloud/nextcloud.dart';
import 'package:test/test.dart';

class _FakeClient extends Fake implements http.Client {}

Loading