From c3a533ab405296f5eda1c8824ad4a83eb30312a5 Mon Sep 17 00:00:00 2001 From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com> Date: Tue, 21 Oct 2025 21:16:48 +0530 Subject: [PATCH] chore(dep): bump flutter to 3.35.6 (#23120) * chore(dep): bump flutter to 3.35.6 * chore(dep): bump flutter to 3.35.6 (#23121) chore(dep): remove unused pub deps Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com> --------- Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com> Co-authored-by: Alex --- mise.toml | 4 +- mobile/.fvmrc | 2 +- mobile/.vscode/settings.json | 2 +- mobile/pubspec.lock | 18 +------- mobile/pubspec.yaml | 79 +++++++++++++++++------------------- server/Dockerfile.dev | 2 +- 6 files changed, 44 insertions(+), 63 deletions(-) diff --git a/mise.toml b/mise.toml index 6f9436e5ce..b60718f3ae 100644 --- a/mise.toml +++ b/mise.toml @@ -1,7 +1,7 @@ [tools] node = "22.20.0" -flutter = "3.35.5" -pnpm = "10.18.3" +flutter = "3.35.6" +pnpm = "10.18.1" terragrunt = "0.58.12" opentofu = "1.7.1" diff --git a/mobile/.fvmrc b/mobile/.fvmrc index a4d5f6d9b7..d70a803f6e 100644 --- a/mobile/.fvmrc +++ b/mobile/.fvmrc @@ -1,3 +1,3 @@ { - "flutter": "3.35.4" + "flutter": "3.35.6" } \ No newline at end of file diff --git a/mobile/.vscode/settings.json b/mobile/.vscode/settings.json index 9c6057e582..f1d5ac8fd5 100644 --- a/mobile/.vscode/settings.json +++ b/mobile/.vscode/settings.json @@ -1,5 +1,5 @@ { - "dart.flutterSdkPath": ".fvm/versions/3.35.4", + "dart.flutterSdkPath": ".fvm/versions/3.35.6", "dart.lineLength": 120, "[dart]": { "editor.rulers": [120] diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock index 125e4d46e2..4857bb79d6 100644 --- a/mobile/pubspec.lock +++ b/mobile/pubspec.lock @@ -481,14 +481,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.7.0" - easy_image_viewer: - dependency: "direct main" - description: - name: easy_image_viewer - sha256: fb6cb123c3605552cc91150dcdb50ca977001dcddfb71d20caa0c5edc9a80947 - url: "https://pub.dev" - source: hosted - version: "1.5.1" easy_localization: dependency: "direct main" description: @@ -1413,14 +1405,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.6.4" - photo_manager_image_provider: - dependency: "direct main" - description: - name: photo_manager_image_provider - sha256: b6015b67b32f345f57cf32c126f871bced2501236c405aafaefa885f7c821e4f - url: "https://pub.dev" - source: hosted - version: "2.2.0" pigeon: dependency: "direct dev" description: @@ -2180,4 +2164,4 @@ packages: version: "3.1.3" sdks: dart: ">=3.8.0 <4.0.0" - flutter: ">=3.35.4" + flutter: ">=3.35.6" diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml index 82ce321954..64e223bf48 100644 --- a/mobile/pubspec.yaml +++ b/mobile/pubspec.yaml @@ -6,12 +6,9 @@ version: 2.1.0+3022 environment: sdk: '>=3.8.0 <4.0.0' - flutter: 3.35.4 + flutter: 3.35.6 dependencies: - flutter: - sdk: flutter - async: ^2.11.0 auto_route: ^9.2.0 background_downloader: ^9.2.5 @@ -23,10 +20,15 @@ dependencies: crop_image: ^1.0.16 crypto: ^3.0.6 device_info_plus: ^12.0.0 + # DB + drift: ^2.23.1 + drift_flutter: ^0.2.4 dynamic_color: ^1.7.0 - easy_image_viewer: ^1.5.1 easy_localization: ^3.0.7+1 + ffi: ^2.1.4 file_picker: ^8.0.0+1 + flutter: + sdk: flutter flutter_cache_manager: ^3.4.1 flutter_displaymode: ^0.6.0 flutter_hooks: ^0.21.2 @@ -37,26 +39,39 @@ dependencies: flutter_web_auth_2: ^5.0.0-alpha.0 fluttertoast: ^8.2.12 geolocator: ^14.0.0 - hooks_riverpod: ^2.6.1 home_widget: ^0.8.0 + hooks_riverpod: ^2.6.1 http: ^1.3.0 image_picker: ^1.1.2 intl: ^0.20.0 + isar: + git: + url: https://github.com/immich-app/isar + ref: 'bb1dca40fe87a001122e5d43bc6254718cb49f3a' + path: packages/isar/ + isar_community_flutter_libs: 3.3.0-dev.3 local_auth: ^2.3.0 logging: ^1.3.0 maplibre_gl: ^0.22.0 + + native_video_player: + git: + url: https://github.com/immich-app/native_video_player + ref: '893894b' network_info_plus: ^6.1.3 octo_image: ^2.1.0 + openapi: + path: openapi package_info_plus: ^8.3.0 path: ^1.9.1 path_provider: ^2.1.5 path_provider_foundation: ^2.4.1 permission_handler: ^11.4.0 photo_manager: ^3.6.4 - photo_manager_image_provider: ^2.2.0 pinput: ^5.0.1 punycode: ^1.0.0 riverpod_annotation: ^2.6.1 + scroll_date_picker: ^3.8.0 scrollable_positioned_list: ^0.3.8 share_handler: ^0.0.22 share_plus: ^10.1.4 @@ -69,52 +84,34 @@ dependencies: uuid: ^4.5.1 wakelock_plus: ^1.2.10 worker_manager: ^7.2.3 - scroll_date_picker: ^3.8.0 - ffi: ^2.1.4 - - native_video_player: - git: - url: https://github.com/immich-app/native_video_player - ref: '893894b' - openapi: - path: openapi - isar: - git: - url: https://github.com/immich-app/isar - ref: 'bb1dca40fe87a001122e5d43bc6254718cb49f3a' - path: packages/isar/ - isar_community_flutter_libs: 3.3.0-dev.3 - # DB - drift: ^2.23.1 - drift_flutter: ^0.2.4 dev_dependencies: + auto_route_generator: ^9.0.0 + build_runner: ^2.4.8 + custom_lint: ^0.7.5 + # Drift generator + drift_dev: ^2.23.1 + fake_async: ^1.3.1 + file: ^7.0.1 # for MemoryFileSystem + flutter_launcher_icons: ^0.14.3 + flutter_lints: ^5.0.0 + flutter_native_splash: ^2.4.5 flutter_test: sdk: flutter - flutter_lints: ^5.0.0 - build_runner: ^2.4.8 - auto_route_generator: ^9.0.0 - flutter_launcher_icons: ^0.14.3 - flutter_native_splash: ^2.4.5 + immich_mobile_immich_lint: + path: './immich_lint' + integration_test: + sdk: flutter isar_generator: git: url: https://github.com/immich-app/isar ref: 'bb1dca40fe87a001122e5d43bc6254718cb49f3a' path: packages/isar_generator/ - integration_test: - sdk: flutter - custom_lint: ^0.7.5 - riverpod_lint: ^2.6.1 - riverpod_generator: ^2.6.1 mocktail: ^1.0.4 - immich_mobile_immich_lint: - path: './immich_lint' - fake_async: ^1.3.1 - file: ^7.0.1 # for MemoryFileSystem - # Drift generator - drift_dev: ^2.23.1 # Type safe platform code pigeon: ^26.0.0 + riverpod_generator: ^2.6.1 + riverpod_lint: ^2.6.1 flutter: uses-material-design: true diff --git a/server/Dockerfile.dev b/server/Dockerfile.dev index c37d9d3149..73afbe1a04 100644 --- a/server/Dockerfile.dev +++ b/server/Dockerfile.dev @@ -61,7 +61,7 @@ RUN if [ "$(dpkg --print-architecture)" = "arm64" ]; then \ # Flutter SDK # https://flutter.dev/docs/development/tools/sdk/releases?tab=linux ENV FLUTTER_CHANNEL="stable" -ENV FLUTTER_VERSION="3.35.4" +ENV FLUTTER_VERSION="3.35.6" ENV FLUTTER_HOME=/flutter ENV PATH=${PATH}:${FLUTTER_HOME}/bin