remove flutter_test to resolve version conflict with icon_launcher

This commit is contained in:
rustdesk 2022-09-16 17:14:32 +08:00
parent 723f731a20
commit 921c321a71
3 changed files with 35 additions and 54 deletions

View File

@ -24,9 +24,9 @@ import 'models/platform_model.dart';
int? windowId; int? windowId;
Future<Null> main(List<String> args) async { Future<void> main(List<String> args) async {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
print("launch args: $args"); debugPrint("launch args: $args");
if (!isDesktop) { if (!isDesktop) {
runMobileApp(); runMobileApp();
@ -37,7 +37,7 @@ Future<Null> main(List<String> args) async {
windowId = int.parse(args[1]); windowId = int.parse(args[1]);
WindowController.fromWindowId(windowId!).showTitleBar(false); WindowController.fromWindowId(windowId!).showTitleBar(false);
final argument = args[2].isEmpty final argument = args[2].isEmpty
? Map<String, dynamic>() ? <String, dynamic>{}
: jsonDecode(args[2]) as Map<String, dynamic>; : jsonDecode(args[2]) as Map<String, dynamic>;
int type = argument['type'] ?? -1; int type = argument['type'] ?? -1;
argument['windowId'] = windowId; argument['windowId'] = windowId;
@ -60,7 +60,7 @@ Future<Null> main(List<String> args) async {
break; break;
} }
} else if (args.isNotEmpty && args.first == '--cm') { } else if (args.isNotEmpty && args.first == '--cm') {
print("--cm started"); debugPrint("--cm started");
desktopType = DesktopType.cm; desktopType = DesktopType.cm;
await windowManager.ensureInitialized(); await windowManager.ensureInitialized();
runConnectionManagerScreen(); runConnectionManagerScreen();
@ -123,7 +123,7 @@ void runRemoteScreen(Map<String, dynamic> argument) async {
home: DesktopRemoteScreen( home: DesktopRemoteScreen(
params: argument, params: argument,
), ),
navigatorObservers: [ navigatorObservers: const [
// FirebaseAnalyticsObserver(analytics: analytics), // FirebaseAnalyticsObserver(analytics: analytics),
], ],
builder: _keepScaleBuilder(), builder: _keepScaleBuilder(),
@ -141,7 +141,7 @@ void runFileTransferScreen(Map<String, dynamic> argument) async {
darkTheme: MyTheme.darkTheme, darkTheme: MyTheme.darkTheme,
themeMode: MyTheme.initialThemeMode(), themeMode: MyTheme.initialThemeMode(),
home: DesktopFileTransferScreen(params: argument), home: DesktopFileTransferScreen(params: argument),
navigatorObservers: [ navigatorObservers: const [
// FirebaseAnalyticsObserver(analytics: analytics), // FirebaseAnalyticsObserver(analytics: analytics),
], ],
builder: _keepScaleBuilder(), builder: _keepScaleBuilder(),
@ -160,7 +160,7 @@ void runPortForwardScreen(Map<String, dynamic> argument) async {
darkTheme: MyTheme.darkTheme, darkTheme: MyTheme.darkTheme,
themeMode: MyTheme.initialThemeMode(), themeMode: MyTheme.initialThemeMode(),
home: DesktopPortForwardScreen(params: argument), home: DesktopPortForwardScreen(params: argument),
navigatorObservers: [ navigatorObservers: const [
// FirebaseAnalyticsObserver(analytics: analytics), // FirebaseAnalyticsObserver(analytics: analytics),
], ],
builder: _keepScaleBuilder(), builder: _keepScaleBuilder(),
@ -186,7 +186,7 @@ void runConnectionManagerScreen() async {
theme: MyTheme.lightTheme, theme: MyTheme.lightTheme,
darkTheme: MyTheme.darkTheme, darkTheme: MyTheme.darkTheme,
themeMode: MyTheme.initialThemeMode(), themeMode: MyTheme.initialThemeMode(),
home: DesktopServerPage(), home: const DesktopServerPage(),
builder: _keepScaleBuilder())); builder: _keepScaleBuilder()));
} }
@ -246,7 +246,7 @@ class _AppState extends State<App> {
: !isAndroid : !isAndroid
? WebHomePage() ? WebHomePage()
: HomePage(), : HomePage(),
navigatorObservers: [ navigatorObservers: const [
// FirebaseAnalyticsObserver(analytics: analytics), // FirebaseAnalyticsObserver(analytics: analytics),
], ],
builder: isAndroid builder: isAndroid

View File

@ -57,13 +57,6 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "6.0.1" version: "6.0.1"
boolean_selector:
dependency: transitive
description:
name: boolean_selector
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
build: build:
dependency: transitive dependency: transitive
description: description:
@ -126,28 +119,28 @@ packages:
name: cached_network_image name: cached_network_image
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.2.2" version: "3.2.1"
cached_network_image_platform_interface: cached_network_image_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: cached_network_image_platform_interface name: cached_network_image_platform_interface
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.0" version: "1.0.0"
cached_network_image_web: cached_network_image_web:
dependency: transitive dependency: transitive
description: description:
name: cached_network_image_web name: cached_network_image_web
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.2" version: "1.0.1"
characters: characters:
dependency: transitive dependency: transitive
description: description:
name: characters name: characters
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.2.1" version: "1.2.0"
charcode: charcode:
dependency: transitive dependency: transitive
description: description:
@ -318,13 +311,6 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.3" version: "1.0.3"
fake_async:
dependency: transitive
description:
name: fake_async
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.1"
ffi: ffi:
dependency: "direct main" dependency: "direct main"
description: description:
@ -381,13 +367,6 @@ packages:
url: "https://github.com/Kingtous/rustdesk_flutter_custom_cursor" url: "https://github.com/Kingtous/rustdesk_flutter_custom_cursor"
source: git source: git
version: "0.0.1" version: "0.0.1"
flutter_launcher_icons:
dependency: "direct dev"
description:
name: flutter_launcher_icons
url: "https://pub.dartlang.org"
source: hosted
version: "0.9.3"
flutter_lints: flutter_lints:
dependency: "direct dev" dependency: "direct dev"
description: description:
@ -418,11 +397,6 @@ packages:
url: "https://github.com/SoLongAndThanksForAllThePizza/flutter_rust_bridge" url: "https://github.com/SoLongAndThanksForAllThePizza/flutter_rust_bridge"
source: git source: git
version: "1.32.0" version: "1.32.0"
flutter_test:
dependency: "direct dev"
description: flutter
source: sdk
version: "0.0.0"
flutter_web_plugins: flutter_web_plugins:
dependency: transitive dependency: transitive
description: flutter description: flutter
@ -498,6 +472,13 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "4.0.1" version: "4.0.1"
icons_launcher:
dependency: "direct dev"
description:
name: icons_launcher
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.5"
image: image:
dependency: "direct main" dependency: "direct main"
description: description:
@ -595,7 +576,7 @@ packages:
name: material_color_utilities name: material_color_utilities
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.1.5" version: "0.1.4"
menu_base: menu_base:
dependency: transitive dependency: transitive
description: description:
@ -609,7 +590,7 @@ packages:
name: meta name: meta
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.8.0" version: "1.7.0"
mime: mime:
dependency: transitive dependency: transitive
description: description:
@ -763,7 +744,7 @@ packages:
name: plugin_platform_interface name: plugin_platform_interface
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.2" version: "2.1.3"
pool: pool:
dependency: transitive dependency: transitive
description: description:
@ -938,7 +919,7 @@ packages:
name: source_span name: source_span
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.9.0" version: "1.9.1"
sqflite: sqflite:
dependency: transitive dependency: transitive
description: description:
@ -995,13 +976,6 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.2.1" version: "1.2.1"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.12"
timing: timing:
dependency: transitive dependency: transitive
description: description:
@ -1039,6 +1013,13 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.3.1" version: "1.3.1"
universal_io:
dependency: transitive
description:
name: universal_io
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.4"
url_launcher: url_launcher:
dependency: "direct main" dependency: "direct main"
description: description:
@ -1245,5 +1226,5 @@ packages:
source: hosted source: hosted
version: "0.1.0" version: "0.1.0"
sdks: sdks:
dart: ">=2.18.0 <3.0.0" dart: ">=2.17.1 <3.0.0"
flutter: ">=3.3.0" flutter: ">=3.0.0"

View File

@ -81,8 +81,8 @@ dependencies:
dev_dependencies: dev_dependencies:
icons_launcher: ^2.0.5 icons_launcher: ^2.0.5
flutter_test: #flutter_test:
sdk: flutter #sdk: flutter
build_runner: ^2.1.11 build_runner: ^2.1.11
freezed: ^2.0.3 freezed: ^2.0.3
flutter_lints: ^2.0.0 flutter_lints: ^2.0.0