fix: flutter downgrade to 3.22.2 (#11)

* fix: flutter downgrade to 3.22.2 在某些设备上动画会失效，relate to flutter/flutter#155048 * ci: Update release.yml --------- Co-authored-by: GhostenEditor <>
GhostenEditor · Dec 1, 2024 · 6faed75 · 6faed75
1 parent e63d373
commit 6faed75
Show file tree

Hide file tree

Showing 20 changed files with 63 additions and 100 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ jobs:
 
       - uses: subosito/flutter-action@v1
         with:
-          flutter-version: '3.24.4'
+          flutter-version: '3.22.2'
 
       - run: flutter pub get
 

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -18,6 +18,16 @@ if (keystorePropertiesFile.exists()) {
     keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 }
 
+def flutterVersionCode = localProperties.getProperty("flutter.versionCode")
+if (flutterVersionCode == null) {
+    flutterVersionCode = "1"
+}
+
+def flutterVersionName = localProperties.getProperty("flutter.versionName")
+if (flutterVersionName == null) {
+    flutterVersionName = "1.0"
+}
+
 android {
     namespace = "com.ghosten.player"
     compileSdk = flutter.compileSdkVersion
@@ -28,19 +38,14 @@ android {
         targetCompatibility = JavaVersion.VERSION_1_8
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
-    }
-
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId = "com.ghosten.player"
         // You can update the following values to match your application needs.
-        // For more information, see: https://flutter.dev/to/review-gradle-config.
+        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
         minSdk = flutter.minSdkVersion
         targetSdk = flutter.targetSdkVersion
-        versionCode = flutter.versionCode
-        versionName = flutter.versionName
+        versionCode = flutterVersionCode.toInteger()
+        versionName = flutterVersionName
     }
 
     signingConfigs {

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -17,7 +17,6 @@
                 android:name=".MainActivity"
                 android:exported="true"
                 android:launchMode="singleTop"
-                android:taskAffinity=""
                 android:theme="@style/LaunchTheme"
                 android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
                 android:hardwareAccelerated="true"

diff --git a/android/build.gradle b/android/build.gradle
@@ -9,23 +9,6 @@ rootProject.buildDir = "../build"
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
-
-// FIX flutter plugin install_plugin for Flutter 3.24
-subprojects {
-    afterEvaluate { project ->
-        if (project.group == "com.example.installplugin") {
-            project.android {
-                compileSdkVersion = 34
-                namespace = project.group
-                compileOptions {
-                    sourceCompatibility = JavaVersion.VERSION_17
-                    targetCompatibility = JavaVersion.VERSION_17
-                }
-            }
-        }
-    }
-}
-
 subprojects {
     project.evaluationDependsOn(":app")
 }

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
+org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.1.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
+    id "com.android.application" version "7.3.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
 }
 
 include ":app"
diff --git a/lib/components/pop_to_top.dart b/lib/components/pop_to_top.dart
@@ -18,7 +18,7 @@ class PopToTop extends StatelessWidget {
   Widget build(BuildContext context) {
     return PopScope(
         canPop: false,
-        onPopInvokedWithResult: (didPop, _) {
+        onPopInvoked: (didPop) {
           if (!didPop) {
             if (PlatformApi.isAndroidTV() && controller.offset > 1000) {
               controller.animateTo(

diff --git a/lib/main.dart b/lib/main.dart
@@ -128,7 +128,7 @@ class _QuitConfirmState extends State<QuitConfirm> {
         ? widget.child
         : PopScope(
             canPop: false,
-            onPopInvokedWithResult: (didPop, _) {
+            onPopInvoked: (didPop) {
               if (didPop) {
                 return;
               }

diff --git a/lib/pages/library.dart b/lib/pages/library.dart
@@ -36,7 +36,7 @@ class _LibraryManageState extends State<LibraryManage> {
   Widget build(BuildContext context) {
     return PopScope(
       canPop: false,
-      onPopInvokedWithResult: (didPop, _) {
+      onPopInvoked: (didPop) {
         if (!didPop) Navigator.of(context).pop(refresh);
       },
       child: Scaffold(

diff --git a/lib/pages/player/live_player.dart b/lib/pages/player/live_player.dart
@@ -68,7 +68,7 @@ class _LivePlayerPageState extends State<LivePlayerPage> {
               ),
               PopScope(
                 canPop: false,
-                onPopInvokedWithResult: (didPop, _) async {
+                onPopInvoked: (didPop) async {
                   if (didPop) {
                     return;
                   }

diff --git a/lib/utils/notification.dart b/lib/utils/notification.dart
@@ -106,7 +106,7 @@ Future<NotificationResponse<T?>?> showNotification<T>(
                 future: future,
                 builder: (context, snapshot) => PopScope(
                       canPop: false,
-                      onPopInvokedWithResult: (didPop, _) {
+                      onPopInvoked: (didPop) {
                         if (!didPop && !snapshot.connectionState.isLoading()) {
                           Navigator.of(context).pop(NotificationResponse(data: snapshot.data, error: snapshot.error));
                         }

diff --git a/packages/api/pubspec.yaml b/packages/api/pubspec.yaml
@@ -3,7 +3,7 @@ description: "Api Plugin for Ghosten Player"
 version: 1.2.0
 
 environment:
-  sdk: ^3.5.4
+  sdk: '>=3.4.3 <4.0.0'
   flutter: '>=3.3.0'
 
 dependencies:

diff --git a/packages/bluetooth/pubspec.yaml b/packages/bluetooth/pubspec.yaml
@@ -3,7 +3,7 @@ description: "Bluetooth Plugin for Ghosten Player"
 version: 1.2.0
 
 environment:
-  sdk: ^3.5.4
+  sdk: '>=3.4.3 <4.0.0'
   flutter: '>=3.3.0'
 
 dependencies:

diff --git a/packages/file_picker/lib/src/file_picker_dialog.dart b/packages/file_picker/lib/src/file_picker_dialog.dart
@@ -57,7 +57,7 @@ class _FilePickerDialogState<T> extends State<FilePickerDialog<T>> {
       ),
       body: PopScope(
         canPop: false,
-        onPopInvokedWithResult: (didPop, _) {
+        onPopInvoked: (didPop) {
           if (!didPop) _pageBack();
         },
         child: RefreshIndicator(

diff --git a/packages/file_picker/pubspec.yaml b/packages/file_picker/pubspec.yaml
@@ -3,7 +3,7 @@ description: "File Picker Plugin for Ghosten Player"
 version: 1.2.0
 
 environment:
-  sdk: ^3.5.4
+  sdk: '>=3.4.3 <4.0.0'
   flutter: '>=3.3.0'
 
 dependencies:

diff --git a/packages/player_view/lib/src/player_controls.dart b/packages/player_view/lib/src/player_controls.dart
@@ -333,7 +333,7 @@ class _PlayerControlsState extends State<PlayerControls> {
           floatingActionButtonLocation: FloatingActionButtonLocation.startTop,
           body: PopScope(
             canPop: false,
-            onPopInvokedWithResult: (didPop, _) async {
+            onPopInvoked: (didPop) async {
               if (didPop) {
                 return;
               } else if (_scaffoldKey.currentState!.isEndDrawerOpen) {

diff --git a/packages/player_view/pubspec.yaml b/packages/player_view/pubspec.yaml
@@ -3,7 +3,7 @@ description: "Video Player Plugin for Ghosten Player"
 version: 1.2.0
 
 environment:
-  sdk: ^3.5.4
+  sdk: '>=3.4.3 <4.0.0'
   flutter: '>=3.3.0'
 
 dependencies: