From 58c873c5a79de6a9f4bc162dab9c30e5202196fa Mon Sep 17 00:00:00 2001 From: krille-chan Date: Sun, 7 Apr 2024 15:55:37 +0200 Subject: [PATCH] build: Update all dependencies and remove vibrator package --- lib/pages/dialer/dialer.dart | 8 +- pubspec.lock | 151 ++++++++----------- pubspec.yaml | 52 +++---- scripts/enable-android-google-services.patch | 2 +- 4 files changed, 88 insertions(+), 125 deletions(-) diff --git a/lib/pages/dialer/dialer.dart b/lib/pages/dialer/dialer.dart index a8e5a920..9aead4b9 100644 --- a/lib/pages/dialer/dialer.dart +++ b/lib/pages/dialer/dialer.dart @@ -21,13 +21,13 @@ import 'dart:math'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_foreground_task/flutter_foreground_task.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_webrtc/flutter_webrtc.dart'; import 'package:just_audio/just_audio.dart'; import 'package:matrix/matrix.dart'; -import 'package:vibration/vibration.dart'; import 'package:wakelock_plus/wakelock_plus.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; @@ -264,11 +264,7 @@ class MyCallingPage extends State { void _handleCallState(CallState state) { Logs().v('CallingPage::handleCallState: ${state.toString()}'); if ({CallState.kConnected, CallState.kEnded}.contains(state)) { - try { - Vibration.vibrate(duration: 200); - } catch (e) { - Logs().e('[Dialer] could not vibrate for call updates'); - } + HapticFeedback.heavyImpact(); } if (mounted) { diff --git a/pubspec.lock b/pubspec.lock index aadaa97f..24d0e5a8 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -29,10 +29,10 @@ packages: dependency: "direct main" description: name: animations - sha256: ef57563eed3620bd5d75ad96189846aca1e033c0c45fc9a7d26e80ab02b88a70 + sha256: d3d6dcfb218225bbe68e87ccf6378bbb2e32a94900722c5f81611dad089911cb url: "https://pub.dev" source: hosted - version: "2.0.8" + version: "2.0.11" ansicolor: dependency: transitive description: @@ -53,10 +53,10 @@ packages: dependency: "direct main" description: name: archive - sha256: "7b875fd4a20b165a3084bd2d210439b22ebc653f21cea4842729c0c30c82596b" + sha256: "22600aa1e926be775fa5fe7e6894e7fb3df9efda8891c73f70fb3262399a432d" url: "https://pub.dev" source: hosted - version: "3.4.9" + version: "3.4.10" args: dependency: transitive description: @@ -173,10 +173,10 @@ packages: dependency: "direct main" description: name: chewie - sha256: ccfce3350ae9fd419cd336cdf3380f77a08e45171e1e3cb3d499d204de5e7ea8 + sha256: e53da939709efb9aad0f3d72a69a8d05f889168b7a138af60ce78bab5c94b135 url: "https://pub.dev" source: hosted - version: "1.7.1" + version: "1.8.1" cli_util: dependency: transitive description: @@ -309,10 +309,10 @@ packages: dependency: "direct main" description: name: device_info_plus - sha256: "0042cb3b2a76413ea5f8a2b40cec2a33e01d0c937e91f0f7c211fde4f7739ba6" + sha256: "50fb435ed30c6d2525cbfaaa0f46851ea6131315f213c0d921b0e407b34e3b84" url: "https://pub.dev" source: hosted - version: "9.1.1" + version: "10.0.1" device_info_plus_platform_interface: dependency: transitive description: @@ -325,10 +325,10 @@ packages: dependency: "direct main" description: name: dynamic_color - sha256: "8b8bd1d798bd393e11eddeaa8ae95b12ff028bf7d5998fc5d003488cd5f4ce2f" + sha256: eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d url: "https://pub.dev" source: hosted - version: "1.6.8" + version: "1.7.0" emoji_picker_flutter: dependency: "direct main" description: @@ -381,10 +381,10 @@ packages: dependency: transitive description: name: ffi - sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878" + sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.2" file: dependency: transitive description: @@ -471,10 +471,10 @@ packages: dependency: "direct main" description: name: flutter_foreground_task - sha256: e48d2d810a2d643362e64de41146ed8e95d4dd282bae6abbb32309d9f0bf5d67 + sha256: "9bcfcb43bba4a5446a056e723d21118ff6e184926b5557365c32c13caca157c2" url: "https://pub.dev" source: hosted - version: "6.1.2" + version: "6.1.3" flutter_highlighter: dependency: "direct main" description: @@ -575,10 +575,10 @@ packages: dependency: "direct main" description: name: flutter_local_notifications - sha256: c18f1de98fe0bb9dd5ba91e1330d4febc8b6a7de6aae3ffe475ef423723e72f3 + sha256: f9a05409385b77b06c18f200a41c7c2711ebf7415669350bb0f8474c07bd40d1 url: "https://pub.dev" source: hosted - version: "16.3.2" + version: "17.0.0" flutter_local_notifications_linux: dependency: transitive description: @@ -738,10 +738,10 @@ packages: dependency: "direct main" description: name: flutter_web_auth_2 - sha256: ea57000909d0002824179f1e4907c074f39538e86a9e4d93a74b7c37dbaee242 + sha256: "3ea3a0cc539ca74319f4f2f7484f62742fe5b2ff9a0fca37575426d6e6f07901" url: "https://pub.dev" source: hosted - version: "3.0.4" + version: "3.1.1" flutter_web_auth_2_platform_interface: dependency: transitive description: @@ -844,10 +844,10 @@ packages: dependency: "direct main" description: name: go_router - sha256: "07ee2436909f749d606f53521dc1725dd738dc5196e5ff815bc254253c594075" + sha256: "5ed2687bc961f33a752017ccaa7edead3e5601b28b6376a5901bf24728556b85" url: "https://pub.dev" source: hosted - version: "13.1.0" + version: "13.2.2" gradient_borders: dependency: transitive description: @@ -900,10 +900,10 @@ packages: dependency: "direct main" description: name: http - sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba + sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.1" http_multi_server: dependency: transitive description: @@ -932,10 +932,10 @@ packages: dependency: "direct main" description: name: image_picker - sha256: "7d7f2768df2a8b0a3cefa5ef4f84636121987d403130e70b17ef7e2cf650ba84" + sha256: "26222b01a0c9a2c8fe02fc90b8208bd3325da5ed1f4a2acabf75939031ac0bdd" url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "1.0.7" image_picker_android: dependency: transitive description: @@ -1049,10 +1049,10 @@ packages: dependency: "direct main" description: name: just_audio - sha256: b607cd1a43bac03d85c3aaee00448ff4a589ef2a77104e3d409889ff079bf823 + sha256: b7cb6bbf3750caa924d03f432ba401ec300fd90936b3f73a9b33d58b1e96286b url: "https://pub.dev" source: hosted - version: "0.9.36" + version: "0.9.37" just_audio_platform_interface: dependency: transitive description: @@ -1298,10 +1298,10 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: "88bc797f44a94814f2213db1c9bd5badebafdfb8290ca9f78d4b9ee2a3db4d79" + sha256: cb44f49b6e690fa766f023d5b22cac6b9affe741dd792b6ac7ad4fabe0d7b097 url: "https://pub.dev" source: hosted - version: "5.0.1" + version: "6.0.0" package_info_plus_platform_interface: dependency: transitive description: @@ -1346,10 +1346,10 @@ packages: dependency: "direct main" description: name: path_provider - sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa + sha256: b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" path_provider_android: dependency: transitive description: @@ -1466,10 +1466,10 @@ packages: dependency: transitive description: name: plugin_platform_interface - sha256: f4f88d4a900933e7267e2b353594774fc0d07fb072b47eedcd5b54e1ea3269f8 + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" url: "https://pub.dev" source: hosted - version: "2.1.7" + version: "2.1.8" pointer_interceptor: dependency: transitive description: @@ -1498,10 +1498,10 @@ packages: dependency: transitive description: name: pointer_interceptor_web - sha256: "9386e064097fd16419e935c23f08f35b58e6aaec155dd39bd6a003b88f9c14b4" + sha256: a6237528b46c411d8d55cdfad8fcb3269fc4cbb26060b14bff94879165887d1e url: "https://pub.dev" source: hosted - version: "0.10.1+2" + version: "0.10.2" pointycastle: dependency: transitive description: @@ -1554,10 +1554,10 @@ packages: dependency: "direct main" description: name: provider - sha256: "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096" + sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c url: "https://pub.dev" source: hosted - version: "6.1.1" + version: "6.1.2" pub_semver: dependency: transitive description: @@ -1730,18 +1730,18 @@ packages: dependency: "direct main" description: name: share_plus - sha256: f74fc3f1cbd99f39760182e176802f693fa0ec9625c045561cfad54681ea93dd + sha256: "05ec043470319bfbabe0adbc90d3a84cbff0426b9d9f3a6e2ad3e131fa5fa629" url: "https://pub.dev" source: hosted - version: "7.2.1" + version: "8.0.2" share_plus_platform_interface: dependency: transitive description: name: share_plus_platform_interface - sha256: df08bc3a07d01f5ea47b45d03ffcba1fa9cd5370fb44b3f38c70e42cced0f956 + sha256: "251eb156a8b5fa9ce033747d73535bf53911071f8d3b6f4f0b578505ce0d4496" url: "https://pub.dev" source: hosted - version: "3.3.1" + version: "3.4.0" shared_preferences: dependency: "direct main" description: @@ -1786,10 +1786,10 @@ packages: dependency: transitive description: name: shared_preferences_web - sha256: "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21" + sha256: "9aee1089b36bd2aafe06582b7d7817fd317ef05fc30e6ba14bff247d0933042a" url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.3.0" shared_preferences_windows: dependency: transitive description: @@ -1879,18 +1879,18 @@ packages: dependency: transitive description: name: sqflite_common - sha256: bb4738f15b23352822f4c42a531677e5c6f522e079461fd240ead29d8d8a54a6 + sha256: "3da423ce7baf868be70e2c0976c28a1bb2f73644268b7ffa7d2e08eab71f16a4" url: "https://pub.dev" source: hosted - version: "2.5.0+2" + version: "2.5.4" sqflite_common_ffi: dependency: "direct main" description: name: sqflite_common_ffi - sha256: "35d2fce1e971707c227cc4775cc017d5eafe06c2654c3435ebd5c3ad6c170f5f" + sha256: "4d6137c29e930d6e4a8ff373989dd9de7bac12e3bc87bce950f6e844e8ad3bb5" url: "https://pub.dev" source: hosted - version: "2.3.0+4" + version: "2.3.3" sqlcipher_flutter_libs: dependency: "direct main" description: @@ -2135,10 +2135,10 @@ packages: dependency: "direct main" description: name: url_launcher - sha256: b1c9e98774adf8820c96fbc7ae3601231d324a7d5ebd8babe27b6dfac91357ba + sha256: "0ecc004c62fd3ed36a2ffcbe0dd9700aee63bd7532d0b642a488b1ec310f492e" url: "https://pub.dev" source: hosted - version: "6.2.1" + version: "6.2.5" url_launcher_android: dependency: transitive description: @@ -2183,10 +2183,10 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "138bd45b3a456dcfafc46d1a146787424f8d2edfbf2809c9324361e58f851cf7" + sha256: "3692a459204a33e04bc94f5fb91158faf4f2c8903281ddd82915adecdb1a901d" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.3.0" url_launcher_windows: dependency: transitive description: @@ -2235,14 +2235,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" - vibration: - dependency: "direct main" - description: - name: vibration - sha256: "63d4f6b03e38d106599da18e786d5edcd02354433a4ed478fccbbcfc347193ab" - url: "https://pub.dev" - source: hosted - version: "1.8.3" video_compress: dependency: "direct main" description: @@ -2255,10 +2247,10 @@ packages: dependency: "direct main" description: name: video_player - sha256: e16f0a83601a78d165dabc17e4dac50997604eb9e4cc76e10fa219046b70cef3 + sha256: efa2e24042166906ddf836dd131258d0371d0009cdf0476f6a83fd992a17f5d0 url: "https://pub.dev" source: hosted - version: "2.8.1" + version: "2.8.5" video_player_android: dependency: transitive description: @@ -2307,39 +2299,22 @@ packages: url: "https://pub.dev" source: hosted version: "13.0.0" - wakelock_platform_interface: - dependency: transitive - description: - name: wakelock_platform_interface - sha256: "1f4aeb81fb592b863da83d2d0f7b8196067451e4df91046c26b54a403f9de621" - url: "https://pub.dev" - source: hosted - version: "0.3.0" wakelock_plus: dependency: "direct main" description: name: wakelock_plus - sha256: f268ca2116db22e57577fb99d52515a24bdc1d570f12ac18bb762361d43b043d + sha256: cd641540ea98ce8f53649fd1430b73f15065c752d2996e9a07cbe9b2742634d7 url: "https://pub.dev" source: hosted - version: "1.1.4" + version: "1.2.2" wakelock_plus_platform_interface: dependency: transitive description: name: wakelock_plus_platform_interface - sha256: "40fabed5da06caff0796dc638e1f07ee395fb18801fbff3255a2372db2d80385" + sha256: "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16" url: "https://pub.dev" source: hosted - version: "1.1.0" - wakelock_windows: - dependency: "direct overridden" - description: - path: wakelock_windows - ref: main - resolved-ref: f3610d6c246098fee74463de09434ed81fc2a7c8 - url: "https://github.com/chandrabezzo/wakelock.git" - source: git - version: "0.2.2" + version: "1.2.1" watcher: dependency: transitive description: @@ -2352,18 +2327,18 @@ packages: dependency: transitive description: name: web - sha256: edc8a9573dd8c5a83a183dae1af2b6fd4131377404706ca4e5420474784906fa + sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" url: "https://pub.dev" source: hosted - version: "0.4.0" + version: "0.5.1" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: "939ab60734a4f8fa95feacb55804fa278de28bdeef38e616dc08e44a84adea23" + sha256: "1d8e795e2a8b3730c41b8a98a2dff2e0fb57ae6f0764a1c46ec5915387d257b2" url: "https://pub.dev" source: hosted - version: "2.4.3" + version: "2.4.4" webdriver: dependency: transitive description: @@ -2392,10 +2367,10 @@ packages: dependency: transitive description: name: win32 - sha256: "7c99c0e1e2fa190b48d25c81ca5e42036d5cac81430ef249027d97b0935c553f" + sha256: "0a989dc7ca2bb51eac91e8fd00851297cfffd641aa7538b165c62637ca0eaa4a" url: "https://pub.dev" source: hosted - version: "5.1.0" + version: "5.4.0" win32_registry: dependency: transitive description: @@ -2446,4 +2421,4 @@ packages: version: "3.1.2" sdks: dart: ">=3.3.0 <4.0.0" - flutter: ">=3.16.0" + flutter: ">=3.19.0" diff --git a/pubspec.yaml b/pubspec.yaml index fa70a241..ec1c4aef 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -9,19 +9,19 @@ environment: dependencies: adaptive_dialog: ^2.1.0 - animations: ^2.0.8 - archive: ^3.4.9 + animations: ^2.0.11 + archive: ^3.4.10 async: ^2.11.0 badges: ^3.1.2 blurhash_dart: ^1.2.1 callkeep: ^0.3.2 - chewie: ^1.7.1 - collection: ^1.17.2 + chewie: ^1.8.1 + collection: ^1.18.0 cupertino_icons: any desktop_drop: ^0.4.4 desktop_notifications: ^0.6.3 - device_info_plus: ^9.1.0 - dynamic_color: ^1.6.8 + device_info_plus: ^10.0.1 + dynamic_color: ^1.7.0 emoji_picker_flutter: ^2.1.1 emoji_proposal: ^0.0.1 emojis: ^0.9.9 @@ -30,14 +30,14 @@ dependencies: flutter: sdk: flutter flutter_app_badger: ^1.5.0 - flutter_cache_manager: ^3.3.0 + flutter_cache_manager: ^3.3.1 flutter_file_dialog: ^3.0.2 - flutter_foreground_task: ^6.0.0+1 + flutter_foreground_task: ^6.1.3 flutter_highlighter: ^0.1.1 flutter_html: ^3.0.0-beta.2 flutter_html_table: ^3.0.0-beta.2 flutter_linkify: ^6.0.0 - flutter_local_notifications: ^16.3.2 + flutter_local_notifications: ^17.0.0 flutter_localizations: sdk: flutter flutter_map: ^6.1.0 @@ -49,51 +49,50 @@ dependencies: flutter_shortcuts: git: https://github.com/krille-chan/flutter_shortcuts.git flutter_typeahead: ^5.2.0 - flutter_web_auth_2: ^3.0.4 + flutter_web_auth_2: ^3.1.1 flutter_webrtc: ^0.9.46 future_loading_dialog: ^0.3.0 geolocator: ^7.6.2 - go_router: ^13.1.0 + go_router: ^13.2.2 hive: ^2.2.3 hive_flutter: ^1.1.0 html: ^0.15.4 http: ^1.2.0 image: ^4.1.7 - image_picker: ^1.0.0 + image_picker: ^1.0.7 intl: any - just_audio: ^0.9.30 + just_audio: ^0.9.37 keyboard_shortcuts: ^0.1.4 latlong2: ^0.9.1 linkify: ^5.0.0 matrix: ^0.26.1 native_imaging: ^0.1.0 - package_info_plus: ^5.0.1 + package_info_plus: ^6.0.0 pasteboard: ^0.2.0 path: ^1.9.0 - path_provider: ^2.0.9 + path_provider: ^2.1.2 permission_handler: ^11.0.1 pretty_qr_code: ^3.2.1 provider: ^6.0.2 punycode: ^1.0.0 - qr_code_scanner: ^1.0.0 + qr_code_scanner: ^1.0.1 receive_sharing_intent: ^1.4.5 record: 4.4.4 # Upgrade to 5 currently breaks playing on iOS scroll_to_index: ^3.0.1 - share_plus: ^7.2.1 + share_plus: ^8.0.2 shared_preferences: ^2.2.0 # Pinned because https://github.com/flutter/flutter/issues/118401 slugify: ^2.0.0 - sqflite_common_ffi: ^2.3.0+4 + sqflite_common_ffi: ^2.3.3 sqlcipher_flutter_libs: ^0.6.1 swipe_to_action: ^0.2.0 tor_detector_web: ^1.1.0 uni_links: ^0.5.1 unifiedpush: ^5.0.1 universal_html: ^2.2.4 - url_launcher: ^6.2.1 - vibration: ^1.8.3 - video_compress: ^3.1.1 - video_player: ^2.8.1 - wakelock_plus: ^1.1.3 + url_launcher: ^6.2.5 + video_compress: ^3.1.2 + video_player: ^2.8.5 + wakelock_plus: ^1.2.2 webrtc_interface: ^1.0.13 dev_dependencies: @@ -163,10 +162,3 @@ dependency_overrides: git: url: https://github.com/TheOneWithTheBraid/keyboard_shortcuts.git ref: null-safety - # blocked upgrade of package_info_plus for null safety - # https://github.com/creativecreatorormaybenot/wakelock/pull/203 - wakelock_windows: - git: - url: https://github.com/chandrabezzo/wakelock.git - ref: main - path: wakelock_windows/ diff --git a/scripts/enable-android-google-services.patch b/scripts/enable-android-google-services.patch index 9d12c28d..0e3ed3af 100644 --- a/scripts/enable-android-google-services.patch +++ b/scripts/enable-android-google-services.patch @@ -151,7 +151,7 @@ index 193e6ed6..f70e48d4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -26,7 +26,7 @@ dependencies: - emoji_picker_flutter: ^1.6.4 + emoji_picker_flutter: ^2.1.1 emoji_proposal: ^0.0.1 emojis: ^0.9.9 - #fcm_shared_isolate: ^0.1.0