From 10c874e7d4142f199f7116614b07123782213e7d Mon Sep 17 00:00:00 2001 From: Junyuan Feng Date: Tue, 8 Feb 2022 16:53:28 +0800 Subject: [PATCH] Migrate Flutter 2.10.0 --- android/app/build.gradle | 2 +- android/build.gradle | 2 +- lib/data/res/build_data.dart | 9 +++---- lib/view/page/server/tab.dart | 19 +------------ pubspec.lock | 50 +++++++++++++++++------------------ 5 files changed, 32 insertions(+), 50 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index e1505920..258884f5 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -32,7 +32,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 30 + compileSdkVersion 31 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/android/build.gradle b/android/build.gradle index 18261f3a..eb5aaba6 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.6.10' repositories { google() mavenCentral() diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index cca05106..f72b31a3 100644 --- a/lib/data/res/build_data.dart +++ b/lib/data/res/build_data.dart @@ -2,9 +2,8 @@ class BuildData { static const String name = "ServerBox"; - static const int build = 89; - static const String engine = - "Flutter 2.8.1 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision 77d935af4d (7 weeks ago) • 2021-12-16 08:37:33 -0800\nEngine • revision 890a5fca2e\nTools • Dart 2.15.1\n"; - static const String buildAt = "2022-02-04 18:52:49.141069"; - static const int modifications = 0; + static const int build = 90; + static const String engine = "Flutter 2.10.0 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision 5f105a6ca7 (6 days ago) • 2022-02-01 14:15:42 -0800\nEngine • revision 776efd2034\nTools • Dart 2.16.0 • DevTools 2.9.2\n"; + static const String buildAt = "2022-02-08 16:48:52.440919"; + static const int modifications = 5; } diff --git a/lib/view/page/server/tab.dart b/lib/view/page/server/tab.dart index f2271132..3824e979 100644 --- a/lib/view/page/server/tab.dart +++ b/lib/view/page/server/tab.dart @@ -392,7 +392,7 @@ class MenuItems { static const List firstItems = [sftp, snippet, apt]; static const List secondItems = [edit]; - static const sftp = MenuItem(text: 'SFTP', icon: Icons.home); + static const sftp = MenuItem(text: 'SFTP', icon: Icons.hardware); static const snippet = MenuItem(text: 'Snippet', icon: Icons.label); static const apt = MenuItem(text: 'Apt', icon: Icons.system_security_update); static const edit = MenuItem(text: 'Edit', icon: Icons.settings); @@ -410,21 +410,4 @@ class MenuItems { ], ); } - - static onChanged(BuildContext context, MenuItem item) { - switch (item) { - case MenuItems.sftp: - //Do something - break; - case MenuItems.apt: - //Do something - break; - case MenuItems.snippet: - //Do something - break; - case MenuItems.edit: - //Do something - break; - } - } } diff --git a/pubspec.lock b/pubspec.lock index 94a571db..42b9cb5f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -14,7 +14,7 @@ packages: name: archive url: "https://pub.dartlang.org" source: hosted - version: "3.1.8" + version: "3.1.11" args: dependency: transitive description: @@ -28,7 +28,7 @@ packages: name: asn1lib url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "1.1.0" async: dependency: transitive description: @@ -137,7 +137,7 @@ packages: name: dartssh2 url: "https://pub.dartlang.org" source: hosted - version: "2.3.1-pre" + version: "2.4.4" dio: dependency: "direct main" description: @@ -165,7 +165,7 @@ packages: name: extended_image_library url: "https://pub.dartlang.org" source: hosted - version: "3.1.1" + version: "3.1.2" fading_edge_scrollview: dependency: transitive description: @@ -292,7 +292,7 @@ packages: name: image url: "https://pub.dartlang.org" source: hosted - version: "3.1.0" + version: "3.1.1" js: dependency: transitive description: @@ -328,6 +328,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.12.11" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.3" meta: dependency: transitive description: @@ -376,28 +383,28 @@ packages: name: path_provider_linux url: "https://pub.dartlang.org" source: hosted - version: "2.1.4" + version: "2.1.5" path_provider_macos: dependency: transitive description: name: path_provider_macos url: "https://pub.dartlang.org" source: hosted - version: "2.0.4" + version: "2.0.5" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.3" path_provider_windows: dependency: transitive description: name: path_provider_windows url: "https://pub.dartlang.org" source: hosted - version: "2.0.4" + version: "2.0.5" pedantic: dependency: transitive description: @@ -514,7 +521,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.3" + version: "0.4.8" typed_data: dependency: transitive description: @@ -535,35 +542,35 @@ packages: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "6.0.17" + version: "6.0.18" url_launcher_android: dependency: transitive description: name: url_launcher_android url: "https://pub.dartlang.org" source: hosted - version: "6.0.13" + version: "6.0.14" url_launcher_ios: dependency: transitive description: name: url_launcher_ios url: "https://pub.dartlang.org" source: hosted - version: "6.0.13" + version: "6.0.14" url_launcher_linux: dependency: transitive description: name: url_launcher_linux url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.3" url_launcher_macos: dependency: transitive description: name: url_launcher_macos url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.3" url_launcher_platform_interface: dependency: transitive description: @@ -577,7 +584,7 @@ packages: name: url_launcher_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.0.6" url_launcher_windows: dependency: transitive description: @@ -585,13 +592,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.2" - validators: - dependency: transitive - description: - name: validators - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.0" vector_math: dependency: transitive description: @@ -605,14 +605,14 @@ packages: name: win32 url: "https://pub.dartlang.org" source: hosted - version: "2.3.3" + version: "2.3.11" xdg_directories: dependency: transitive description: name: xdg_directories url: "https://pub.dartlang.org" source: hosted - version: "0.2.0" + version: "0.2.0+1" xml: dependency: transitive description: