From 43951ec208d899d777d7c88d2b74fbed23838761 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 12 May 2023 09:21:13 -0500 Subject: [PATCH] chore(mobile): Upgrade to Flutter 3.10 (#2429) * update dependencies * resolve dependency and update code for Flutter 3.10 * update github action flutter version * update test version * iOS deployment * pump intl package * list tile fix --- .github/workflows/build-mobile.yml | 2 +- .github/workflows/static_analysis.yml | 5 +- .github/workflows/test.yml | 2 +- mobile/.fvm/fvm_config.json | 4 +- mobile/android/build.gradle | 2 +- mobile/ios/Podfile | 8 + mobile/ios/Podfile.lock | 12 +- mobile/ios/Runner.xcodeproj/project.pbxproj | 1 + .../modules/album/ui/album_viewer_appbar.dart | 3 +- .../asset_viewer/ui/exif_bottom_sheet.dart | 31 ++-- .../modules/home/ui/home_page_app_bar.dart | 2 +- .../ui/profile_drawer/profile_drawer.dart | 3 - ...search_bar.dart => immich_search_bar.dart} | 5 +- .../lib/modules/search/views/search_page.dart | 4 +- .../photo_view_scalestate_controller.dart | 1 - mobile/openapi/pubspec.yaml | 2 +- mobile/pubspec.lock | 142 +++++++----------- mobile/pubspec.yaml | 12 +- server/bin/generate-open-api.sh | 1 + 19 files changed, 108 insertions(+), 134 deletions(-) rename mobile/lib/modules/search/ui/{search_bar.dart => immich_search_bar.dart} (95%) diff --git a/.github/workflows/build-mobile.yml b/.github/workflows/build-mobile.yml index 07afa03d48..b530c1e095 100644 --- a/.github/workflows/build-mobile.yml +++ b/.github/workflows/build-mobile.yml @@ -45,7 +45,7 @@ jobs: uses: subosito/flutter-action@v2 with: channel: "stable" - flutter-version: "3.7.3" + flutter-version: "3.10.0" cache: true - name: Create the Keystore diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml index c46cad4a13..fb2ffff411 100644 --- a/.github/workflows/static_analysis.yml +++ b/.github/workflows/static_analysis.yml @@ -22,8 +22,8 @@ jobs: - name: Setup Flutter SDK uses: subosito/flutter-action@v2 with: - channel: 'stable' - flutter-version: '3.7.3' + channel: "stable" + flutter-version: "3.10.0" - name: Install dependencies run: dart pub get @@ -32,4 +32,3 @@ jobs: - name: Run dart analyze run: dart analyze --fatal-infos working-directory: ./mobile - diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 84416cd400..10898d51b0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -112,7 +112,7 @@ jobs: uses: subosito/flutter-action@v2 with: channel: "stable" - flutter-version: "3.7.3" + flutter-version: "3.10.0" - name: Run tests working-directory: ./mobile run: flutter test diff --git a/mobile/.fvm/fvm_config.json b/mobile/.fvm/fvm_config.json index c2dd9f5372..2d144d8071 100644 --- a/mobile/.fvm/fvm_config.json +++ b/mobile/.fvm/fvm_config.json @@ -1,4 +1,4 @@ { - "flutterSdkVersion": "3.7.0", + "flutterSdkVersion": "3.10.0", "flavors": {} -} \ No newline at end of file +} diff --git a/mobile/android/build.gradle b/mobile/android/build.gradle index 07a2e912b7..ee01aa0f15 100644 --- a/mobile/android/build.gradle +++ b/mobile/android/build.gradle @@ -30,6 +30,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/mobile/ios/Podfile b/mobile/ios/Podfile index 30c25cfc21..40bd57c5dd 100644 --- a/mobile/ios/Podfile +++ b/mobile/ios/Podfile @@ -35,6 +35,14 @@ target 'Runner' do end post_install do |installer| + installer.generated_projects.each do |project| + project.targets.each do |target| + target.build_configurations.each do |config| + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0' + end + end + end + installer.pods_project.targets.each do |target| flutter_additional_ios_build_settings(target) diff --git a/mobile/ios/Podfile.lock b/mobile/ios/Podfile.lock index c2438952d8..44760c9c87 100644 --- a/mobile/ios/Podfile.lock +++ b/mobile/ios/Podfile.lock @@ -61,12 +61,12 @@ DEPENDENCIES: - integration_test (from `.symlinks/plugins/integration_test/ios`) - isar_flutter_libs (from `.symlinks/plugins/isar_flutter_libs/ios`) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`) + - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`) - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) - photo_manager (from `.symlinks/plugins/photo_manager/ios`) - share_plus (from `.symlinks/plugins/share_plus/ios`) - - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/ios`) + - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - sqflite (from `.symlinks/plugins/sqflite/ios`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`) @@ -100,7 +100,7 @@ EXTERNAL SOURCES: package_info_plus: :path: ".symlinks/plugins/package_info_plus/ios" path_provider_foundation: - :path: ".symlinks/plugins/path_provider_foundation/ios" + :path: ".symlinks/plugins/path_provider_foundation/darwin" path_provider_ios: :path: ".symlinks/plugins/path_provider_ios/ios" permission_handler_apple: @@ -110,7 +110,7 @@ EXTERNAL SOURCES: share_plus: :path: ".symlinks/plugins/share_plus/ios" shared_preferences_foundation: - :path: ".symlinks/plugins/shared_preferences_foundation/ios" + :path: ".symlinks/plugins/shared_preferences_foundation/darwin" sqflite: :path: ".symlinks/plugins/sqflite/ios" url_launcher_ios: @@ -129,7 +129,7 @@ SPEC CHECKSUMS: fluttertoast: eb263d302cc92e04176c053d2385237e9f43fad0 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a image_picker_ios: 58b9c4269cb176f89acea5e5d043c9358f2d25f8 - integration_test: a1e7d09bd98eca2fc37aefd79d4f41ad37bdbbe5 + integration_test: 13825b8a9334a850581300559b8839134b124670 isar_flutter_libs: b69f437aeab9c521821c3f376198c4371fa21073 package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e path_provider_foundation: c68054786f1b4f3343858c1e1d0caaded73f0be9 @@ -145,6 +145,6 @@ SPEC CHECKSUMS: video_player_avfoundation: 6d971a232d72e6ee25368378d48a079dea01f1cf wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f -PODFILE CHECKSUM: 0606648e8a9ecd5a59eafa5ab3187b45a9004a28 +PODFILE CHECKSUM: 599d8aeb73728400c15364e734525722250a5382 COCOAPODS: 1.11.3 diff --git a/mobile/ios/Runner.xcodeproj/project.pbxproj b/mobile/ios/Runner.xcodeproj/project.pbxproj index fcd08df31e..04d616af65 100644 --- a/mobile/ios/Runner.xcodeproj/project.pbxproj +++ b/mobile/ios/Runner.xcodeproj/project.pbxproj @@ -220,6 +220,7 @@ files = ( ); inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", ); name = "Thin Binary"; outputPaths = ( diff --git a/mobile/lib/modules/album/ui/album_viewer_appbar.dart b/mobile/lib/modules/album/ui/album_viewer_appbar.dart index 4a5de40061..ec74e2fd13 100644 --- a/mobile/lib/modules/album/ui/album_viewer_appbar.dart +++ b/mobile/lib/modules/album/ui/album_viewer_appbar.dart @@ -12,7 +12,8 @@ import 'package:immich_mobile/shared/models/album.dart'; import 'package:immich_mobile/shared/ui/immich_toast.dart'; import 'package:immich_mobile/shared/views/immich_loading_overlay.dart'; -class AlbumViewerAppbar extends HookConsumerWidget with PreferredSizeWidget { +class AlbumViewerAppbar extends HookConsumerWidget + implements PreferredSizeWidget { const AlbumViewerAppbar({ Key? key, required this.album, diff --git a/mobile/lib/modules/asset_viewer/ui/exif_bottom_sheet.dart b/mobile/lib/modules/asset_viewer/ui/exif_bottom_sheet.dart index 428ea69759..1a20ea35e4 100644 --- a/mobile/lib/modules/asset_viewer/ui/exif_bottom_sheet.dart +++ b/mobile/lib/modules/asset_viewer/ui/exif_bottom_sheet.dart @@ -7,6 +7,7 @@ import 'package:immich_mobile/shared/models/asset.dart'; import 'package:immich_mobile/shared/ui/drag_sheet.dart'; import 'package:latlong2/latlong.dart'; import 'package:immich_mobile/utils/bytes_units.dart'; +import 'package:url_launcher/url_launcher.dart'; class ExifBottomSheet extends HookConsumerWidget { final Asset asset; @@ -42,19 +43,25 @@ class ExifBottomSheet extends HookConsumerWidget { ), zoom: 16.0, ), - layers: [ - TileLayerOptions( + nonRotatedChildren: [ + RichAttributionWidget( + attributions: [ + TextSourceAttribution( + 'OpenStreetMap contributors', + onTap: () => launchUrl( + Uri.parse('https://openstreetmap.org/copyright'), + ), + ), + ], + ), + ], + children: [ + TileLayer( urlTemplate: "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", - subdomains: ['a', 'b', 'c'], - attributionBuilder: (_) { - return const Text( - "© OpenStreetMap", - style: TextStyle(fontSize: 10), - ); - }, + subdomains: const ['a', 'b', 'c'], ), - MarkerLayerOptions( + MarkerLayer( markers: [ Marker( anchorPos: AnchorPos.align(AnchorAlign.top), @@ -88,9 +95,9 @@ class ExifBottomSheet extends HookConsumerWidget { } buildDragHeader() { - return Column( + return const Column( crossAxisAlignment: CrossAxisAlignment.start, - children: const [ + children: [ SizedBox(height: 12), Align( alignment: Alignment.center, diff --git a/mobile/lib/modules/home/ui/home_page_app_bar.dart b/mobile/lib/modules/home/ui/home_page_app_bar.dart index 94032e5b3c..d8091a050b 100644 --- a/mobile/lib/modules/home/ui/home_page_app_bar.dart +++ b/mobile/lib/modules/home/ui/home_page_app_bar.dart @@ -11,7 +11,7 @@ import 'package:immich_mobile/shared/models/server_info_state.model.dart'; import 'package:immich_mobile/modules/backup/providers/backup.provider.dart'; import 'package:immich_mobile/shared/providers/server_info.provider.dart'; -class HomePageAppBar extends ConsumerWidget with PreferredSizeWidget { +class HomePageAppBar extends ConsumerWidget implements PreferredSizeWidget { @override Size get preferredSize => const Size.fromHeight(kToolbarHeight); diff --git a/mobile/lib/modules/home/ui/profile_drawer/profile_drawer.dart b/mobile/lib/modules/home/ui/profile_drawer/profile_drawer.dart index 10832865d3..4909a74c99 100644 --- a/mobile/lib/modules/home/ui/profile_drawer/profile_drawer.dart +++ b/mobile/lib/modules/home/ui/profile_drawer/profile_drawer.dart @@ -17,7 +17,6 @@ class ProfileDrawer extends HookConsumerWidget { Widget build(BuildContext context, WidgetRef ref) { buildSignOutButton() { return ListTile( - horizontalTitleGap: 0, leading: SizedBox( height: double.infinity, child: Icon( @@ -48,7 +47,6 @@ class ProfileDrawer extends HookConsumerWidget { buildSettingButton() { return ListTile( - horizontalTitleGap: 0, leading: SizedBox( height: double.infinity, child: Icon( @@ -72,7 +70,6 @@ class ProfileDrawer extends HookConsumerWidget { buildAppLogButton() { return ListTile( - horizontalTitleGap: 0, leading: SizedBox( height: double.infinity, child: Icon( diff --git a/mobile/lib/modules/search/ui/search_bar.dart b/mobile/lib/modules/search/ui/immich_search_bar.dart similarity index 95% rename from mobile/lib/modules/search/ui/search_bar.dart rename to mobile/lib/modules/search/ui/immich_search_bar.dart index bec2a98427..5ab4bc9644 100644 --- a/mobile/lib/modules/search/ui/search_bar.dart +++ b/mobile/lib/modules/search/ui/immich_search_bar.dart @@ -4,8 +4,9 @@ import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/modules/search/providers/search_page_state.provider.dart'; -class SearchBar extends HookConsumerWidget with PreferredSizeWidget { - SearchBar({ +class ImmichSearchBar extends HookConsumerWidget + implements PreferredSizeWidget { + const ImmichSearchBar({ Key? key, required this.searchFocusNode, required this.onSubmitted, diff --git a/mobile/lib/modules/search/views/search_page.dart b/mobile/lib/modules/search/views/search_page.dart index 78a84fc1a7..fc87f08403 100644 --- a/mobile/lib/modules/search/views/search_page.dart +++ b/mobile/lib/modules/search/views/search_page.dart @@ -6,7 +6,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/modules/search/models/curated_content.dart'; import 'package:immich_mobile/modules/search/providers/search_page_state.provider.dart'; import 'package:immich_mobile/modules/search/ui/curated_row.dart'; -import 'package:immich_mobile/modules/search/ui/search_bar.dart'; +import 'package:immich_mobile/modules/search/ui/immich_search_bar.dart'; import 'package:immich_mobile/modules/search/ui/search_suggestion_list.dart'; import 'package:immich_mobile/routing/router.dart'; import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart'; @@ -117,7 +117,7 @@ class SearchPage extends HookConsumerWidget { } return Scaffold( - appBar: SearchBar( + appBar: ImmichSearchBar( searchFocusNode: searchFocusNode, onSubmitted: onSearchSubmitted, ), diff --git a/mobile/lib/shared/ui/photo_view/src/controller/photo_view_scalestate_controller.dart b/mobile/lib/shared/ui/photo_view/src/controller/photo_view_scalestate_controller.dart index dfd43a2492..a460d3ba9a 100644 --- a/mobile/lib/shared/ui/photo_view/src/controller/photo_view_scalestate_controller.dart +++ b/mobile/lib/shared/ui/photo_view/src/controller/photo_view_scalestate_controller.dart @@ -67,7 +67,6 @@ class PhotoViewScaleStateController { } /// Nevermind this method :D, look away - /// Seriously: It is used to change scale state without trigging updates on the [] void setInvisibly(PhotoViewScaleState newValue) { if (_scaleStateNotifier.value == newValue) { return; diff --git a/mobile/openapi/pubspec.yaml b/mobile/openapi/pubspec.yaml index 00043ba660..e61130a38d 100644 --- a/mobile/openapi/pubspec.yaml +++ b/mobile/openapi/pubspec.yaml @@ -10,7 +10,7 @@ environment: sdk: '>=2.12.0 <3.0.0' dependencies: http: '>=0.13.0 <0.14.0' - intl: '^0.17.0' + intl: '^0.18.0' meta: '^1.1.8' dev_dependencies: test: '>=1.16.0 <1.18.0' diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock index d2e3427e68..218666cc4a 100644 --- a/mobile/pubspec.lock +++ b/mobile/pubspec.lock @@ -5,18 +5,18 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "4897882604d919befd350648c7f91926a9d5de99e67b455bf0917cc2362f4bb8" + sha256: "405666cd3cf0ee0a48d21ec67e65406aad2c726d9fa58840d3375e7bdcd32a07" url: "https://pub.dev" source: hosted - version: "47.0.0" + version: "60.0.0" analyzer: dependency: transitive description: name: analyzer - sha256: "690e335554a8385bc9d787117d9eb52c0c03ee207a607e593de3c9d71b1cfe80" + sha256: "1952250bd005bacb895a01bf1b4dc00e3ba1c526cf47dca54dfe24979c65f5b3" url: "https://pub.dev" source: hosted - version: "4.7.0" + version: "5.12.0" archive: dependency: transitive description: @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.11.0" auto_route: dependency: "direct main" description: @@ -53,10 +53,10 @@ packages: dependency: "direct dev" description: name: auto_route_generator - sha256: c66eaa20dbba3211cac656037f88ba836a633dda953d9f4f9f9f5809b57e4278 + sha256: de5bfbc02ae4eebb339dd90d325749ae7536e903f6513ef72b88954072d72b0e url: "https://pub.dev" source: hosted - version: "5.0.2" + version: "5.0.3" badges: dependency: "direct main" description: @@ -181,10 +181,10 @@ packages: dependency: transitive description: name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" checked_yaml: dependency: transitive description: @@ -221,10 +221,10 @@ packages: dependency: "direct main" description: name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.17.1" convert: dependency: transitive description: @@ -309,10 +309,10 @@ packages: dependency: "direct main" description: name: easy_localization - sha256: "6a2e99fa0bfe5765bf4c6ca9b137d5de2c75593007178c5e4cd2ae985f870080" + sha256: f30e9b20ed4d1b890171c30241d9b9c43efe21fee55dee7bd68f94daf269ea75 url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2-dev.2" easy_logger: dependency: transitive description: @@ -420,10 +420,10 @@ packages: dependency: "direct main" description: name: flutter_map - sha256: a978283c3f2dfb1a626350a7ab32e13380148fe9b710cac8e7a7db55e0bab666 + sha256: "52c65a977daae42f9aae6748418dd1535eaf27186e9bac9bf431843082bc75a3" url: "https://pub.dev" source: hosted - version: "0.14.0" + version: "4.0.0" flutter_native_splash: dependency: "direct dev" description: @@ -531,10 +531,10 @@ packages: dependency: "direct dev" description: name: hive_generator - sha256: "81fd20125cb2ce8fd23623d7744ffbaf653aae93706c9bd3bf7019ea0ace3938" + sha256: "65998cc4d2cd9680a3d9709d893d2f6bb15e6c1f92626c3f1fa650b4b3281521" url: "https://pub.dev" source: hosted - version: "1.1.3" + version: "2.0.0" hooks_riverpod: dependency: "direct main" description: @@ -555,10 +555,10 @@ packages: dependency: "direct main" description: name: http - sha256: "2ed163531e071c2c6b7c659635112f24cb64ecbebf6af46b550d536c0b1aa112" + sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482" url: "https://pub.dev" source: hosted - version: "0.13.4" + version: "0.13.5" http_multi_server: dependency: transitive description: @@ -632,10 +632,10 @@ packages: dependency: "direct main" description: name: intl - sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91" + sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 url: "https://pub.dev" source: hosted - version: "0.17.0" + version: "0.18.0" io: dependency: transitive description: @@ -672,10 +672,10 @@ packages: dependency: transitive description: name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 url: "https://pub.dev" source: hosted - version: "0.6.5" + version: "0.6.7" json_annotation: dependency: transitive description: @@ -720,10 +720,10 @@ packages: dependency: transitive description: name: matcher - sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" url: "https://pub.dev" source: hosted - version: "0.12.13" + version: "0.12.15" material_color_utilities: dependency: transitive description: @@ -736,10 +736,10 @@ packages: dependency: transitive description: name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.9.1" mgrs_dart: dependency: transitive description: @@ -760,10 +760,10 @@ packages: dependency: "direct dev" description: name: mockito - sha256: "2a8a17b82b1bde04d514e75d90d634a0ac23f6cb4991f6098009dd56836aeafe" + sha256: dd61809f04da1838a680926de50a9e87385c1de91c6579629c3d1723946e8059 url: "https://pub.dev" source: hosted - version: "5.3.2" + version: "5.4.0" nested: dependency: transitive description: @@ -799,58 +799,26 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: f62d7253edc197fe3c88d7c2ddab82d68f555e778d55390ccc3537eca8e8d637 + sha256: "10259b111176fba5c505b102e3a5b022b51dd97e30522e906d6922c745584745" url: "https://pub.dev" source: hosted - version: "1.4.3+1" - package_info_plus_linux: - dependency: transitive - description: - name: package_info_plus_linux - sha256: "04b575f44233d30edbb80a94e57cad9107aada334fc02aabb42b6becd13c43fc" - url: "https://pub.dev" - source: hosted - version: "1.0.5" - package_info_plus_macos: - dependency: transitive - description: - name: package_info_plus_macos - sha256: a2ad8b4acf4cd479d4a0afa5a74ea3f5b1c7563b77e52cc32b3ee6956d5482a6 - url: "https://pub.dev" - source: hosted - version: "1.3.0" + version: "3.1.2" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: f7a0c8f1e7e981bc65f8b64137a53fd3c195b18d429fba960babc59a5a1c7ae8 + sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6" url: "https://pub.dev" source: hosted - version: "1.0.2" - package_info_plus_web: - dependency: transitive - description: - name: package_info_plus_web - sha256: f0829327eb534789e0a16ccac8936a80beed4e2401c4d3a74f3f39094a822d3b - url: "https://pub.dev" - source: hosted - version: "1.0.6" - package_info_plus_windows: - dependency: transitive - description: - name: package_info_plus_windows - sha256: "79524f11c42dd9078b96d797b3cf79c0a2883a50c4920dc43da8562c115089bc" - url: "https://pub.dev" - source: hosted - version: "2.1.0" + version: "2.0.1" path: dependency: "direct main" description: name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.8.3" path_provider: dependency: "direct main" description: @@ -987,6 +955,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + polylabel: + dependency: transitive + description: + name: polylabel + sha256: "41b9099afb2aa6c1730bdd8a0fab1400d287694ec7615dd8516935fa3144214b" + url: "https://pub.dev" + source: hosted + version: "1.0.1" pool: dependency: transitive description: @@ -995,14 +971,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.5.1" - positioned_tap_detector_2: - dependency: transitive - description: - name: positioned_tap_detector_2 - sha256: "52e06863ad3e1f82b058fd05054fc8c9caeeb3b47d5cea7a24bd9320746059c1" - url: "https://pub.dev" - source: hosted - version: "1.0.4" process: dependency: transitive description: @@ -1284,10 +1252,10 @@ packages: dependency: transitive description: name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb url: "https://pub.dev" source: hosted - version: "0.4.16" + version: "0.5.1" time: dependency: transitive description: @@ -1304,14 +1272,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.1" - transparent_image: - dependency: transitive - description: - name: transparent_image - sha256: e8991d955a2094e197ca24c645efec2faf4285772a4746126ca12875e54ca02f - url: "https://pub.dev" - source: hosted - version: "2.0.1" tuple: dependency: transitive description: @@ -1468,10 +1428,10 @@ packages: dependency: transitive description: name: vm_service - sha256: e7fb6c2282f7631712b69c19d1bff82f3767eea33a2321c14fa59ad67ea391c7 + sha256: f6deed8ed625c52864792459709183da231ebf66ff0cf09e69b573227c377efe url: "https://pub.dev" source: hosted - version: "9.4.0" + version: "11.3.0" wakelock: dependency: transitive description: @@ -1532,10 +1492,10 @@ packages: dependency: transitive description: name: webdriver - sha256: ef67178f0cc7e32c1494645b11639dd1335f1d18814aa8435113a92e9ef9d841 + sha256: "3c923e918918feeb90c4c9fdf1fe39220fa4c0e8e2c0fffaded174498ef86c49" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" win32: dependency: transitive description: @@ -1585,5 +1545,5 @@ packages: source: hosted version: "3.1.1" sdks: - dart: ">=2.19.0 <3.0.0" + dart: ">=3.0.0-0 <4.0.0" flutter: ">=3.3.0" diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml index c0a4f2a5b1..e4a4bb562a 100644 --- a/mobile/pubspec.yaml +++ b/mobile/pubspec.yaml @@ -19,18 +19,18 @@ dependencies: hive: ^2.2.1 hive_flutter: ^1.1.0 cached_network_image: ^3.2.2 - intl: ^0.17.0 + intl: ^0.18.0 auto_route: ^5.0.1 fluttertoast: ^8.0.8 video_player: ^2.2.18 - chewie: ^1.3.5 + chewie: ^1.4.0 badges: ^2.0.2 socket_io_client: ^2.0.0-beta.4-nullsafety.0 - flutter_map: ^0.14.0 + flutter_map: ^4.0.0 flutter_udid: ^2.0.0 - package_info_plus: ^1.4.0 + package_info_plus: ^3.1.2 url_launcher: ^6.1.3 - http: 0.13.4 + http: 0.13.5 cancellation_token_http: ^1.1.0 easy_localization: ^3.0.1 share_plus: ^6.3.0 @@ -59,7 +59,7 @@ dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^2.0.1 - hive_generator: ^1.1.2 + hive_generator: ^2.0.0 build_runner: ^2.2.1 auto_route_generator: ^5.0.2 flutter_launcher_icons: "^0.9.2" diff --git a/server/bin/generate-open-api.sh b/server/bin/generate-open-api.sh index 7b2b44ac4b..82a694d80d 100755 --- a/server/bin/generate-open-api.sh +++ b/server/bin/generate-open-api.sh @@ -11,6 +11,7 @@ function mobile { # Post generate patches patch --no-backup-if-mismatch -u ../mobile/openapi/lib/api_client.dart <./openapi-generator/patch/api_client.dart.patch patch --no-backup-if-mismatch -u ../mobile/openapi/lib/api.dart <./openapi-generator/patch/api.dart.patch + sed -i 's/0.17.0/0.18.0/g' ../mobile/openapi/pubspec.yaml } function web {