From 3c36e9200cd0c4c2969c12fa352a88ea02c9909b Mon Sep 17 00:00:00 2001 From: qj-sam Date: Fri, 16 Jan 2026 20:47:41 +1100 Subject: [PATCH] fix: update serverpod to 3.2.2 --- example/example_client/pubspec.yaml | 7 +- example/example_flutter/pubspec.lock | 36 +-- example/example_flutter/pubspec.yaml | 13 +- example/example_server/pubspec.lock | 28 +- example/example_server/pubspec.yaml | 13 +- .../lib/src/protocol/protocol.dart | 12 + serverpod_admin_client/pubspec.yaml | 5 +- .../extension_discovery/vs_code.json | 2 +- .../.dart_tool/package_config.json | 242 +++++++++--------- .../.dart_tool/package_graph.json | 31 ++- serverpod_admin_dashboard/.dart_tool/version | 2 +- .../.flutter-plugins-dependencies | 2 +- serverpod_admin_dashboard/pubspec.lock | 32 +-- serverpod_admin_dashboard/pubspec.yaml | 12 +- .../lib/src/generated/protocol.dart | 15 ++ serverpod_admin_server/pubspec.yaml | 11 +- .../test_tools/serverpod_test_tools.dart | 128 +++++---- 17 files changed, 314 insertions(+), 277 deletions(-) diff --git a/example/example_client/pubspec.yaml b/example/example_client/pubspec.yaml index 3491322..1cba773 100644 --- a/example/example_client/pubspec.yaml +++ b/example/example_client/pubspec.yaml @@ -2,11 +2,10 @@ name: example_client description: Starting point for a Serverpod client. environment: - sdk: '^3.8.0' + sdk: "^3.8.0" dependencies: - serverpod_auth_idp_client: ^3.1.1 + serverpod_auth_idp_client: 3.2.2 serverpod_admin_client: path: ../../serverpod_admin_client - serverpod_client: ^3.1.1 - + serverpod_client: 3.2.2 diff --git a/example/example_flutter/pubspec.lock b/example/example_flutter/pubspec.lock index c7efe00..b704b67 100644 --- a/example/example_flutter/pubspec.lock +++ b/example/example_flutter/pubspec.lock @@ -360,10 +360,10 @@ packages: dependency: transitive description: name: meta - sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.17.0" nested: dependency: transitive description: @@ -502,58 +502,58 @@ packages: dependency: transitive description: name: serverpod_auth_core_client - sha256: ba9d06040b40f7819fb5f62d5ed800e362012fd15ec6ebcf736e64046f865ebe + sha256: "8cf876693d734116fbc1e969c988061e1572f5b571b8fc49cbbc86b3a1f857dd" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.2.2" serverpod_auth_core_flutter: dependency: transitive description: name: serverpod_auth_core_flutter - sha256: b3de59e53d4e617e20390e90247efc361ace706ba5eecca64e44a80db65f83bf + sha256: a0d3f89a8b079fc2595ff71e5b55c6fd70290e2799142e286a423022c445ff54 url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.2.2" serverpod_auth_idp_client: dependency: transitive description: name: serverpod_auth_idp_client - sha256: "4292949e50b04e75e2c2192788ea42b1fee99f95d1eb0dee71278b2c4663c999" + sha256: b2ba22e95377778c1affe1bd4a3b3cdc6fda4c39965e34d0c23eedaf2ba22f77 url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.2.2" serverpod_auth_idp_flutter: dependency: "direct main" description: name: serverpod_auth_idp_flutter - sha256: "9089fc3d468f8317b69517309cb7985836a2d94357824f6e7622bbd21db0fa99" + sha256: d99eb287f4ea04ce014384133fbb20555349bf0bab5dc45a547c3f52cc2a8afe url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.2.2" serverpod_client: dependency: transitive description: name: serverpod_client - sha256: "236c019b3a6b157e369b776d0552a016946d2c8abdd480fa1bc7a1dd4ec34daa" + sha256: cbc63a5fc6a4861df934c7ec8a86b9d8587518e767432ca84ddeb94389c68000 url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.2.2" serverpod_flutter: dependency: "direct main" description: name: serverpod_flutter - sha256: "161699c49191480abd12b4b4f964b0495f5499e497e77797a4f4693910490a88" + sha256: "063de06158d2ca5170190eb9de1e84bd7af3afacba3ca072cc4bd2c050292ca4" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.2.2" serverpod_serialization: dependency: transitive description: name: serverpod_serialization - sha256: b1d17f55c5b0c7b44bf3dbc1c9525307560a6a5333c0947b45dedcea3e7fe822 + sha256: "75bb370d940c960b883f52542a28fa861569099c02e2e60cc7386a87e31e6569" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.2.2" sign_in_with_apple: dependency: transitive description: @@ -627,10 +627,10 @@ packages: dependency: transitive description: name: test_api - sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00" + sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55 url: "https://pub.dev" source: hosted - version: "0.7.6" + version: "0.7.7" typed_data: dependency: transitive description: diff --git a/example/example_flutter/pubspec.yaml b/example/example_flutter/pubspec.yaml index 20e0818..2bde865 100644 --- a/example/example_flutter/pubspec.yaml +++ b/example/example_flutter/pubspec.yaml @@ -3,7 +3,7 @@ description: A new Flutter project with Serverpod. # The following line prevents the package from being accidentally published to # pub.dev using `pub publish`. This is preferred for private packages. -publish_to: 'none' # Remove this line if you wish to publish to pub.dev +publish_to: "none" # Remove this line if you wish to publish to pub.dev # The following defines the version and build number for your application. # A version number is three numbers separated by dots, like 1.2.43 @@ -18,8 +18,8 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev version: 1.0.0+1 environment: - sdk: '^3.8.0' - flutter: '^3.32.0' + sdk: "^3.8.0" + flutter: "^3.32.0" dependencies: # The following adds the Cupertino Icons font to your application. @@ -29,12 +29,12 @@ dependencies: sdk: flutter example_client: path: ../example_client - serverpod_flutter: ^3.1.1 - serverpod_auth_idp_flutter: ^3.1.1 + serverpod_flutter: 3.2.2 + serverpod_auth_idp_flutter: 3.2.2 serverpod_admin_dashboard: path: ../../serverpod_admin_dashboard dev_dependencies: - flutter_lints: '>=3.0.0 <7.0.0' + flutter_lints: ">=3.0.0 <7.0.0" flutter_test: sdk: flutter @@ -43,7 +43,6 @@ dev_dependencies: # The following section is specific to Flutter. flutter: - # The following line ensures that the Material Icons font is # included with your application, so that you can use the icons in # the material Icons class. diff --git a/example/example_server/pubspec.lock b/example/example_server/pubspec.lock index 2d69f54..abeb474 100644 --- a/example/example_server/pubspec.lock +++ b/example/example_server/pubspec.lock @@ -461,10 +461,10 @@ packages: dependency: "direct main" description: name: serverpod - sha256: "01036b06059934595e4bb7d7865b0ece9bf58511eaf9d4f475eb124b175a5a27" + sha256: c5febf0689b13286b3a4116b66f5507adbd85b6df85302bfdc72c0c1d4ff9368 url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.2.2" serverpod_admin_server: dependency: "direct main" description: @@ -476,50 +476,50 @@ packages: dependency: transitive description: name: serverpod_auth_core_server - sha256: d4dcb01ebbb733139652aa6602e044ea75f835c3572cca05bb124e6d903459e0 + sha256: "56ecd23c92fef60a5ca9bef0628caf5615aada8dd9bbf57e3172c8b75e8d797a" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.2.2" serverpod_auth_idp_server: dependency: "direct main" description: name: serverpod_auth_idp_server - sha256: d5170b61e362f92ed28f701c548a6fdca22f03135bfcf35e950233c2f07beec5 + sha256: "760435723db3f13810bcd3247db3c4eda827c9002dcdc6c1ce112771785ac17f" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.2.2" serverpod_lints: dependency: transitive description: name: serverpod_lints - sha256: "45d67a8314e6b325096679ef4626d2c5d2cc1a70abb1b4005c6fcec49a2c14be" + sha256: "80276a51c6509604e673702b1509f0f112cb53e79d34c73db5a27b3ad3226021" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.2.2" serverpod_serialization: dependency: transitive description: name: serverpod_serialization - sha256: b1d17f55c5b0c7b44bf3dbc1c9525307560a6a5333c0947b45dedcea3e7fe822 + sha256: "75bb370d940c960b883f52542a28fa861569099c02e2e60cc7386a87e31e6569" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.2.2" serverpod_shared: dependency: transitive description: name: serverpod_shared - sha256: "87b765057e44801fc4c908ac124faa4fd2cccde4738a3c298effed59990c897f" + sha256: "0306832899437848f32d613a2de2707eeafb5e6b7fc64406f6bae4e66c8d033b" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.2.2" serverpod_test: dependency: "direct dev" description: name: serverpod_test - sha256: "6ab93efcb4a7cecc859d8fcb4b8f4591c930f2f4c9c56a7ad0d60616ebbff660" + sha256: dbba3ae4b54b82a9993a8af05b47df0cf73b81abae65783a7c0c8559ad40d018 url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.2.2" shelf: dependency: transitive description: diff --git a/example/example_server/pubspec.yaml b/example/example_server/pubspec.yaml index 8b09fd7..bdaa051 100644 --- a/example/example_server/pubspec.yaml +++ b/example/example_server/pubspec.yaml @@ -4,16 +4,15 @@ description: Starting point for a Serverpod server. # homepage: https://www.example.com environment: - sdk: '^3.8.0' + sdk: "^3.8.0" dependencies: - serverpod: ^3.1.1 - serverpod_auth_idp_server: ^3.1.1 + serverpod: 3.2.2 + serverpod_auth_idp_server: 3.2.2 serverpod_admin_server: path: ../../serverpod_admin_server - + dev_dependencies: - lints: '>=3.0.0 <7.0.0' - serverpod_test: ^3.1.1 + lints: ">=3.0.0 <7.0.0" + serverpod_test: 3.2.2 test: ^1.25.5 - diff --git a/serverpod_admin_client/lib/src/protocol/protocol.dart b/serverpod_admin_client/lib/src/protocol/protocol.dart index 5135751..c962a88 100644 --- a/serverpod_admin_client/lib/src/protocol/protocol.dart +++ b/serverpod_admin_client/lib/src/protocol/protocol.dart @@ -164,4 +164,16 @@ class Protocol extends _i1.SerializationManager { } return super.deserializeByClassName(data); } + + /// Maps any `Record`s known to this [Protocol] to their JSON representation + /// + /// Throws in case the record type is not known. + /// + /// This method will return `null` (only) for `null` inputs. + Map? mapRecordToJson(Record? record) { + if (record == null) { + return null; + } + throw Exception('Unsupported record type ${record.runtimeType}'); + } } diff --git a/serverpod_admin_client/pubspec.yaml b/serverpod_admin_client/pubspec.yaml index d7877d8..08b3976 100644 --- a/serverpod_admin_client/pubspec.yaml +++ b/serverpod_admin_client/pubspec.yaml @@ -5,7 +5,6 @@ version: 1.0.6 homepage: https://github.com/AdamMusa/serverpod_admin environment: - sdk: '>=3.5.0 <4.0.0' + sdk: ">=3.5.0 <4.0.0" dependencies: - serverpod_client: ^3.1.1 - \ No newline at end of file + serverpod_client: 3.2.2 diff --git a/serverpod_admin_dashboard/.dart_tool/extension_discovery/vs_code.json b/serverpod_admin_dashboard/.dart_tool/extension_discovery/vs_code.json index d6277d6..07487c9 100644 --- a/serverpod_admin_dashboard/.dart_tool/extension_discovery/vs_code.json +++ b/serverpod_admin_dashboard/.dart_tool/extension_discovery/vs_code.json @@ -1 +1 @@ -{"version":2,"entries":[{"package":"serverpod_admin_dashboard","rootUri":"../","packageUri":"lib/"}]} \ No newline at end of file +{"version":2,"entries":[{"package":"serverpod_admin_client","rootUri":"../../serverpod_admin_client/","packageUri":"lib/"},{"package":"serverpod_admin_dashboard","rootUri":"../","packageUri":"lib/"}]} \ No newline at end of file diff --git a/serverpod_admin_dashboard/.dart_tool/package_config.json b/serverpod_admin_dashboard/.dart_tool/package_config.json index 6db34d2..33b490e 100644 --- a/serverpod_admin_dashboard/.dart_tool/package_config.json +++ b/serverpod_admin_dashboard/.dart_tool/package_config.json @@ -3,487 +3,487 @@ "packages": [ { "name": "_fe_analyzer_shared", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/_fe_analyzer_shared-92.0.0", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/_fe_analyzer_shared-92.0.0", "packageUri": "lib/", "languageVersion": "3.9" }, { "name": "analyzer", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/analyzer-9.0.0", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/analyzer-9.0.0", "packageUri": "lib/", "languageVersion": "3.9" }, { "name": "animations", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/animations-2.1.1", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/animations-2.1.1", "packageUri": "lib/", "languageVersion": "3.8" }, { "name": "args", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/args-2.7.0", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/args-2.7.0", "packageUri": "lib/", "languageVersion": "3.3" }, { "name": "async", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/async-2.13.0", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/async-2.13.0", "packageUri": "lib/", "languageVersion": "3.4" }, { "name": "boolean_selector", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/boolean_selector-2.1.2", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/boolean_selector-2.1.2", "packageUri": "lib/", "languageVersion": "3.1" }, { "name": "build", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/build-4.0.3", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/build-4.0.3", "packageUri": "lib/", "languageVersion": "3.7" }, { "name": "build_config", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/build_config-1.2.0", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/build_config-1.2.0", "packageUri": "lib/", "languageVersion": "3.7" }, { "name": "build_daemon", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/build_daemon-4.1.1", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/build_daemon-4.1.1", "packageUri": "lib/", "languageVersion": "3.7" }, { "name": "build_runner", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/build_runner-2.10.4", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/build_runner-2.10.4", "packageUri": "lib/", "languageVersion": "3.7" }, { "name": "built_collection", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/built_collection-5.1.1", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/built_collection-5.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "built_value", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/built_value-8.12.1", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/built_value-8.12.1", "packageUri": "lib/", "languageVersion": "3.0" }, { "name": "characters", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/characters-1.4.0", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/characters-1.4.0", "packageUri": "lib/", "languageVersion": "3.4" }, { "name": "checked_yaml", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/checked_yaml-2.0.4", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/checked_yaml-2.0.4", "packageUri": "lib/", "languageVersion": "3.8" }, { "name": "clock", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/clock-1.1.2", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/clock-1.1.2", "packageUri": "lib/", "languageVersion": "3.4" }, { "name": "code_builder", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/code_builder-4.11.0", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/code_builder-4.11.0", "packageUri": "lib/", "languageVersion": "3.7" }, { "name": "collection", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/collection-1.19.1", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/collection-1.19.1", "packageUri": "lib/", "languageVersion": "3.4" }, { "name": "convert", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/convert-3.1.2", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/convert-3.1.2", "packageUri": "lib/", "languageVersion": "3.4" }, { "name": "crypto", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/crypto-3.0.7", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/crypto-3.0.7", "packageUri": "lib/", "languageVersion": "3.4" }, { "name": "dart_style", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/dart_style-3.1.3", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/dart_style-3.1.3", "packageUri": "lib/", "languageVersion": "3.9" }, { "name": "email_validator", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/email_validator-3.0.0", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/email_validator-3.0.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "fake_async", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/fake_async-1.3.3", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/fake_async-1.3.3", "packageUri": "lib/", "languageVersion": "3.3" }, { "name": "ffi", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/ffi-2.1.4", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/ffi-2.1.4", "packageUri": "lib/", "languageVersion": "3.7" }, { "name": "file", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/file-7.0.1", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/file-7.0.1", "packageUri": "lib/", "languageVersion": "3.0" }, { "name": "fixnum", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/fixnum-1.1.1", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/fixnum-1.1.1", "packageUri": "lib/", "languageVersion": "3.1" }, { "name": "flutter", - "rootUri": "file:///Users/macbookpro/Documents/setup/flutter/packages/flutter", + "rootUri": "file:///Users/samkerridge/fvm/versions/stable/packages/flutter", "packageUri": "lib/", "languageVersion": "3.8" }, { "name": "flutter_lints", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/flutter_lints-6.0.0", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/flutter_lints-6.0.0", "packageUri": "lib/", "languageVersion": "3.8" }, { "name": "flutter_localizations", - "rootUri": "file:///Users/macbookpro/Documents/setup/flutter/packages/flutter_localizations", + "rootUri": "file:///Users/samkerridge/fvm/versions/stable/packages/flutter_localizations", "packageUri": "lib/", "languageVersion": "3.8" }, { "name": "flutter_secure_storage", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/flutter_secure_storage-9.2.4", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/flutter_secure_storage-9.2.4", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "flutter_secure_storage_linux", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/flutter_secure_storage_linux-1.2.3", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/flutter_secure_storage_linux-1.2.3", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "flutter_secure_storage_macos", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/flutter_secure_storage_macos-3.1.3", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/flutter_secure_storage_macos-3.1.3", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "flutter_secure_storage_platform_interface", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/flutter_secure_storage_platform_interface-1.1.2", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/flutter_secure_storage_platform_interface-1.1.2", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "flutter_secure_storage_web", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/flutter_secure_storage_web-1.2.1", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/flutter_secure_storage_web-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "flutter_secure_storage_windows", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/flutter_secure_storage_windows-3.1.2", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/flutter_secure_storage_windows-3.1.2", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "flutter_svg", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/flutter_svg-2.2.3", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/flutter_svg-2.2.3", "packageUri": "lib/", "languageVersion": "3.8" }, { "name": "flutter_test", - "rootUri": "file:///Users/macbookpro/Documents/setup/flutter/packages/flutter_test", + "rootUri": "file:///Users/samkerridge/fvm/versions/stable/packages/flutter_test", "packageUri": "lib/", "languageVersion": "3.8" }, { "name": "flutter_web_plugins", - "rootUri": "file:///Users/macbookpro/Documents/setup/flutter/packages/flutter_web_plugins", + "rootUri": "file:///Users/samkerridge/fvm/versions/stable/packages/flutter_web_plugins", "packageUri": "lib/", "languageVersion": "3.8" }, { "name": "glob", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/glob-2.1.3", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/glob-2.1.3", "packageUri": "lib/", "languageVersion": "3.3" }, { "name": "google_fonts", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/google_fonts-6.3.3", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/google_fonts-6.3.3", "packageUri": "lib/", "languageVersion": "3.9" }, { "name": "google_identity_services_web", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/google_identity_services_web-0.3.3+1", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/google_identity_services_web-0.3.3+1", "packageUri": "lib/", "languageVersion": "3.4" }, { "name": "google_sign_in", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/google_sign_in-7.2.0", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/google_sign_in-7.2.0", "packageUri": "lib/", "languageVersion": "3.7" }, { "name": "google_sign_in_android", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/google_sign_in_android-7.2.7", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/google_sign_in_android-7.2.7", "packageUri": "lib/", "languageVersion": "3.9" }, { "name": "google_sign_in_ios", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/google_sign_in_ios-6.2.4", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/google_sign_in_ios-6.2.4", "packageUri": "lib/", "languageVersion": "3.9" }, { "name": "google_sign_in_platform_interface", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/google_sign_in_platform_interface-3.1.0", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/google_sign_in_platform_interface-3.1.0", "packageUri": "lib/", "languageVersion": "3.7" }, { "name": "google_sign_in_web", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/google_sign_in_web-1.1.0", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/google_sign_in_web-1.1.0", "packageUri": "lib/", "languageVersion": "3.7" }, { "name": "graphs", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/graphs-2.3.2", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/graphs-2.3.2", "packageUri": "lib/", "languageVersion": "3.4" }, { "name": "http", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/http-1.6.0", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/http-1.6.0", "packageUri": "lib/", "languageVersion": "3.4" }, { "name": "http_multi_server", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/http_multi_server-3.2.2", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/http_multi_server-3.2.2", "packageUri": "lib/", "languageVersion": "3.2" }, { "name": "http_parser", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/http_parser-4.1.2", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/http_parser-4.1.2", "packageUri": "lib/", "languageVersion": "3.4" }, { "name": "intl", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/intl-0.20.2", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/intl-0.20.2", "packageUri": "lib/", "languageVersion": "3.3" }, { "name": "io", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/io-1.0.5", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/io-1.0.5", "packageUri": "lib/", "languageVersion": "3.4" }, { "name": "js", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/js-0.6.7", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/js-0.6.7", "packageUri": "lib/", "languageVersion": "2.19" }, { "name": "json_annotation", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/json_annotation-4.9.0", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/json_annotation-4.9.0", "packageUri": "lib/", "languageVersion": "3.0" }, { "name": "leak_tracker", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/leak_tracker-11.0.2", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/leak_tracker-11.0.2", "packageUri": "lib/", "languageVersion": "3.2" }, { "name": "leak_tracker_flutter_testing", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/leak_tracker_flutter_testing-3.0.10", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/leak_tracker_flutter_testing-3.0.10", "packageUri": "lib/", "languageVersion": "3.2" }, { "name": "leak_tracker_testing", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/leak_tracker_testing-3.0.2", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/leak_tracker_testing-3.0.2", "packageUri": "lib/", "languageVersion": "3.2" }, { "name": "lints", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/lints-6.0.0", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/lints-6.0.0", "packageUri": "lib/", "languageVersion": "3.8" }, { "name": "logging", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/logging-1.3.0", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/logging-1.3.0", "packageUri": "lib/", "languageVersion": "3.4" }, { "name": "matcher", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/matcher-0.12.17", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/matcher-0.12.17", "packageUri": "lib/", "languageVersion": "3.4" }, { "name": "material_color_utilities", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/material_color_utilities-0.11.1", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/material_color_utilities-0.11.1", "packageUri": "lib/", "languageVersion": "2.17" }, { "name": "meta", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/meta-1.16.0", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/meta-1.17.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "3.5" }, { "name": "mime", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/mime-2.0.0", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/mime-2.0.0", "packageUri": "lib/", "languageVersion": "3.2" }, { "name": "mockito", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/mockito-5.6.1", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/mockito-5.6.1", "packageUri": "lib/", "languageVersion": "3.7" }, { "name": "nested", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/nested-1.0.0", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/nested-1.0.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "package_config", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/package_config-2.2.0", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/package_config-2.2.0", "packageUri": "lib/", "languageVersion": "3.4" }, { "name": "path", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/path-1.9.1", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/path-1.9.1", "packageUri": "lib/", "languageVersion": "3.4" }, { "name": "path_parsing", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/path_parsing-1.1.0", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/path_parsing-1.1.0", "packageUri": "lib/", "languageVersion": "3.3" }, { "name": "path_provider", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/path_provider-2.1.5", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/path_provider-2.1.5", "packageUri": "lib/", "languageVersion": "3.4" }, { "name": "path_provider_android", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/path_provider_android-2.2.22", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/path_provider_android-2.2.22", "packageUri": "lib/", "languageVersion": "3.9" }, { "name": "path_provider_foundation", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/path_provider_foundation-2.5.1", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/path_provider_foundation-2.5.1", "packageUri": "lib/", "languageVersion": "3.9" }, { "name": "path_provider_linux", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1", "packageUri": "lib/", "languageVersion": "2.19" }, { "name": "path_provider_platform_interface", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/path_provider_platform_interface-2.1.2", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/path_provider_platform_interface-2.1.2", "packageUri": "lib/", "languageVersion": "3.0" }, { "name": "path_provider_windows", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0", "packageUri": "lib/", "languageVersion": "3.2" }, { "name": "petitparser", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/petitparser-7.0.1", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/petitparser-7.0.1", "packageUri": "lib/", "languageVersion": "3.8" }, { "name": "pinput", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/pinput-6.0.1", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/pinput-6.0.1", "packageUri": "lib/", "languageVersion": "2.19" }, { "name": "platform", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/platform-3.1.6", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/platform-3.1.6", "packageUri": "lib/", "languageVersion": "3.2" }, { "name": "plugin_platform_interface", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/plugin_platform_interface-2.1.8", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/plugin_platform_interface-2.1.8", "packageUri": "lib/", "languageVersion": "3.0" }, { "name": "pool", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/pool-1.5.2", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/pool-1.5.2", "packageUri": "lib/", "languageVersion": "3.4" }, { "name": "provider", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/provider-6.1.5+1", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/provider-6.1.5+1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "pub_semver", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/pub_semver-2.2.0", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/pub_semver-2.2.0", "packageUri": "lib/", "languageVersion": "3.4" }, { "name": "pubspec_parse", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/pubspec_parse-1.5.0", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/pubspec_parse-1.5.0", "packageUri": "lib/", "languageVersion": "3.6" }, @@ -495,211 +495,211 @@ }, { "name": "serverpod_auth_core_client", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/serverpod_auth_core_client-3.1.1", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/serverpod_auth_core_client-3.2.2", "packageUri": "lib/", "languageVersion": "3.8" }, { "name": "serverpod_auth_core_flutter", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/serverpod_auth_core_flutter-3.1.1", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/serverpod_auth_core_flutter-3.2.2", "packageUri": "lib/", "languageVersion": "3.8" }, { "name": "serverpod_auth_idp_client", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/serverpod_auth_idp_client-3.1.1", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/serverpod_auth_idp_client-3.2.2", "packageUri": "lib/", "languageVersion": "3.8" }, { "name": "serverpod_auth_idp_flutter", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/serverpod_auth_idp_flutter-3.1.1", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/serverpod_auth_idp_flutter-3.2.2", "packageUri": "lib/", "languageVersion": "3.8" }, { "name": "serverpod_client", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/serverpod_client-3.1.1", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/serverpod_client-3.2.2", "packageUri": "lib/", "languageVersion": "3.8" }, { "name": "serverpod_serialization", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/serverpod_serialization-3.1.1", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/serverpod_serialization-3.2.2", "packageUri": "lib/", "languageVersion": "3.8" }, { "name": "shelf", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/shelf-1.4.2", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/shelf-1.4.2", "packageUri": "lib/", "languageVersion": "3.4" }, { "name": "shelf_web_socket", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/shelf_web_socket-3.0.0", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/shelf_web_socket-3.0.0", "packageUri": "lib/", "languageVersion": "3.5" }, { "name": "sign_in_with_apple", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/sign_in_with_apple-7.0.1", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/sign_in_with_apple-7.0.1", "packageUri": "lib/", "languageVersion": "3.3" }, { "name": "sign_in_with_apple_platform_interface", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/sign_in_with_apple_platform_interface-2.0.0", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/sign_in_with_apple_platform_interface-2.0.0", "packageUri": "lib/", "languageVersion": "3.3" }, { "name": "sign_in_with_apple_web", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/sign_in_with_apple_web-3.0.0", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/sign_in_with_apple_web-3.0.0", "packageUri": "lib/", "languageVersion": "3.3" }, { "name": "sky_engine", - "rootUri": "file:///Users/macbookpro/Documents/setup/flutter/bin/cache/pkg/sky_engine", + "rootUri": "file:///Users/samkerridge/fvm/versions/stable/bin/cache/pkg/sky_engine", "packageUri": "lib/", "languageVersion": "3.8" }, { "name": "source_gen", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/source_gen-4.1.1", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/source_gen-4.1.1", "packageUri": "lib/", "languageVersion": "3.7" }, { "name": "source_span", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/source_span-1.10.1", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/source_span-1.10.1", "packageUri": "lib/", "languageVersion": "3.1" }, { "name": "stack_trace", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/stack_trace-1.12.1", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/stack_trace-1.12.1", "packageUri": "lib/", "languageVersion": "3.4" }, { "name": "stream_channel", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/stream_channel-2.1.4", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/stream_channel-2.1.4", "packageUri": "lib/", "languageVersion": "3.3" }, { "name": "stream_transform", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/stream_transform-2.1.1", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/stream_transform-2.1.1", "packageUri": "lib/", "languageVersion": "3.1" }, { "name": "string_scanner", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/string_scanner-1.4.1", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/string_scanner-1.4.1", "packageUri": "lib/", "languageVersion": "3.1" }, { "name": "term_glyph", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/term_glyph-1.2.2", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/term_glyph-1.2.2", "packageUri": "lib/", "languageVersion": "3.1" }, { "name": "test_api", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/test_api-0.7.6", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/test_api-0.7.7", "packageUri": "lib/", "languageVersion": "3.5" }, { "name": "typed_data", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/typed_data-1.4.0", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/typed_data-1.4.0", "packageUri": "lib/", "languageVersion": "3.5" }, { "name": "uuid", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/uuid-4.5.2", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/uuid-4.5.2", "packageUri": "lib/", "languageVersion": "3.0" }, { "name": "vector_graphics", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/vector_graphics-1.1.19", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/vector_graphics-1.1.19", "packageUri": "lib/", "languageVersion": "3.6" }, { "name": "vector_graphics_codec", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/vector_graphics_codec-1.1.13", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/vector_graphics_codec-1.1.13", "packageUri": "lib/", "languageVersion": "3.4" }, { "name": "vector_graphics_compiler", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/vector_graphics_compiler-1.1.19", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/vector_graphics_compiler-1.1.19", "packageUri": "lib/", "languageVersion": "3.7" }, { "name": "vector_math", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/vector_math-2.2.0", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/vector_math-2.2.0", "packageUri": "lib/", "languageVersion": "3.1" }, { "name": "vm_service", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/vm_service-15.0.2", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/vm_service-15.0.2", "packageUri": "lib/", "languageVersion": "3.5" }, { "name": "watcher", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/watcher-1.2.0", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/watcher-1.2.0", "packageUri": "lib/", "languageVersion": "3.4" }, { "name": "web", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/web-1.1.1", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/web-1.1.1", "packageUri": "lib/", "languageVersion": "3.4" }, { "name": "web_socket", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/web_socket-1.0.1", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/web_socket-1.0.1", "packageUri": "lib/", "languageVersion": "3.4" }, { "name": "web_socket_channel", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/web_socket_channel-3.0.3", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/web_socket_channel-3.0.3", "packageUri": "lib/", "languageVersion": "3.3" }, { "name": "win32", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/win32-5.15.0", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/win32-5.15.0", "packageUri": "lib/", "languageVersion": "3.8" }, { "name": "xdg_directories", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/xdg_directories-1.1.0", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/xdg_directories-1.1.0", "packageUri": "lib/", "languageVersion": "3.3" }, { "name": "xml", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/xml-6.6.1", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/xml-6.6.1", "packageUri": "lib/", "languageVersion": "3.8" }, { "name": "yaml", - "rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/yaml-3.1.3", + "rootUri": "file:///Users/samkerridge/.pub-cache/hosted/pub.dev/yaml-3.1.3", "packageUri": "lib/", "languageVersion": "3.4" }, @@ -711,8 +711,8 @@ } ], "generator": "pub", - "generatorVersion": "3.9.2", - "flutterRoot": "file:///Users/macbookpro/Documents/setup/flutter", - "flutterVersion": "3.35.7", - "pubCache": "file:///Users/macbookpro/.pub-cache" + "generatorVersion": "3.10.4", + "flutterRoot": "file:///Users/samkerridge/fvm/versions/stable", + "flutterVersion": "3.38.5", + "pubCache": "file:///Users/samkerridge/.pub-cache" } diff --git a/serverpod_admin_dashboard/.dart_tool/package_graph.json b/serverpod_admin_dashboard/.dart_tool/package_graph.json index e074155..7d9aa0d 100644 --- a/serverpod_admin_dashboard/.dart_tool/package_graph.json +++ b/serverpod_admin_dashboard/.dart_tool/package_graph.json @@ -99,7 +99,7 @@ }, { "name": "serverpod_auth_idp_flutter", - "version": "3.1.1", + "version": "3.2.2", "dependencies": [ "animations", "email_validator", @@ -111,7 +111,6 @@ "google_sign_in_web", "pinput", "provider", - "serverpod_auth_core_client", "serverpod_auth_core_flutter", "serverpod_auth_idp_client", "sign_in_with_apple" @@ -126,7 +125,7 @@ }, { "name": "serverpod_client", - "version": "3.1.1", + "version": "3.2.2", "dependencies": [ "collection", "http", @@ -236,7 +235,7 @@ }, { "name": "meta", - "version": "1.16.0", + "version": "1.17.0", "dependencies": [] }, { @@ -417,7 +416,7 @@ }, { "name": "test_api", - "version": "0.7.6", + "version": "0.7.7", "dependencies": [ "async", "boolean_selector", @@ -516,7 +515,7 @@ }, { "name": "serverpod_auth_idp_client", - "version": "3.1.1", + "version": "3.2.2", "dependencies": [ "serverpod_auth_core_client", "serverpod_client" @@ -524,7 +523,7 @@ }, { "name": "serverpod_auth_core_flutter", - "version": "3.1.1", + "version": "3.2.2", "dependencies": [ "clock", "flutter", @@ -533,14 +532,6 @@ "serverpod_auth_core_client" ] }, - { - "name": "serverpod_auth_core_client", - "version": "3.1.1", - "dependencies": [ - "clock", - "serverpod_client" - ] - }, { "name": "provider", "version": "6.1.5+1", @@ -631,7 +622,7 @@ }, { "name": "serverpod_serialization", - "version": "3.1.1", + "version": "3.2.2", "dependencies": [ "uuid", "yaml" @@ -793,6 +784,14 @@ "plugin_platform_interface" ] }, + { + "name": "serverpod_auth_core_client", + "version": "3.2.2", + "dependencies": [ + "clock", + "serverpod_client" + ] + }, { "name": "flutter_secure_storage", "version": "9.2.4", diff --git a/serverpod_admin_dashboard/.dart_tool/version b/serverpod_admin_dashboard/.dart_tool/version index e119acd..3403591 100644 --- a/serverpod_admin_dashboard/.dart_tool/version +++ b/serverpod_admin_dashboard/.dart_tool/version @@ -1 +1 @@ -3.35.7 \ No newline at end of file +3.38.5 \ No newline at end of file diff --git a/serverpod_admin_dashboard/.flutter-plugins-dependencies b/serverpod_admin_dashboard/.flutter-plugins-dependencies index a1bc780..543623e 100644 --- a/serverpod_admin_dashboard/.flutter-plugins-dependencies +++ b/serverpod_admin_dashboard/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_secure_storage","path":"/Users/macbookpro/.pub-cache/hosted/pub.dev/flutter_secure_storage-9.2.4/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"google_sign_in_ios","path":"/Users/macbookpro/.pub-cache/hosted/pub.dev/google_sign_in_ios-6.2.4/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_foundation","path":"/Users/macbookpro/.pub-cache/hosted/pub.dev/path_provider_foundation-2.5.1/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"sign_in_with_apple","path":"/Users/macbookpro/.pub-cache/hosted/pub.dev/sign_in_with_apple-7.0.1/","native_build":true,"dependencies":[],"dev_dependency":false}],"android":[{"name":"flutter_secure_storage","path":"/Users/macbookpro/.pub-cache/hosted/pub.dev/flutter_secure_storage-9.2.4/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"google_sign_in_android","path":"/Users/macbookpro/.pub-cache/hosted/pub.dev/google_sign_in_android-7.2.7/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_android","path":"/Users/macbookpro/.pub-cache/hosted/pub.dev/path_provider_android-2.2.22/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"sign_in_with_apple","path":"/Users/macbookpro/.pub-cache/hosted/pub.dev/sign_in_with_apple-7.0.1/","native_build":true,"dependencies":[],"dev_dependency":false}],"macos":[{"name":"flutter_secure_storage_macos","path":"/Users/macbookpro/.pub-cache/hosted/pub.dev/flutter_secure_storage_macos-3.1.3/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"google_sign_in_ios","path":"/Users/macbookpro/.pub-cache/hosted/pub.dev/google_sign_in_ios-6.2.4/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_foundation","path":"/Users/macbookpro/.pub-cache/hosted/pub.dev/path_provider_foundation-2.5.1/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"sign_in_with_apple","path":"/Users/macbookpro/.pub-cache/hosted/pub.dev/sign_in_with_apple-7.0.1/","native_build":true,"dependencies":[],"dev_dependency":false}],"linux":[{"name":"flutter_secure_storage_linux","path":"/Users/macbookpro/.pub-cache/hosted/pub.dev/flutter_secure_storage_linux-1.2.3/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_linux","path":"/Users/macbookpro/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/","native_build":false,"dependencies":[],"dev_dependency":false}],"windows":[{"name":"flutter_secure_storage_windows","path":"/Users/macbookpro/.pub-cache/hosted/pub.dev/flutter_secure_storage_windows-3.1.2/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_windows","path":"/Users/macbookpro/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0/","native_build":false,"dependencies":[],"dev_dependency":false}],"web":[{"name":"flutter_secure_storage_web","path":"/Users/macbookpro/.pub-cache/hosted/pub.dev/flutter_secure_storage_web-1.2.1/","dependencies":[],"dev_dependency":false},{"name":"google_sign_in_web","path":"/Users/macbookpro/.pub-cache/hosted/pub.dev/google_sign_in_web-1.1.0/","dependencies":[],"dev_dependency":false},{"name":"sign_in_with_apple_web","path":"/Users/macbookpro/.pub-cache/hosted/pub.dev/sign_in_with_apple_web-3.0.0/","dependencies":[],"dev_dependency":false}]},"dependencyGraph":[{"name":"flutter_secure_storage","dependencies":["flutter_secure_storage_linux","flutter_secure_storage_macos","flutter_secure_storage_web","flutter_secure_storage_windows"]},{"name":"flutter_secure_storage_linux","dependencies":[]},{"name":"flutter_secure_storage_macos","dependencies":[]},{"name":"flutter_secure_storage_web","dependencies":[]},{"name":"flutter_secure_storage_windows","dependencies":["path_provider"]},{"name":"google_sign_in","dependencies":["google_sign_in_android","google_sign_in_ios","google_sign_in_web"]},{"name":"google_sign_in_android","dependencies":[]},{"name":"google_sign_in_ios","dependencies":[]},{"name":"google_sign_in_web","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"sign_in_with_apple","dependencies":["sign_in_with_apple_web"]},{"name":"sign_in_with_apple_web","dependencies":[]}],"date_created":"2025-12-25 20:23:32.630125","version":"3.35.7","swift_package_manager_enabled":{"ios":false,"macos":false}} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_secure_storage","path":"/Users/samkerridge/.pub-cache/hosted/pub.dev/flutter_secure_storage-9.2.4/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"google_sign_in_ios","path":"/Users/samkerridge/.pub-cache/hosted/pub.dev/google_sign_in_ios-6.2.4/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_foundation","path":"/Users/samkerridge/.pub-cache/hosted/pub.dev/path_provider_foundation-2.5.1/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"sign_in_with_apple","path":"/Users/samkerridge/.pub-cache/hosted/pub.dev/sign_in_with_apple-7.0.1/","native_build":true,"dependencies":[],"dev_dependency":false}],"android":[{"name":"flutter_secure_storage","path":"/Users/samkerridge/.pub-cache/hosted/pub.dev/flutter_secure_storage-9.2.4/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"google_sign_in_android","path":"/Users/samkerridge/.pub-cache/hosted/pub.dev/google_sign_in_android-7.2.7/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_android","path":"/Users/samkerridge/.pub-cache/hosted/pub.dev/path_provider_android-2.2.22/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"sign_in_with_apple","path":"/Users/samkerridge/.pub-cache/hosted/pub.dev/sign_in_with_apple-7.0.1/","native_build":true,"dependencies":[],"dev_dependency":false}],"macos":[{"name":"flutter_secure_storage_macos","path":"/Users/samkerridge/.pub-cache/hosted/pub.dev/flutter_secure_storage_macos-3.1.3/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"google_sign_in_ios","path":"/Users/samkerridge/.pub-cache/hosted/pub.dev/google_sign_in_ios-6.2.4/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_foundation","path":"/Users/samkerridge/.pub-cache/hosted/pub.dev/path_provider_foundation-2.5.1/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"sign_in_with_apple","path":"/Users/samkerridge/.pub-cache/hosted/pub.dev/sign_in_with_apple-7.0.1/","native_build":true,"dependencies":[],"dev_dependency":false}],"linux":[{"name":"flutter_secure_storage_linux","path":"/Users/samkerridge/.pub-cache/hosted/pub.dev/flutter_secure_storage_linux-1.2.3/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_linux","path":"/Users/samkerridge/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/","native_build":false,"dependencies":[],"dev_dependency":false}],"windows":[{"name":"flutter_secure_storage_windows","path":"/Users/samkerridge/.pub-cache/hosted/pub.dev/flutter_secure_storage_windows-3.1.2/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_windows","path":"/Users/samkerridge/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0/","native_build":false,"dependencies":[],"dev_dependency":false}],"web":[{"name":"flutter_secure_storage_web","path":"/Users/samkerridge/.pub-cache/hosted/pub.dev/flutter_secure_storage_web-1.2.1/","dependencies":[],"dev_dependency":false},{"name":"google_sign_in_web","path":"/Users/samkerridge/.pub-cache/hosted/pub.dev/google_sign_in_web-1.1.0/","dependencies":[],"dev_dependency":false},{"name":"sign_in_with_apple_web","path":"/Users/samkerridge/.pub-cache/hosted/pub.dev/sign_in_with_apple_web-3.0.0/","dependencies":[],"dev_dependency":false}]},"dependencyGraph":[{"name":"flutter_secure_storage","dependencies":["flutter_secure_storage_linux","flutter_secure_storage_macos","flutter_secure_storage_web","flutter_secure_storage_windows"]},{"name":"flutter_secure_storage_linux","dependencies":[]},{"name":"flutter_secure_storage_macos","dependencies":[]},{"name":"flutter_secure_storage_web","dependencies":[]},{"name":"flutter_secure_storage_windows","dependencies":["path_provider"]},{"name":"google_sign_in","dependencies":["google_sign_in_android","google_sign_in_ios","google_sign_in_web"]},{"name":"google_sign_in_android","dependencies":[]},{"name":"google_sign_in_ios","dependencies":[]},{"name":"google_sign_in_web","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"sign_in_with_apple","dependencies":["sign_in_with_apple_web"]},{"name":"sign_in_with_apple_web","dependencies":[]}],"date_created":"2026-01-16 20:33:30.105192","version":"3.38.5","swift_package_manager_enabled":{"ios":false,"macos":false}} \ No newline at end of file diff --git a/serverpod_admin_dashboard/pubspec.lock b/serverpod_admin_dashboard/pubspec.lock index fc8b856..1d3b29f 100644 --- a/serverpod_admin_dashboard/pubspec.lock +++ b/serverpod_admin_dashboard/pubspec.lock @@ -473,10 +473,10 @@ packages: dependency: transitive description: name: meta - sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.17.0" mime: dependency: transitive description: @@ -648,50 +648,50 @@ packages: dependency: transitive description: name: serverpod_auth_core_client - sha256: ba9d06040b40f7819fb5f62d5ed800e362012fd15ec6ebcf736e64046f865ebe + sha256: "8cf876693d734116fbc1e969c988061e1572f5b571b8fc49cbbc86b3a1f857dd" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.2.2" serverpod_auth_core_flutter: dependency: transitive description: name: serverpod_auth_core_flutter - sha256: b3de59e53d4e617e20390e90247efc361ace706ba5eecca64e44a80db65f83bf + sha256: a0d3f89a8b079fc2595ff71e5b55c6fd70290e2799142e286a423022c445ff54 url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.2.2" serverpod_auth_idp_client: dependency: transitive description: name: serverpod_auth_idp_client - sha256: "4292949e50b04e75e2c2192788ea42b1fee99f95d1eb0dee71278b2c4663c999" + sha256: b2ba22e95377778c1affe1bd4a3b3cdc6fda4c39965e34d0c23eedaf2ba22f77 url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.2.2" serverpod_auth_idp_flutter: dependency: "direct main" description: name: serverpod_auth_idp_flutter - sha256: "9089fc3d468f8317b69517309cb7985836a2d94357824f6e7622bbd21db0fa99" + sha256: d99eb287f4ea04ce014384133fbb20555349bf0bab5dc45a547c3f52cc2a8afe url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.2.2" serverpod_client: dependency: "direct main" description: name: serverpod_client - sha256: "236c019b3a6b157e369b776d0552a016946d2c8abdd480fa1bc7a1dd4ec34daa" + sha256: cbc63a5fc6a4861df934c7ec8a86b9d8587518e767432ca84ddeb94389c68000 url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.2.2" serverpod_serialization: dependency: transitive description: name: serverpod_serialization - sha256: b1d17f55c5b0c7b44bf3dbc1c9525307560a6a5333c0947b45dedcea3e7fe822 + sha256: "75bb370d940c960b883f52542a28fa861569099c02e2e60cc7386a87e31e6569" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.2.2" shelf: dependency: transitive description: @@ -797,10 +797,10 @@ packages: dependency: transitive description: name: test_api - sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00" + sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55 url: "https://pub.dev" source: hosted - version: "0.7.6" + version: "0.7.7" typed_data: dependency: transitive description: diff --git a/serverpod_admin_dashboard/pubspec.yaml b/serverpod_admin_dashboard/pubspec.yaml index 67c9324..89192d6 100644 --- a/serverpod_admin_dashboard/pubspec.yaml +++ b/serverpod_admin_dashboard/pubspec.yaml @@ -3,22 +3,20 @@ description: The missing admin dashboard for Serverpod. A complete Flutter packa version: 0.1.6 homepage: https://github.com/AdamMusa/serverpod_admin environment: - sdk: '>=3.5.0 <4.0.0' - flutter: '>=3.24.0' + sdk: ">=3.5.0 <4.0.0" + flutter: ">=3.24.0" dependencies: flutter: sdk: flutter - serverpod_client: ^3.1.1 + serverpod_client: 3.2.2 serverpod_admin_client: path: ../serverpod_admin_client # serverpod_admin_client: ^1.0.6 - serverpod_auth_idp_flutter: ^3.1.1 - - + serverpod_auth_idp_flutter: 3.2.2 dev_dependencies: - flutter_lints: '>=3.0.0 <7.0.0' + flutter_lints: ">=3.0.0 <7.0.0" flutter_test: sdk: flutter mockito: ^5.4.4 diff --git a/serverpod_admin_server/lib/src/generated/protocol.dart b/serverpod_admin_server/lib/src/generated/protocol.dart index 2c75421..d9f5180 100644 --- a/serverpod_admin_server/lib/src/generated/protocol.dart +++ b/serverpod_admin_server/lib/src/generated/protocol.dart @@ -195,4 +195,19 @@ class Protocol extends _i1.SerializationManagerServer { @override String getModuleName() => 'serverpod_admin'; + + /// Maps any `Record`s known to this [Protocol] to their JSON representation + /// + /// Throws in case the record type is not known. + /// + /// This method will return `null` (only) for `null` inputs. + Map? mapRecordToJson(Record? record) { + if (record == null) { + return null; + } + try { + return _i2.Protocol().mapRecordToJson(record); + } catch (_) {} + throw Exception('Unsupported record type ${record.runtimeType}'); + } } diff --git a/serverpod_admin_server/pubspec.yaml b/serverpod_admin_server/pubspec.yaml index d668258..84010ac 100644 --- a/serverpod_admin_server/pubspec.yaml +++ b/serverpod_admin_server/pubspec.yaml @@ -4,13 +4,12 @@ version: 1.0.6 homepage: https://github.com/AdamMusa/serverpod_admin environment: - sdk: '>=3.5.0 <4.0.0' + sdk: ">=3.5.0 <4.0.0" dependencies: - serverpod: ^3.1.1 + serverpod: 3.2.2 dev_dependencies: - lints: '>=3.0.0 <7.0.0' - test: '^1.24.2' - serverpod_test: ^3.1.1 - + lints: ">=3.0.0 <7.0.0" + test: "^1.24.2" + serverpod_test: 3.2.2 diff --git a/serverpod_admin_server/test/integration/test_tools/serverpod_test_tools.dart b/serverpod_admin_server/test/integration/test_tools/serverpod_test_tools.dart index df09a9e..626f2fe 100644 --- a/serverpod_admin_server/test/integration/test_tools/serverpod_test_tools.dart +++ b/serverpod_admin_server/test/integration/test_tools/serverpod_test_tools.dart @@ -8,7 +8,6 @@ // ignore_for_file: type_literal_in_constant_pattern // ignore_for_file: use_super_parameters // ignore_for_file: invalid_use_of_internal_member - // ignore_for_file: no_leading_underscores_for_local_identifiers // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -19,7 +18,6 @@ import 'package:serverpod_admin_server/src/generated/admin/admin_resource.dart' as _i4; import 'package:serverpod_admin_server/src/generated/protocol.dart'; import 'package:serverpod_admin_server/src/generated/endpoints.dart'; -import 'package:serverpod_admin_server/src/admin/endpoint/admin.dart' as _i5; export 'package:serverpod_test/serverpod_test_public_exports.dart'; /// Creates a new test group that takes a callback that can be used to write tests. @@ -158,9 +156,9 @@ class _AdminEndpoint { return _i1.callAwaitableFunctionAndHandleExceptions(() async { var _localUniqueSession = (sessionBuilder as _i1.InternalTestSessionBuilder).internalBuild( - endpoint: 'admin', - method: 'resources', - ); + endpoint: 'admin', + method: 'resources', + ); try { var _localCallContext = await _endpointDispatch.getMethodCallContext( createSessionCallback: (_) => _localUniqueSession, @@ -169,10 +167,12 @@ class _AdminEndpoint { parameters: _i1.testObjectToJson({}), serializationManager: _serializationManager, ); - var _localReturnValue = await (_localCallContext.method.call( - _localUniqueSession, - _localCallContext.arguments, - ) as _i3.Future>); + var _localReturnValue = + await (_localCallContext.method.call( + _localUniqueSession, + _localCallContext.arguments, + ) + as _i3.Future>); return _localReturnValue; } finally { await _localUniqueSession.close(); @@ -187,9 +187,9 @@ class _AdminEndpoint { return _i1.callAwaitableFunctionAndHandleExceptions(() async { var _localUniqueSession = (sessionBuilder as _i1.InternalTestSessionBuilder).internalBuild( - endpoint: 'admin', - method: 'list', - ); + endpoint: 'admin', + method: 'list', + ); try { var _localCallContext = await _endpointDispatch.getMethodCallContext( createSessionCallback: (_) => _localUniqueSession, @@ -198,10 +198,12 @@ class _AdminEndpoint { parameters: _i1.testObjectToJson({'resourceKey': resourceKey}), serializationManager: _serializationManager, ); - var _localReturnValue = await (_localCallContext.method.call( - _localUniqueSession, - _localCallContext.arguments, - ) as _i3.Future>>); + var _localReturnValue = + await (_localCallContext.method.call( + _localUniqueSession, + _localCallContext.arguments, + ) + as _i3.Future>>); return _localReturnValue; } finally { await _localUniqueSession.close(); @@ -218,9 +220,9 @@ class _AdminEndpoint { return _i1.callAwaitableFunctionAndHandleExceptions(() async { var _localUniqueSession = (sessionBuilder as _i1.InternalTestSessionBuilder).internalBuild( - endpoint: 'admin', - method: 'listPage', - ); + endpoint: 'admin', + method: 'listPage', + ); try { var _localCallContext = await _endpointDispatch.getMethodCallContext( createSessionCallback: (_) => _localUniqueSession, @@ -233,10 +235,12 @@ class _AdminEndpoint { }), serializationManager: _serializationManager, ); - var _localReturnValue = await (_localCallContext.method.call( - _localUniqueSession, - _localCallContext.arguments, - ) as _i3.Future>>); + var _localReturnValue = + await (_localCallContext.method.call( + _localUniqueSession, + _localCallContext.arguments, + ) + as _i3.Future>>); return _localReturnValue; } finally { await _localUniqueSession.close(); @@ -252,19 +256,27 @@ class _AdminEndpoint { return _i1.callAwaitableFunctionAndHandleExceptions(() async { var _localUniqueSession = (sessionBuilder as _i1.InternalTestSessionBuilder).internalBuild( - endpoint: 'admin', - method: 'find', - ); + endpoint: 'admin', + method: 'find', + ); try { - // Directly call the endpoint method to avoid Object deserialization issues - // The endpoint accepts Object id, so we can pass it directly - final adminEndpoint = _i5.AdminEndpoint(); - final result = await adminEndpoint.find( - _localUniqueSession, - resourceKey, - id, + var _localCallContext = await _endpointDispatch.getMethodCallContext( + createSessionCallback: (_) => _localUniqueSession, + endpointPath: 'admin', + methodName: 'find', + parameters: _i1.testObjectToJson({ + 'resourceKey': resourceKey, + 'id': id, + }), + serializationManager: _serializationManager, ); - return result; + var _localReturnValue = + await (_localCallContext.method.call( + _localUniqueSession, + _localCallContext.arguments, + ) + as _i3.Future?>); + return _localReturnValue; } finally { await _localUniqueSession.close(); } @@ -279,9 +291,9 @@ class _AdminEndpoint { return _i1.callAwaitableFunctionAndHandleExceptions(() async { var _localUniqueSession = (sessionBuilder as _i1.InternalTestSessionBuilder).internalBuild( - endpoint: 'admin', - method: 'create', - ); + endpoint: 'admin', + method: 'create', + ); try { var _localCallContext = await _endpointDispatch.getMethodCallContext( createSessionCallback: (_) => _localUniqueSession, @@ -293,10 +305,12 @@ class _AdminEndpoint { }), serializationManager: _serializationManager, ); - var _localReturnValue = await (_localCallContext.method.call( - _localUniqueSession, - _localCallContext.arguments, - ) as _i3.Future>); + var _localReturnValue = + await (_localCallContext.method.call( + _localUniqueSession, + _localCallContext.arguments, + ) + as _i3.Future>); return _localReturnValue; } finally { await _localUniqueSession.close(); @@ -312,9 +326,9 @@ class _AdminEndpoint { return _i1.callAwaitableFunctionAndHandleExceptions(() async { var _localUniqueSession = (sessionBuilder as _i1.InternalTestSessionBuilder).internalBuild( - endpoint: 'admin', - method: 'update', - ); + endpoint: 'admin', + method: 'update', + ); try { var _localCallContext = await _endpointDispatch.getMethodCallContext( createSessionCallback: (_) => _localUniqueSession, @@ -326,10 +340,12 @@ class _AdminEndpoint { }), serializationManager: _serializationManager, ); - var _localReturnValue = await (_localCallContext.method.call( - _localUniqueSession, - _localCallContext.arguments, - ) as _i3.Future>); + var _localReturnValue = + await (_localCallContext.method.call( + _localUniqueSession, + _localCallContext.arguments, + ) + as _i3.Future>); return _localReturnValue; } finally { await _localUniqueSession.close(); @@ -345,9 +361,9 @@ class _AdminEndpoint { return _i1.callAwaitableFunctionAndHandleExceptions(() async { var _localUniqueSession = (sessionBuilder as _i1.InternalTestSessionBuilder).internalBuild( - endpoint: 'admin', - method: 'delete', - ); + endpoint: 'admin', + method: 'delete', + ); try { var _localCallContext = await _endpointDispatch.getMethodCallContext( createSessionCallback: (_) => _localUniqueSession, @@ -359,10 +375,12 @@ class _AdminEndpoint { }), serializationManager: _serializationManager, ); - var _localReturnValue = await (_localCallContext.method.call( - _localUniqueSession, - _localCallContext.arguments, - ) as _i3.Future); + var _localReturnValue = + await (_localCallContext.method.call( + _localUniqueSession, + _localCallContext.arguments, + ) + as _i3.Future); return _localReturnValue; } finally { await _localUniqueSession.close();