Upgrade to Dart 3 and upgrade dependencies

xiprox · May 12, 2023 · 0173f97 · 0173f97
1 parent 6d673ea
commit 0173f97
Show file tree

Hide file tree

Showing 19 changed files with 213 additions and 223 deletions.
diff --git a/lib/data/remote/client/gql_request.dart b/lib/data/remote/client/gql_request.dart
@@ -1,3 +1,5 @@
+import 'dart:isolate';
+
 import 'package:aoba/data/model/resource.dart';
 import 'package:aoba/init.dart';
 import 'package:aoba/services/services.dart';
@@ -9,21 +11,15 @@ class GqlRequest {
     QueryOptions options, {
     required T Function(Map<String, dynamic> data) fromJson,
   }) async {
-    final response = await Executor().execute(
-      fun1: _query,
-      arg1: options,
-    );
+    final response = await Isolate.run(() => _query(options));
     return await _parseResponse<T>(response, fromJson: fromJson);
   }
 
   static Future<Resource<T>> mutation<T>(
     MutationOptions options, {
     required T Function(Map<String, dynamic> data) fromJson,
   }) async {
-    final response = await Executor().execute(
-      fun1: _mutation,
-      arg1: options,
-    );
+    final response = await Isolate.run(() => _mutation(options));
     return await _parseResponse<T>(response, fromJson: fromJson);
   }
 
@@ -32,10 +28,8 @@ class GqlRequest {
     required T Function(Map<String, dynamic> data) fromJson,
   }) async {
     if (response.data != null) {
-      final deserialized = await Executor().execute(
-        fun2: _deserialize<T>,
-        arg1: fromJson,
-        arg2: response.data!,
+      final deserialized = await Isolate.run(
+        () => _deserialize<T>(fromJson, response.data!),
       );
       return Resource(data: deserialized);
     } else if (response.exception != null) {
@@ -75,27 +69,18 @@ class GqlRequest {
     }
   }
 
-  static Future<QueryResult> _mutation<T>(
-    MutationOptions options,
-    TypeSendPort port,
-  ) async {
+  static Future<QueryResult> _mutation<T>(MutationOptions options) async {
     if (!IsolateInit.initialized) await IsolateInit.init(isRootIsolate: false);
     return client.client.mutate(options);
   }
 
-  static Future<QueryResult> _query<T>(
-    QueryOptions options,
-    TypeSendPort port,
-  ) async {
+  static Future<QueryResult> _query<T>(QueryOptions options) async {
     if (!IsolateInit.initialized) await IsolateInit.init(isRootIsolate: false);
     return client.client.query(options);
   }
 
   static T _deserialize<T>(
-    T Function(Map<String, dynamic>) fromJson,
-    Map<String, dynamic> json,
-    TypeSendPort port,
-  ) {
+      T Function(Map<String, dynamic>) fromJson, Map<String, dynamic> json) {
     return fromJson(json);
   }
 }
diff --git a/lib/features/auth/auth_wrapper.dart b/lib/features/auth/auth_wrapper.dart
@@ -1,9 +1,11 @@
+import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:veee/veee.dart';
 
 import 'auth_page.dart';
 import 'auth_vm.dart';
 
+@RoutePage()
 class AuthWrapper extends StatelessWidget {
   final Function()? onSuccess;
 

diff --git a/lib/features/feed/content/loading_state/loading_state.dart b/lib/features/feed/content/loading_state/loading_state.dart
@@ -7,10 +7,10 @@ class LoadingState extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.all(8),
+    return const Padding(
+      padding: EdgeInsets.all(8),
       child: Column(
-        children: const [
+        children: [
           _ActivityTile(),
           SizedBox(height: 8),
           _ActivityTile(),

diff --git a/lib/features/home/home_page.dart b/lib/features/home/home_page.dart
@@ -7,9 +7,9 @@ class HomePage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return const Scaffold(
       body: Stack(
-        children: const [
+        children: [
           FeedWrapper(),
           Align(
             alignment: Alignment.bottomCenter,

diff --git a/lib/features/home/home_wrapper.dart b/lib/features/home/home_wrapper.dart
@@ -1,9 +1,11 @@
+import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 
 import 'home_page.dart';
 
+@RoutePage()
 class HomeWrapper extends StatelessWidget {
-  const HomeWrapper({Key? key}) : super(key: key);
+  const HomeWrapper({super.key});
 
   @override
   Widget build(BuildContext context) {

diff --git a/lib/features/lists/content/loading_state/loading_state.dart b/lib/features/lists/content/loading_state/loading_state.dart
@@ -1,4 +1,3 @@
-
 import 'package:aoba/widgets/shimmer/shimmer.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -8,10 +7,10 @@ class LoadingState extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Row(
+    return const Row(
       mainAxisAlignment: MainAxisAlignment.center,
       crossAxisAlignment: CrossAxisAlignment.center,
-      children: const [
+      children: [
         ShimmerCircle(8),
         SizedBox(width: 8),
         ShimmerCircle(8),

diff --git a/lib/features/lists/lists_wrapper.dart b/lib/features/lists/lists_wrapper.dart
@@ -6,14 +6,15 @@ import 'package:flutter/material.dart';
 import 'lists_page.dart';
 import 'lists_vm.dart';
 
+@RoutePage()
 class ListsWrapper extends StatelessWidget {
   final int? userId;
   final Color? color;
 
   const ListsWrapper({
     super.key,
-    @PathParam('userId') this.userId,
-    @QueryParam('color') this.color,
+    @pathParam this.userId,
+    this.color,
   });
 
   @override

diff --git a/lib/features/profile/content/loading_state/loading_state.dart b/lib/features/profile/content/loading_state/loading_state.dart
@@ -7,10 +7,10 @@ class LoadingState extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.all(8),
+    return const Padding(
+      padding: EdgeInsets.all(8),
       child: Column(
-        children: const [
+        children: [
           _ActivityTile(),
           SizedBox(height: 8),
           _ActivityTile(),

diff --git a/lib/features/profile/profile_wrapper.dart b/lib/features/profile/profile_wrapper.dart
@@ -6,14 +6,15 @@ import 'package:flutter/material.dart';
 import 'profile_page.dart';
 import 'profile_vm.dart';
 
+@RoutePage()
 class ProfileWrapper extends StatelessWidget {
   final int? userId;
   final Color? color;
 
   const ProfileWrapper({
     super.key,
     @PathParam('id') this.userId,
-    @QueryParam('color') this.color,
+    this.color,
   });
 
   @override

diff --git a/lib/features/redirect/redirect_wrapper.dart b/lib/features/redirect/redirect_wrapper.dart
@@ -1,10 +1,11 @@
-import 'package:aoba/navigation/navigation.dart';
+import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:veee/veee.dart';
 
 import 'redirect_page.dart';
 import 'redirect_vm.dart';
 
+@RoutePage()
 class RedirectWrapper extends StatelessWidget {
   final String? token;
 

diff --git a/lib/init.dart b/lib/init.dart
@@ -1,12 +1,11 @@
 import 'package:aoba/services/services.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
 import 'app.dart';
 import 'licenses.dart';
 
 Future init() async {
-  await Executor().warmUp(log: kDebugMode);
+  WidgetsFlutterBinding.ensureInitialized();
   await IsolateInit.init(isRootIsolate: true);
   Licenses.init();
   return runApp(const App());

diff --git a/lib/navigation/router.dart b/lib/navigation/router.dart
@@ -11,33 +11,32 @@ import 'package:aoba/features/redirect/redirect_wrapper.dart';
 
 part 'router.gr.dart';
 
-@MaterialAutoRouter(
-  replaceInRouteName: 'Wrapper,Route',
-  routes: [
+@AutoRouterConfig(
+  replaceInRouteName: 'Page|Wrapper,Route',
+)
+class AppRouter extends _$AppRouter {
+  @override
+  final List<AutoRoute> routes = [
     AutoRoute(
-      initial: true,
       path: '/',
-      guards: [AuthGuard],
-      page: HomeWrapper,
+      guards: [AuthGuard()],
+      page: HomeRoute.page,
     ),
     AutoRoute(
       path: '/login',
-      page: AuthWrapper,
+      page: AuthRoute.page,
     ),
     AutoRoute(
       path: '/profile/:id',
-      page: ProfileWrapper,
+      page: ProfileRoute.page,
     ),
     AutoRoute(
       path: '/lists/:userId',
-      page: ListsWrapper,
+      page: ListsRoute.page,
     ),
     AutoRoute(
       path: '/redirect',
-      page: RedirectWrapper,
+      page: RedirectRoute.page,
     ),
-  ],
-)
-class AppRouter extends _$AppRouter {
-  AppRouter({required super.authGuard});
+  ];
 }
diff --git a/lib/services/exported_services.dart b/lib/services/exported_services.dart
@@ -1,5 +1,3 @@
-export 'package:worker_manager/worker_manager.dart';
-
 export 'package:aoba/navigation/navigation.dart';
 
 export 'package:aoba/services/auth_service.dart';

diff --git a/lib/services/services.dart b/lib/services/services.dart
@@ -13,6 +13,7 @@ import 'exported_services.dart';
 export 'exported_services.dart';
 
 final get = GetIt.instance.get;
+final getIt = GetIt.instance.get;
 
 Logger get log => get<Logger>();
 
@@ -64,7 +65,7 @@ class Services {
     getIt.registerFactory<ListsRepo>(() => ListsRepoImpl());
     getIt.registerFactory<EntryUpdaterRepo>(() => EntryUpdaterRepoImpl());
 
-    getIt.registerSingleton(AppRouter(authGuard: AuthGuard()));
+    getIt.registerSingleton(AppRouter());
   }
 
   static Future _initTesting() async {

diff --git a/macos/Podfile.lock b/macos/Podfile.lock
@@ -2,33 +2,34 @@ PODS:
   - FlutterMacOS (1.0.0)
   - isar_flutter_libs (1.0.0):
     - FlutterMacOS
-  - path_provider_macos (0.0.1):
+  - path_provider_foundation (0.0.1):
+    - Flutter
     - FlutterMacOS
   - url_launcher_macos (0.0.1):
     - FlutterMacOS
 
 DEPENDENCIES:
   - FlutterMacOS (from `Flutter/ephemeral`)
   - isar_flutter_libs (from `Flutter/ephemeral/.symlinks/plugins/isar_flutter_libs/macos`)
-  - path_provider_macos (from `Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos`)
+  - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`)
   - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
 
 EXTERNAL SOURCES:
   FlutterMacOS:
     :path: Flutter/ephemeral
   isar_flutter_libs:
     :path: Flutter/ephemeral/.symlinks/plugins/isar_flutter_libs/macos
-  path_provider_macos:
-    :path: Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos
+  path_provider_foundation:
+    :path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin
   url_launcher_macos:
     :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos
 
 SPEC CHECKSUMS:
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
   isar_flutter_libs: 43385c99864c168fadba7c9adeddc5d38838ca6a
-  path_provider_macos: 3c0c3b4b0d4a76d2bf989a913c2de869c5641a19
+  path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
   url_launcher_macos: 597e05b8e514239626bcf4a850fcf9ef5c856ec3
 
 PODFILE CHECKSUM: 0d3963a09fc94f580682bd88480486da345dc3f0
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.1
diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj
@@ -202,7 +202,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					33CC10EC2044A3C60003C045 = {

diff --git a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"