feat: upgrade flutter to v3.24.3 (#791)

GopeedLab · Oct 19, 2024 · a22b431 · a22b431
1 parent eb7c9ad
commit a22b431
Show file tree

Hide file tree

Showing 14 changed files with 285 additions and 210 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,17 +4,17 @@ on:
   workflow_dispatch:
     inputs:
       platform:
-        description: 'Build platform'
+        description: "Build platform"
         required: true
-        default: 'all'
+        default: "all"
       test:
-        description: 'Test mode'
+        description: "Test mode"
         required: true
         default: "false"
 
 env:
   GO_VERSION: "1.22"
-  FLUTTER_VERSION: "3.16.8"
+  FLUTTER_VERSION: "3.24.3"
 
 permissions:
   contents: write
@@ -35,7 +35,7 @@ jobs:
   build-windows:
     if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'windows' }}
     runs-on: windows-latest
-    needs: [ get-release ]
+    needs: [get-release]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
@@ -137,7 +137,7 @@ jobs:
   build-macos-arm64-lib:
     if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'macos' }}
     runs-on: macos-latest
-    needs: [ get-release ]
+    needs: [get-release]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
@@ -155,7 +155,7 @@ jobs:
   build-macos:
     if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'macos' }}
     runs-on: macos-13
-    needs: [ get-release, build-macos-arm64-lib ]
+    needs: [get-release, build-macos-arm64-lib]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
@@ -214,7 +214,7 @@ jobs:
   build-linux:
     if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'linux' }}
     runs-on: ubuntu-latest
-    needs: [ get-release ]
+    needs: [get-release]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
@@ -252,7 +252,7 @@ jobs:
   build-snap:
     if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'snap' }}
     runs-on: ubuntu-latest
-    needs: [ get-release ]
+    needs: [get-release]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
@@ -268,31 +268,31 @@ jobs:
         run: |
           go build -tags nosqlite -ldflags="-w -s -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION" -buildmode=c-shared -o ui/flutter/linux/bundle/lib/libgopeed.so github.com/GopeedLab/gopeed/bind/desktop
           cd ui/flutter
-          
+
           sudo snap install snapcraft --classic
           mkdir -p snap/gui
           cp assets/icon/icon.svg snap/gui/gopeed.svg
-          
+
           cat>snap/snapcraft.yaml<<EOF
           name: gopeed
           version: $VERSION
           summary: A modern download manager
           description: High speed downloader that supports all platforms.
-          
+
           confinement: strict
           base: core22
           grade: stable
-          
+
           architectures:
             - build-on: amd64
               build-for: amd64
-          
+
           slots:
             dbus-gopeed:
               interface: dbus
               bus: session
               name: com.gopeed.gopeed
-          
+
           apps:
             gopeed:
               command: bin/gopeed
@@ -345,10 +345,10 @@ jobs:
                 mkdir -p \$CRAFT_PART_INSTALL/bin/
                 cp -r build/linux/*/release/bundle/* \$CRAFT_PART_INSTALL/bin/
           EOF
-          
+
           cp linux/assets/com.gopeed.Gopeed.desktop snap/gui/gopeed.desktop
           sed -i 's/Icon=com.gopeed.Gopeed/Icon=\${SNAP}\/meta\/gui\/gopeed.svg/g' snap/gui/gopeed.desktop
-          
+
           snapcraft --use-lxd
 
           # Snapcraft login
@@ -357,7 +357,7 @@ jobs:
   build-android:
     if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'android' }}
     runs-on: ubuntu-latest
-    needs: [ get-release ]
+    needs: [get-release]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
@@ -366,7 +366,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: "zulu"
-          java-version: "11"
+          java-version: "17"
       - uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
@@ -395,7 +395,7 @@ jobs:
   build-ios:
     if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'ios' }}
     runs-on: macos-latest
-    needs: [ get-release ]
+    needs: [get-release]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
@@ -428,7 +428,7 @@ jobs:
   build-web:
     if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'web' }}
     runs-on: ubuntu-latest
-    needs: [ get-release ]
+    needs: [get-release]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
@@ -446,7 +446,7 @@ jobs:
           cd ../../
           cp -r ui/flutter/build/web cmd/web/dist
           mkdir -p dist/zip
-          
+
           goos_arr=(windows darwin linux)
           goarch_arr=(386 amd64 arm64)
           export CGO_ENABLED=0
@@ -477,7 +477,7 @@ jobs:
   build-docker:
     if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'docker' }}
     runs-on: ubuntu-latest
-    needs: [ get-release ]
+    needs: [get-release]
     steps:
       - name: Remove unnecessary files
         run: |

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -28,7 +28,7 @@ on:
 
 env:
   GO_VERSION: "1.22"
-  FLUTTER_VERSION: "3.16.8"
+  FLUTTER_VERSION: "3.24.3"
 
 jobs:
   #  lint:

diff --git a/README.md b/README.md
@@ -115,7 +115,7 @@ This project is divided into two parts, the front end uses `flutter`, the back e
 ### Environment
 
 1. Golang 1.22+
-2. Flutter 3.16+
+2. Flutter 3.24+
 
 ### Clone
 

diff --git a/README_ja-JP.md b/README_ja-JP.md
@@ -103,7 +103,7 @@ Gopeed (正式名 Go Speed) は `Golang` + `Flutter` によって開発された
 ### 環境
 
 1. Go 言語 1.22+
-2. Flutter 3.16+
+2. Flutter 3.24+
 
 ### クローン
 

diff --git a/README_vi-VN.md b/README_vi-VN.md
@@ -111,7 +111,7 @@ Dự án này được chia thành hai phần, phần giao diện sử dụng `f
 ### Environment
 
 1. Golang 1.22+
-2. Flutter 3.16+
+2. Flutter 3.24+
 
 ### Clone
 

diff --git a/README_zh-CN.md b/README_zh-CN.md
@@ -115,7 +115,7 @@ Gopeed 还提供了浏览器扩展用于接管浏览器下载，支持 Chrome、
 ### 环境要求
 
 1. Golang 1.22+
-2. Flutter 3.16+
+2. Flutter 3.24+
 
 ### 克隆项目
 

diff --git a/README_zh-TW.md b/README_zh-TW.md
@@ -86,7 +86,7 @@ Gopeed（全稱 Go Speed），是一款使用`Golang`+`Flutter`編寫的高速
 
 更多關於安裝的內容請參考[安裝文檔](https://docs.gopeed.com/zh/install.html)
 
-### 使用CLI安裝
+### 使用 CLI 安裝
 
 使用`go install`安裝：
 
@@ -111,7 +111,7 @@ go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
 ### 開發環境
 
 1. Golang 1.22+
-2. Flutter 3.16+
+2. Flutter 3.24+
 
 ### 克隆項目
 

diff --git a/ui/flutter/lib/app/modules/app/controllers/app_controller.dart b/ui/flutter/lib/app/modules/app/controllers/app_controller.dart
@@ -173,7 +173,7 @@ class AppController extends GetxController with WindowListener, TrayListener {
     });
 
     // Check initial link if app was in cold state (terminated)
-    final uri = await _appLinks.getInitialAppLink();
+    final uri = await _appLinks.getInitialLink();
     if (uri != null) {
       await _toCreate(uri);
     }

diff --git a/ui/flutter/macos/Podfile.lock b/ui/flutter/macos/Podfile.lock
@@ -3,6 +3,8 @@ PODS:
     - FlutterMacOS
   - desktop_drop (0.0.1):
     - FlutterMacOS
+  - device_info_plus (0.0.1):
+    - FlutterMacOS
   - FlutterMacOS (1.0.0)
   - macos_secure_bookmarks (0.0.3):
     - FlutterMacOS
@@ -28,6 +30,7 @@ PODS:
 DEPENDENCIES:
   - app_links (from `Flutter/ephemeral/.symlinks/plugins/app_links/macos`)
   - desktop_drop (from `Flutter/ephemeral/.symlinks/plugins/desktop_drop/macos`)
+  - device_info_plus (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos`)
   - FlutterMacOS (from `Flutter/ephemeral`)
   - macos_secure_bookmarks (from `Flutter/ephemeral/.symlinks/plugins/macos_secure_bookmarks/macos`)
   - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`)
@@ -44,6 +47,8 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral/.symlinks/plugins/app_links/macos
   desktop_drop:
     :path: Flutter/ephemeral/.symlinks/plugins/desktop_drop/macos
+  device_info_plus:
+    :path: Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos
   FlutterMacOS:
     :path: Flutter/ephemeral
   macos_secure_bookmarks:
@@ -68,15 +73,16 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   app_links: 10e0a0ab602ffaf34d142cd4862f29d34b303b2a
   desktop_drop: 69eeff437544aa619c8db7f4481b3a65f7696898
+  device_info_plus: 74e614483d05c89290d30a4c8feae15d555f7427
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
   macos_secure_bookmarks: cff041c4b377fa00941bb901aaec4d27fac5edf2
-  package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce
-  path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
+  package_info_plus: f5790acc797bf17c3e959e9d6cf162cc68ff7523
+  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   screen_retriever: 59634572a57080243dd1bf715e55b6c54f241a38
-  share_plus: 76dd39142738f7a68dd57b05093b5e8193f220f7
-  shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
+  share_plus: fd717ef89a2801d3491e737630112b80c310640e
+  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
   tray_manager: 9064e219c56d75c476e46b9a21182087930baf90
-  url_launcher_macos: 5f437abeda8c85500ceb03f5c1938a8c5a705399
+  url_launcher_macos: c82c93949963e55b228a30115bd219499a6fe404
   window_manager: 3a1844359a6295ab1e47659b1a777e36773cd6e8
 
 PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7

diff --git a/ui/flutter/macos/Runner.xcodeproj/project.pbxproj b/ui/flutter/macos/Runner.xcodeproj/project.pbxproj
@@ -206,7 +206,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					33CC10EC2044A3C60003C045 = {

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

diff --git a/ui/flutter/macos/Runner/AppDelegate.swift b/ui/flutter/macos/Runner/AppDelegate.swift
@@ -1,7 +1,7 @@
 import Cocoa
 import FlutterMacOS
 
-@NSApplicationMain
+@main
 class AppDelegate: FlutterAppDelegate {
   override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
     return false