feat: upgrade to Flutter 3.22.0

KRTirtho · Jun 1, 2024 · 71341ec · 71341ec
1 parent 02acbd9
commit 71341ec
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 68 deletions.
diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json
@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "3.19.5",
+  "flutterSdkVersion": "3.22.0",
   "flavors": {}
 }
diff --git a/.github/workflows/spotube-release-binary.yml b/.github/workflows/spotube-release-binary.yml
@@ -20,7 +20,7 @@ on:
         description: Dry run without uploading to release
 
 env:
-  FLUTTER_VERSION: 3.19.5
+  FLUTTER_VERSION: 3.22.0
 
 permissions:
   contents: write

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -24,6 +24,11 @@
     android:usesCleartextTraffic="true"
     android:requestLegacyExternalStorage="true"
   >
+    <!-- Enable Impeller -->
+    <meta-data
+      android:name="io.flutter.embedding.android.EnableImpeller"
+      android:value="true" />
+
     <activity
       android:name="com.ryanheise.audioservice.AudioServiceActivity"
       android:exported="true"

diff --git a/devtools_options.yaml b/devtools_options.yaml
@@ -0,0 +1 @@
+extensions:
diff --git a/lib/main.dart b/lib/main.dart
@@ -1,6 +1,5 @@
 import 'package:catcher_2/catcher_2.dart';
 import 'package:dart_discord_rpc/dart_discord_rpc.dart';
-import 'package:device_preview/device_preview.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -134,19 +133,7 @@ Future<void> main(List<String> rawArgs) async {
     ),
     runAppFunction: () {
       runApp(
-        ProviderScope(
-          child: DevicePreview(
-            availableLocales: L10n.all,
-            enabled: false,
-            data: const DevicePreviewData(
-              isEnabled: false,
-              orientation: Orientation.portrait,
-            ),
-            builder: (context) {
-              return const Spotube();
-            },
-          ),
-        ),
+        const ProviderScope(child: Spotube()),
       );
     },
   );
@@ -230,10 +217,8 @@ class SpotubeState extends ConsumerState<Spotube> {
       debugShowCheckedModeBanner: false,
       title: 'Spotube',
       builder: (context, child) {
-        return DevicePreview.appBuilder(
-          context,
-          kIsDesktop && !kIsMacOS ? DragToResizeArea(child: child!) : child,
-        );
+        if (kIsDesktop && !kIsMacOS) return DragToResizeArea(child: child!);
+        return child!;
       },
       themeMode: themeMode,
       theme: lightTheme,

diff --git a/pubspec.lock b/pubspec.lock
@@ -466,14 +466,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.7.10"
-  device_frame:
-    dependency: transitive
-    description:
-      name: device_frame
-      sha256: afe76182aec178d171953d9b4a50a43c57c7cf3c77d8b09a48bf30c8fa04dd9d
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.0"
   device_info_plus:
     dependency: "direct main"
     description:
@@ -490,14 +482,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "7.0.0"
-  device_preview:
-    dependency: "direct main"
-    description:
-      name: device_preview
-      sha256: "2f097bf31b929e15e6756dbe0ec1bcb63952ab9ed51c25dc5a2c722d2b21fdaf"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.0"
   dio:
     dependency: "direct main"
     description:
@@ -1258,10 +1242,10 @@ packages:
     dependency: "direct main"
     description:
       name: intl
-      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
       url: "https://pub.dev"
     source: hosted
-    version: "0.18.1"
+    version: "0.19.0"
   introduction_screen:
     dependency: "direct main"
     description:
@@ -1314,26 +1298,26 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.0"
+    version: "10.0.4"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.3"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.1"
   lints:
     dependency: transitive
     description:
@@ -1474,10 +1458,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.12.0"
   metadata_god:
     dependency: "direct main"
     description:
@@ -1494,14 +1478,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.5"
-  nested:
-    dependency: transitive
-    description:
-      name: nested
-      sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
   oauth2:
     dependency: transitive
     description:
@@ -1734,14 +1710,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.14.2"
-  provider:
-    dependency: transitive
-    description:
-      name: provider
-      sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.1.2"
   pub_api_client:
     dependency: "direct main"
     description:
@@ -2178,10 +2146,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
+    version: "0.7.0"
   time:
     dependency: transitive
     description:
@@ -2386,10 +2354,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
+      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
       url: "https://pub.dev"
     source: hosted
-    version: "13.0.0"
+    version: "14.2.1"
   watcher:
     dependency: transitive
     description:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -26,7 +26,6 @@ dependencies:
   curved_navigation_bar: ^1.0.3
   dbus: ^0.7.8
   device_info_plus: ^10.1.0
-  device_preview: ^1.1.0
   dio: ^5.4.3+1
   disable_battery_optimization: ^1.1.1
   duration: ^3.0.12
@@ -56,7 +55,7 @@ dependencies:
   hooks_riverpod: ^2.5.1
   html: ^0.15.1
   image_picker: ^1.1.0
-  intl: ^0.18.0
+  intl: any
   introduction_screen: ^3.1.14
   json_annotation: ^4.8.1
   logger: ^2.0.2