From 5ba14028a5b754c410ce17ef0485f98fbd51c114 Mon Sep 17 00:00:00 2001 From: laiiihz Date: Thu, 4 Mar 2021 11:06:54 +0800 Subject: [PATCH] upgrade dep --- example/lib/main.dart | 39 ++++++-------- example/pubspec.lock | 67 +++++++++++++---------- lib/list_tile/as_card_expandable.dart | 2 +- pubspec.lock | 76 ++++++++++++++------------- pubspec.yaml | 13 +++-- 5 files changed, 103 insertions(+), 94 deletions(-) diff --git a/example/lib/main.dart b/example/lib/main.dart index 4580d22..72da06b 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -16,32 +16,27 @@ void main() { class MyApp extends StatelessWidget { @override Widget build(BuildContext context) { - return GetMaterialApp( - title: 'Flutter Demo', - home: _ScreenAdapter(), - builder: BotToastInit(), - navigatorObservers: [BotToastNavigatorObserver()], - localizationsDelegates: [ - GlobalMaterialLocalizations.delegate, - GlobalCupertinoLocalizations.delegate, - GlobalWidgetsLocalizations.delegate, - ], - supportedLocales: [ - const Locale('zh'), - ], + return ScreenUtilInit( + designSize: Size(375, 812), + allowFontScaling: false, + builder: () => GetMaterialApp( + title: 'Flutter Demo', + home: MyHomePage(), + builder: BotToastInit(), + navigatorObservers: [BotToastNavigatorObserver()], + localizationsDelegates: [ + GlobalMaterialLocalizations.delegate, + GlobalCupertinoLocalizations.delegate, + GlobalWidgetsLocalizations.delegate, + ], + supportedLocales: [ + const Locale('zh'), + ], + ), ); } } -class _ScreenAdapter extends StatelessWidget { - @override - Widget build(BuildContext context) { - ScreenUtil.init(context, - designSize: Size(375, 812), allowFontScaling: false); - return MyHomePage(); - } -} - class MyHomePage extends StatefulWidget { MyHomePage({Key key}) : super(key: key); diff --git a/example/pubspec.lock b/example/pubspec.lock index ad62fde..0d2c210 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -1,13 +1,13 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: - aku_ui: + animated_collection: dependency: transitive description: path: "." ref: HEAD - resolved-ref: "89d1e665c372461ed87be46c9227377b305050b2" - url: "http://test.akuhotel.com:8099/aku_fe/aku_ui.git" + resolved-ref: "49d7319a4bdb08f770676f4702537dc6b0155eb3" + url: "http://test.akuhotel.com:8099/aku_fe/animated_collection.git" source: git version: "0.0.1" animator: @@ -51,21 +51,21 @@ packages: name: bot_toast url: "https://pub.flutter-io.cn" source: hosted - version: "3.0.5" + version: "4.0.0+1" characters: dependency: transitive description: name: characters url: "https://pub.flutter-io.cn" source: hosted - version: "1.1.0-nullsafety.3" + version: "1.1.0" charcode: dependency: transitive description: name: charcode url: "https://pub.flutter-io.cn" source: hosted - version: "1.1.3" + version: "1.2.0" cli_util: dependency: transitive description: @@ -73,13 +73,20 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "0.2.0" + clock: + dependency: transitive + description: + name: clock + url: "https://pub.flutter-io.cn" + source: hosted + version: "1.1.0" collection: dependency: transitive description: name: collection url: "https://pub.flutter-io.cn" source: hosted - version: "1.15.0-nullsafety.3" + version: "1.15.0" cupertino_icons: dependency: "direct main" description: @@ -124,14 +131,14 @@ packages: name: flutter_plugin_android_lifecycle url: "https://pub.flutter-io.cn" source: hosted - version: "1.0.11" + version: "2.0.0" flutter_screenutil: dependency: transitive description: name: flutter_screenutil url: "https://pub.flutter-io.cn" source: hosted - version: "3.2.0" + version: "5.0.0-nullsafety.7" get: dependency: "direct main" description: @@ -159,35 +166,35 @@ packages: name: http url: "https://pub.flutter-io.cn" source: hosted - version: "0.12.2" + version: "0.13.0" http_parser: dependency: transitive description: name: http_parser url: "https://pub.flutter-io.cn" source: hosted - version: "3.1.4" + version: "4.0.0" image_picker: dependency: transitive description: name: image_picker url: "https://pub.flutter-io.cn" source: hosted - version: "0.6.7+22" + version: "0.7.2" image_picker_platform_interface: dependency: transitive description: name: image_picker_platform_interface url: "https://pub.flutter-io.cn" source: hosted - version: "1.1.6" + version: "2.0.1" intl: dependency: transitive description: name: intl url: "https://pub.flutter-io.cn" source: hosted - version: "0.16.1" + version: "0.17.0" js: dependency: transitive description: @@ -208,7 +215,7 @@ packages: name: meta url: "https://pub.flutter-io.cn" source: hosted - version: "1.3.0-nullsafety.3" + version: "1.3.0" node_interop: dependency: transitive description: @@ -229,21 +236,21 @@ packages: name: path url: "https://pub.flutter-io.cn" source: hosted - version: "1.8.0-nullsafety.1" + version: "1.8.0" pedantic: dependency: transitive description: name: pedantic url: "https://pub.flutter-io.cn" source: hosted - version: "1.9.2" + version: "1.11.0" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface url: "https://pub.flutter-io.cn" source: hosted - version: "1.0.3" + version: "2.0.0" sky_engine: dependency: transitive description: flutter @@ -255,7 +262,7 @@ packages: name: source_span url: "https://pub.flutter-io.cn" source: hosted - version: "1.7.0" + version: "1.8.1" states_rebuilder: dependency: transitive description: @@ -269,35 +276,37 @@ packages: name: string_scanner url: "https://pub.flutter-io.cn" source: hosted - version: "1.0.5" + version: "1.1.0" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.flutter-io.cn" source: hosted - version: "1.1.0" + version: "1.2.0" typed_data: dependency: transitive description: name: typed_data url: "https://pub.flutter-io.cn" source: hosted - version: "1.3.0-nullsafety.3" + version: "1.3.0" vector_math: dependency: transitive description: name: vector_math url: "https://pub.flutter-io.cn" source: hosted - version: "2.1.0-nullsafety.3" + version: "2.1.0" velocity_x: dependency: transitive description: - name: velocity_x - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.4.1" + path: "." + ref: HEAD + resolved-ref: "1366593e46af47f9e4c97f5f0b65de845d230838" + url: "http://test.akuhotel.com:8099/aku_fe/velocityX.git" + source: git + version: "1.4.0-dev" vxstate: dependency: transitive description: @@ -306,5 +315,5 @@ packages: source: hosted version: "1.0.1" sdks: - dart: ">=2.10.0 <2.11.0" - flutter: ">=1.17.0 <2.0.0" + dart: ">=2.12.0 <3.0.0" + flutter: ">=1.20.0" diff --git a/lib/list_tile/as_card_expandable.dart b/lib/list_tile/as_card_expandable.dart index 413fb27..edd88b3 100644 --- a/lib/list_tile/as_card_expandable.dart +++ b/lib/list_tile/as_card_expandable.dart @@ -1,6 +1,6 @@ import 'dart:math'; -import 'package:aku_ui/aku_ui.dart'; +import 'package:animated_collection/animated_collection.dart'; import 'package:ansu_ui/ansu_ui.dart'; import 'package:expandable/expandable.dart'; import 'package:flutter/cupertino.dart'; diff --git a/pubspec.lock b/pubspec.lock index 1818bb9..ddc6127 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,13 +1,13 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: - aku_ui: + animated_collection: dependency: "direct main" description: path: "." ref: HEAD - resolved-ref: "89d1e665c372461ed87be46c9227377b305050b2" - url: "http://test.akuhotel.com:8099/aku_fe/aku_ui.git" + resolved-ref: "49d7319a4bdb08f770676f4702537dc6b0155eb3" + url: "http://test.akuhotel.com:8099/aku_fe/animated_collection.git" source: git version: "0.0.1" animator: @@ -23,7 +23,7 @@ packages: name: async url: "https://pub.flutter-io.cn" source: hosted - version: "2.5.0-nullsafety.1" + version: "2.5.0" auto_size_text: dependency: transitive description: @@ -37,42 +37,42 @@ packages: name: boolean_selector url: "https://pub.flutter-io.cn" source: hosted - version: "2.1.0-nullsafety.1" + version: "2.1.0" bot_toast: dependency: "direct main" description: name: bot_toast url: "https://pub.flutter-io.cn" source: hosted - version: "3.0.5" + version: "4.0.0+1" characters: dependency: transitive description: name: characters url: "https://pub.flutter-io.cn" source: hosted - version: "1.1.0-nullsafety.3" + version: "1.1.0" charcode: dependency: transitive description: name: charcode url: "https://pub.flutter-io.cn" source: hosted - version: "1.2.0-nullsafety.1" + version: "1.2.0" clock: dependency: transitive description: name: clock url: "https://pub.flutter-io.cn" source: hosted - version: "1.1.0-nullsafety.1" + version: "1.1.0" collection: dependency: transitive description: name: collection url: "https://pub.flutter-io.cn" source: hosted - version: "1.15.0-nullsafety.3" + version: "1.15.0" expandable: dependency: "direct main" description: @@ -86,7 +86,7 @@ packages: name: fake_async url: "https://pub.flutter-io.cn" source: hosted - version: "1.2.0-nullsafety.1" + version: "1.2.0" flutter: dependency: "direct main" description: flutter @@ -105,14 +105,14 @@ packages: name: flutter_plugin_android_lifecycle url: "https://pub.flutter-io.cn" source: hosted - version: "1.0.11" + version: "2.0.0" flutter_screenutil: dependency: "direct main" description: name: flutter_screenutil url: "https://pub.flutter-io.cn" source: hosted - version: "3.2.0" + version: "5.0.0-nullsafety.7" flutter_test: dependency: "direct dev" description: flutter @@ -131,35 +131,35 @@ packages: name: http url: "https://pub.flutter-io.cn" source: hosted - version: "0.12.2" + version: "0.13.0" http_parser: dependency: transitive description: name: http_parser url: "https://pub.flutter-io.cn" source: hosted - version: "3.1.4" + version: "4.0.0" image_picker: dependency: "direct main" description: name: image_picker url: "https://pub.flutter-io.cn" source: hosted - version: "0.6.7+22" + version: "0.7.2" image_picker_platform_interface: dependency: transitive description: name: image_picker_platform_interface url: "https://pub.flutter-io.cn" source: hosted - version: "1.1.6" + version: "2.0.1" intl: dependency: transitive description: name: intl url: "https://pub.flutter-io.cn" source: hosted - version: "0.16.1" + version: "0.17.0" lpinyin: dependency: "direct main" description: @@ -173,35 +173,35 @@ packages: name: matcher url: "https://pub.flutter-io.cn" source: hosted - version: "0.12.10-nullsafety.1" + version: "0.12.10" meta: dependency: transitive description: name: meta url: "https://pub.flutter-io.cn" source: hosted - version: "1.3.0-nullsafety.3" + version: "1.3.0" path: dependency: transitive description: name: path url: "https://pub.flutter-io.cn" source: hosted - version: "1.8.0-nullsafety.1" + version: "1.8.0" pedantic: dependency: transitive description: name: pedantic url: "https://pub.flutter-io.cn" source: hosted - version: "1.9.2" + version: "1.11.0" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface url: "https://pub.flutter-io.cn" source: hosted - version: "1.0.3" + version: "2.0.0" sky_engine: dependency: transitive description: flutter @@ -213,14 +213,14 @@ packages: name: source_span url: "https://pub.flutter-io.cn" source: hosted - version: "1.8.0-nullsafety.2" + version: "1.8.0" stack_trace: dependency: transitive description: name: stack_trace url: "https://pub.flutter-io.cn" source: hosted - version: "1.10.0-nullsafety.1" + version: "1.10.0" states_rebuilder: dependency: transitive description: @@ -234,49 +234,51 @@ packages: name: stream_channel url: "https://pub.flutter-io.cn" source: hosted - version: "2.1.0-nullsafety.1" + version: "2.1.0" string_scanner: dependency: transitive description: name: string_scanner url: "https://pub.flutter-io.cn" source: hosted - version: "1.1.0-nullsafety.1" + version: "1.1.0" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.flutter-io.cn" source: hosted - version: "1.2.0-nullsafety.1" + version: "1.2.0" test_api: dependency: transitive description: name: test_api url: "https://pub.flutter-io.cn" source: hosted - version: "0.2.19-nullsafety.2" + version: "0.2.19" typed_data: dependency: transitive description: name: typed_data url: "https://pub.flutter-io.cn" source: hosted - version: "1.3.0-nullsafety.3" + version: "1.3.0" vector_math: dependency: transitive description: name: vector_math url: "https://pub.flutter-io.cn" source: hosted - version: "2.1.0-nullsafety.3" + version: "2.1.0" velocity_x: dependency: "direct main" description: - name: velocity_x - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.4.1" + path: "." + ref: HEAD + resolved-ref: "1366593e46af47f9e4c97f5f0b65de845d230838" + url: "http://test.akuhotel.com:8099/aku_fe/velocityX.git" + source: git + version: "1.4.0-dev" vxstate: dependency: transitive description: @@ -285,5 +287,5 @@ packages: source: hosted version: "1.0.1" sdks: - dart: ">=2.10.0-110 <2.11.0" - flutter: ">=1.17.0 <2.0.0" + dart: ">=2.12.0 <3.0.0" + flutter: ">=1.20.0" diff --git a/pubspec.yaml b/pubspec.yaml index 26b21b2..3542752 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -10,16 +10,19 @@ environment: dependencies: flutter: sdk: flutter - flutter_screenutil: ^3.2.0 + flutter_screenutil: ^5.0.0-nullsafety.7 flutter_easyrefresh: ^2.1.8 lpinyin: ^1.1.1 - image_picker: ^0.6.7+22 - bot_toast: ^3.0.5 + image_picker: ^0.7.2 + bot_toast: ^4.0.0+1 velocity_x: + git: + url: http://test.akuhotel.com:8099/aku_fe/velocityX.git + branch: stable expandable: ^4.1.4 - aku_ui: + animated_collection: git: - url: http://test.akuhotel.com:8099/aku_fe/aku_ui.git + url: http://test.akuhotel.com:8099/aku_fe/animated_collection.git get: dev_dependencies: