From d7ec587a8e1ac22a02cda890dde556b50943d486 Mon Sep 17 00:00:00 2001 From: Krille Fear Date: Wed, 1 Dec 2021 20:46:55 +0100 Subject: [PATCH] fix: Update dependencies with flutter pub upgrade --- lib/utils/background_push.dart | 2 +- linux/flutter/generated_plugin_registrant.cc | 8 +-- linux/flutter/generated_plugins.cmake | 2 +- macos/Flutter/GeneratedPluginRegistrant.swift | 2 + pubspec.lock | 56 ++++++++++++++----- pubspec.yaml | 11 ++-- scripts/update-changelog.sh | 4 -- scripts/update-dependencies.sh | 5 +- 8 files changed, 58 insertions(+), 32 deletions(-) delete mode 100755 scripts/update-changelog.sh diff --git a/lib/utils/background_push.dart b/lib/utils/background_push.dart index 4ba11b402..579b97459 100644 --- a/lib/utils/background_push.dart +++ b/lib/utils/background_push.dart @@ -30,7 +30,7 @@ import 'package:flutter_gen/gen_l10n/l10n_en.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:http/http.dart' as http; import 'package:matrix/matrix.dart'; -import 'package:unifiedpush/unifiedpush.dart'; +import 'package:unifiedpush/unifiedpush.dart' hide Message; import 'package:vrouter/vrouter.dart'; import '../config/app_config.dart'; diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index c4fdeb3b3..770c84d8b 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -8,7 +8,7 @@ #include #include -#include +#include #include void fl_register_plugins(FlPluginRegistry* registry) { @@ -18,9 +18,9 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) file_selector_linux_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin"); file_selector_plugin_register_with_registrar(file_selector_linux_registrar); - g_autoptr(FlPluginRegistrar) flutter_secure_storage_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterSecureStoragePlugin"); - flutter_secure_storage_plugin_register_with_registrar(flutter_secure_storage_registrar); + g_autoptr(FlPluginRegistrar) flutter_secure_storage_linux_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterSecureStorageLinuxPlugin"); + flutter_secure_storage_linux_plugin_register_with_registrar(flutter_secure_storage_linux_registrar); g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin"); url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar); diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index a5046f8f7..411b1dd18 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -5,7 +5,7 @@ list(APPEND FLUTTER_PLUGIN_LIST desktop_drop file_selector_linux - flutter_secure_storage + flutter_secure_storage_linux url_launcher_linux ) diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 04c25f83a..4368a0a57 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -9,6 +9,7 @@ import audioplayers import desktop_drop import file_selector_macos import flutter_local_notifications +import flutter_secure_storage_macos import geolocator_apple import package_info import package_info_plus_macos @@ -23,6 +24,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { DesktopDropPlugin.register(with: registry.registrar(forPlugin: "DesktopDropPlugin")) FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin")) FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin")) + FlutterSecureStorageMacosPlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStorageMacosPlugin")) GeolocatorPlugin.register(with: registry.registrar(forPlugin: "GeolocatorPlugin")) FLTPackageInfoPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlugin")) FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) diff --git a/pubspec.lock b/pubspec.lock index e665d5bb2..e9330096f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -218,13 +218,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.3" - dapackages: - dependency: "direct dev" - description: - name: dapackages - url: "https://pub.dartlang.org" - source: hosted - version: "1.6.0" dart_code_metrics: dependency: "direct dev" description: @@ -245,7 +238,7 @@ packages: name: dbus url: "https://pub.dartlang.org" source: hosted - version: "0.4.3" + version: "0.6.6" desktop_drop: dependency: "direct main" description: @@ -259,7 +252,7 @@ packages: name: desktop_notifications url: "https://pub.dartlang.org" source: hosted - version: "0.4.0" + version: "0.6.1" disk_space: dependency: transitive description: @@ -521,14 +514,49 @@ packages: name: flutter_secure_storage url: "https://pub.dartlang.org" source: hosted - version: "4.2.1" + version: "5.0.2" + flutter_secure_storage_linux: + dependency: transitive + description: + name: flutter_secure_storage_linux + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" + flutter_secure_storage_macos: + dependency: transitive + description: + name: flutter_secure_storage_macos + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" + flutter_secure_storage_platform_interface: + dependency: transitive + description: + name: flutter_secure_storage_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" + flutter_secure_storage_web: + dependency: transitive + description: + name: flutter_secure_storage_web + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.2" + flutter_secure_storage_windows: + dependency: transitive + description: + name: flutter_secure_storage_windows + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.2" flutter_slidable: dependency: "direct main" description: name: flutter_slidable url: "https://pub.dartlang.org" source: hosted - version: "0.6.0" + version: "1.1.0" flutter_svg: dependency: "direct main" description: @@ -1028,7 +1056,7 @@ packages: name: plugin_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.0.2" pointycastle: dependency: transitive description: @@ -1432,7 +1460,7 @@ packages: name: unifiedpush url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "3.0.0" universal_html: dependency: "direct main" description: @@ -1551,7 +1579,7 @@ packages: name: vrouter url: "https://pub.dartlang.org" source: hosted - version: "1.2.0+11" + version: "1.2.0+15" wakelock: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 5309de659..d0e217bcd 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: chewie: ^1.2.2 cupertino_icons: any desktop_drop: ^0.2.0 - desktop_notifications: ">=0.4.0 <0.5.0" # Version 0.5.0 breaks web builds: https://github.com/canonical/dbus.dart/issues/250 + desktop_notifications: ^0.6.1 email_validator: ^2.0.1 emoji_picker_flutter: ^1.0.7 encrypt: ^5.0.1 @@ -36,8 +36,8 @@ dependencies: flutter_matrix_html: ^1.1.0 flutter_olm: ^1.1.2 flutter_openssl_crypto: ^0.0.1 - flutter_secure_storage: ^4.2.1 - flutter_slidable: ^0.6.0 + flutter_secure_storage: ^5.0.2 + flutter_slidable: ^1.1.0 flutter_svg: ^0.22.0 flutter_typeahead: ^3.2.1 future_loading_dialog: ^0.2.1 @@ -68,14 +68,13 @@ dependencies: slugify: ^2.0.0 swipe_to_action: ^0.2.0 uni_links: ^0.5.1 - unifiedpush: ^1.0.6 + unifiedpush: ^3.0.0 universal_html: ^2.0.8 url_launcher: ^6.0.12 - vrouter: 1.2.0+11 + vrouter: ^1.2.0+15 wakelock: ^0.5.6 dev_dependencies: - dapackages: ^1.6.0 dart_code_metrics: ^4.2.0-dev.3 flutter_lints: ^1.0.4 flutter_native_splash: ^1.2.4 diff --git a/scripts/update-changelog.sh b/scripts/update-changelog.sh deleted file mode 100755 index 9bfab7f5b..000000000 --- a/scripts/update-changelog.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -ve -flutter pub global activate changelog -export PATH="$PATH":"$HOME/development/flutter/.pub-cache/bin" -changelog -c diff --git a/scripts/update-dependencies.sh b/scripts/update-dependencies.sh index 3560d22b2..5f783fc55 100755 --- a/scripts/update-dependencies.sh +++ b/scripts/update-dependencies.sh @@ -1,5 +1,6 @@ #!/bin/sh -ve -flutter pub get -flutter pub pub run dapackages:dapackages.dart ./pubspec.yaml +flutter pub upgrade --major-versions flutter pub get dart fix --apply +flutter format lib test +flutter pub run import_sorter:main --no-comments \ No newline at end of file