diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart index 70cd2eeb..def94b5a 100644 --- a/lib/utils/utils.dart +++ b/lib/utils/utils.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:package_info_plus/package_info_plus.dart'; import 'package:provider/provider.dart'; -import 'package:share/share.dart'; +import 'package:share_plus/share_plus.dart'; import 'package:gitjournal/core/notes_folder_fs.dart'; import 'package:gitjournal/settings/settings.dart'; diff --git a/lib/widgets/app_drawer.dart b/lib/widgets/app_drawer.dart index 55652d5f..382b9401 100644 --- a/lib/widgets/app_drawer.dart +++ b/lib/widgets/app_drawer.dart @@ -7,7 +7,7 @@ import 'package:flutter_email_sender/flutter_email_sender.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:launch_review/launch_review.dart'; import 'package:provider/provider.dart'; -import 'package:share/share.dart'; +import 'package:share_plus/share_plus.dart'; import 'package:time/time.dart'; import 'package:url_launcher/url_launcher.dart'; diff --git a/lib/widgets/sync_button.dart b/lib/widgets/sync_button.dart index 324b5a4a..2288d4b1 100644 --- a/lib/widgets/sync_button.dart +++ b/lib/widgets/sync_button.dart @@ -3,7 +3,7 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:badges/badges.dart'; -import 'package:connectivity/connectivity.dart'; +import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:git_bindings/git_bindings.dart'; import 'package:provider/provider.dart'; diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index d32a5956..12267cc6 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,11 +5,12 @@ import FlutterMacOS import Foundation -import connectivity_macos +import connectivity_plus_macos import device_info_plus_macos import package_info_plus_macos import path_provider_macos import sentry_flutter +import share_plus_macos import shared_preferences_macos import sqflite import url_launcher_macos @@ -20,6 +21,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) SentryFlutterPlugin.register(with: registry.registrar(forPlugin: "SentryFlutterPlugin")) + SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) diff --git a/pubspec.lock b/pubspec.lock index 432e5f20..67f77eeb 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -183,34 +183,48 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.15.0" - connectivity: + connectivity_plus: dependency: "direct main" description: - name: connectivity + name: connectivity_plus url: "https://pub.dartlang.org" source: hosted - version: "3.0.3" - connectivity_for_web: + version: "1.0.6" + connectivity_plus_linux: dependency: transitive description: - name: connectivity_for_web + name: connectivity_plus_linux url: "https://pub.dartlang.org" source: hosted - version: "0.4.0" - connectivity_macos: + version: "1.0.3" + connectivity_plus_macos: dependency: transitive description: - name: connectivity_macos + name: connectivity_plus_macos url: "https://pub.dartlang.org" source: hosted - version: "0.2.0" - connectivity_platform_interface: + version: "1.0.2" + connectivity_plus_platform_interface: dependency: transitive description: - name: connectivity_platform_interface + name: connectivity_plus_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "1.0.2" + connectivity_plus_web: + dependency: transitive + description: + name: connectivity_plus_web + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.2" + connectivity_plus_windows: + dependency: transitive + description: + name: connectivity_plus_windows + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.2" convert: dependency: transitive description: @@ -262,6 +276,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.1.3" + dbus: + dependency: transitive + description: + name: dbus + url: "https://pub.dartlang.org" + source: hosted + version: "0.5.4" device_info_plus: dependency: "direct main" description: @@ -1085,13 +1106,48 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "5.1.0" - share: + share_plus: dependency: "direct main" description: - name: share + name: share_plus + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.4" + share_plus_linux: + dependency: transitive + description: + name: share_plus_linux + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.3" + share_plus_macos: + dependency: transitive + description: + name: share_plus_macos + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.2" + share_plus_platform_interface: + dependency: transitive + description: + name: share_plus_platform_interface url: "https://pub.dartlang.org" source: hosted version: "2.0.1" + share_plus_web: + dependency: transitive + description: + name: share_plus_web + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.4" + share_plus_windows: + dependency: transitive + description: + name: share_plus_windows + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.3" shared_preferences: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 87cbd34b..3b1be297 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -24,7 +24,7 @@ dependencies: auto_size_text: ^3.0.0-nullsafety.0 badges: ^2.0.1 basic_utils: ^3.1.0 - connectivity: ^3.0.3 + connectivity_plus: ^1.0.6 # cryptography: ^1.4.1 # cryptography_flutter: ^1.0.0 device_info_plus: ^2.1.0 @@ -64,7 +64,7 @@ dependencies: quick_actions: ^0.6.0 receive_sharing_intent: ^1.4.5 sentry_flutter: ^5.1.0 - share: ^2.0.1 + share_plus: ^2.1.4 shared_preferences: ^2.0.5 #ssh_key: ^0.6.0 stack_trace: ^1.10.0