Skip to content

Commit d9f757a

Browse files
authored
fix: revert flutter version to v3.16.8 (#821)
1 parent cd409fc commit d9f757a

File tree

14 files changed

+213
-288
lines changed

14 files changed

+213
-288
lines changed

.github/workflows/build.yml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ on:
44
workflow_dispatch:
55
inputs:
66
platform:
7-
description: "Build platform"
7+
description: 'Build platform'
88
required: true
9-
default: "all"
9+
default: 'all'
1010
test:
11-
description: "Test mode"
11+
description: 'Test mode'
1212
required: true
1313
default: "false"
1414

1515
env:
1616
GO_VERSION: "1.23"
17-
FLUTTER_VERSION: "3.24.3"
17+
FLUTTER_VERSION: "3.16.8"
1818

1919
permissions:
2020
contents: write
@@ -35,7 +35,7 @@ jobs:
3535
build-windows:
3636
if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'windows' }}
3737
runs-on: windows-latest
38-
needs: [get-release]
38+
needs: [ get-release ]
3939
steps:
4040
- uses: actions/checkout@v3
4141
- uses: actions/setup-go@v4
@@ -137,7 +137,7 @@ jobs:
137137
build-macos-arm64-lib:
138138
if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'macos' }}
139139
runs-on: macos-latest
140-
needs: [get-release]
140+
needs: [ get-release ]
141141
steps:
142142
- uses: actions/checkout@v3
143143
- uses: actions/setup-go@v4
@@ -155,7 +155,7 @@ jobs:
155155
build-macos:
156156
if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'macos' }}
157157
runs-on: macos-13
158-
needs: [get-release, build-macos-arm64-lib]
158+
needs: [ get-release, build-macos-arm64-lib ]
159159
steps:
160160
- uses: actions/checkout@v3
161161
- uses: actions/setup-go@v4
@@ -214,7 +214,7 @@ jobs:
214214
build-linux:
215215
if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'linux' }}
216216
runs-on: ubuntu-latest
217-
needs: [get-release]
217+
needs: [ get-release ]
218218
steps:
219219
- uses: actions/checkout@v3
220220
- uses: actions/setup-go@v4
@@ -252,7 +252,7 @@ jobs:
252252
build-snap:
253253
if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'snap' }}
254254
runs-on: ubuntu-latest
255-
needs: [get-release]
255+
needs: [ get-release ]
256256
steps:
257257
- uses: actions/checkout@v3
258258
- uses: actions/setup-go@v4
@@ -268,31 +268,31 @@ jobs:
268268
run: |
269269
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
270270
cd ui/flutter
271-
271+
272272
sudo snap install snapcraft --classic
273273
mkdir -p snap/gui
274274
cp assets/icon/icon.svg snap/gui/gopeed.svg
275-
275+
276276
cat>snap/snapcraft.yaml<<EOF
277277
name: gopeed
278278
version: $VERSION
279279
summary: A modern download manager
280280
description: High speed downloader that supports all platforms.
281-
281+
282282
confinement: strict
283283
base: core22
284284
grade: stable
285-
285+
286286
architectures:
287287
- build-on: amd64
288288
build-for: amd64
289-
289+
290290
slots:
291291
dbus-gopeed:
292292
interface: dbus
293293
bus: session
294294
name: com.gopeed.gopeed
295-
295+
296296
apps:
297297
gopeed:
298298
command: bin/gopeed
@@ -345,10 +345,10 @@ jobs:
345345
mkdir -p \$CRAFT_PART_INSTALL/bin/
346346
cp -r build/linux/*/release/bundle/* \$CRAFT_PART_INSTALL/bin/
347347
EOF
348-
348+
349349
cp linux/assets/com.gopeed.Gopeed.desktop snap/gui/gopeed.desktop
350350
sed -i 's/Icon=com.gopeed.Gopeed/Icon=\${SNAP}\/meta\/gui\/gopeed.svg/g' snap/gui/gopeed.desktop
351-
351+
352352
snapcraft --use-lxd
353353
354354
# Snapcraft login
@@ -357,7 +357,7 @@ jobs:
357357
build-android:
358358
if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'android' }}
359359
runs-on: ubuntu-latest
360-
needs: [get-release]
360+
needs: [ get-release ]
361361
steps:
362362
- uses: actions/checkout@v3
363363
- uses: actions/setup-go@v4
@@ -366,7 +366,7 @@ jobs:
366366
- uses: actions/setup-java@v3
367367
with:
368368
distribution: "zulu"
369-
java-version: "17"
369+
java-version: "11"
370370
- uses: subosito/flutter-action@v2
371371
with:
372372
flutter-version: ${{ env.FLUTTER_VERSION }}
@@ -395,7 +395,7 @@ jobs:
395395
build-ios:
396396
if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'ios' }}
397397
runs-on: macos-latest
398-
needs: [get-release]
398+
needs: [ get-release ]
399399
steps:
400400
- uses: actions/checkout@v3
401401
- uses: actions/setup-go@v4
@@ -428,7 +428,7 @@ jobs:
428428
build-web:
429429
if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'web' }}
430430
runs-on: ubuntu-latest
431-
needs: [get-release]
431+
needs: [ get-release ]
432432
steps:
433433
- uses: actions/checkout@v3
434434
- uses: actions/setup-go@v4
@@ -446,7 +446,7 @@ jobs:
446446
cd ../../
447447
cp -r ui/flutter/build/web cmd/web/dist
448448
mkdir -p dist/zip
449-
449+
450450
goos_arr=(windows darwin linux)
451451
goarch_arr=(386 amd64 arm64)
452452
export CGO_ENABLED=0
@@ -477,7 +477,7 @@ jobs:
477477
build-docker:
478478
if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'docker' }}
479479
runs-on: ubuntu-latest
480-
needs: [get-release]
480+
needs: [ get-release ]
481481
steps:
482482
- name: Remove unnecessary files
483483
run: |

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ on:
2828

2929
env:
3030
GO_VERSION: "1.23"
31-
FLUTTER_VERSION: "3.24.3"
31+
FLUTTER_VERSION: "3.16.8"
3232

3333
jobs:
3434
# lint:
@@ -73,17 +73,17 @@ jobs:
7373
- uses: subosito/flutter-action@v2
7474
with:
7575
flutter-version: ${{ env.FLUTTER_VERSION }}
76-
- if: runner.os == 'windows-latest'
76+
- if: runner.os == 'windows'
7777
run: |
7878
go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/windows/libgopeed.dll github.com/GopeedLab/gopeed/bind/desktop
7979
cd ui/flutter
8080
flutter build windows
81-
- if: runner.os == 'macos-latest'
81+
- if: runner.os == 'macOS'
8282
run: |
8383
go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/macos/Frameworks/libgopeed.dylib github.com/GopeedLab/gopeed/bind/desktop
8484
cd ui/flutter
8585
flutter build macos
86-
- if: runner.os == 'ubuntu-latest'
86+
- if: runner.os == 'Linux'
8787
run: |
8888
sudo apt-get update -y
8989
sudo apt-get install -y ninja-build libgtk-3-dev libayatana-appindicator3-dev

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ This project is divided into two parts, the front end uses `flutter`, the back e
115115
### Environment
116116

117117
1. Golang 1.23+
118-
2. Flutter 3.24+
118+
2. Flutter 3.16+
119119

120120
### Clone
121121

README_ja-JP.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ Gopeed (正式名 Go Speed) は `Golang` + `Flutter` によって開発された
103103
### 環境
104104

105105
1. Go 言語 1.23+
106-
2. Flutter 3.24+
106+
2. Flutter 3.16+
107107

108108
### クローン
109109

README_vi-VN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ Dự án này được chia thành hai phần, phần giao diện sử dụng `f
111111
### Environment
112112

113113
1. Golang 1.23+
114-
2. Flutter 3.24+
114+
2. Flutter 3.16+
115115

116116
### Clone
117117

README_zh-CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Gopeed 还提供了浏览器扩展用于接管浏览器下载,支持 Chrome、
115115
### 环境要求
116116

117117
1. Golang 1.23+
118-
2. Flutter 3.24+
118+
2. Flutter 3.16+
119119

120120
### 克隆项目
121121

README_zh-TW.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Gopeed(全稱 Go Speed),是一款使用`Golang`+`Flutter`編寫的高速
8686

8787
更多關於安裝的內容請參考[安裝文檔](https://docs.gopeed.com/zh/install.html)
8888

89-
### 使用 CLI 安裝
89+
### 使用CLI安裝
9090

9191
使用`go install`安裝:
9292

@@ -111,7 +111,7 @@ go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
111111
### 開發環境
112112

113113
1. Golang 1.23+
114-
2. Flutter 3.24+
114+
2. Flutter 3.16+
115115

116116
### 克隆項目
117117

ui/flutter/lib/app/modules/app/controllers/app_controller.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ class AppController extends GetxController with WindowListener, TrayListener {
173173
});
174174

175175
// Check initial link if app was in cold state (terminated)
176-
final uri = await _appLinks.getInitialLink();
176+
final uri = await _appLinks.getInitialAppLink();
177177
if (uri != null) {
178178
await _toCreate(uri);
179179
}

ui/flutter/macos/Podfile.lock

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ PODS:
33
- FlutterMacOS
44
- desktop_drop (0.0.1):
55
- FlutterMacOS
6-
- device_info_plus (0.0.1):
7-
- FlutterMacOS
86
- FlutterMacOS (1.0.0)
97
- macos_secure_bookmarks (0.0.3):
108
- FlutterMacOS
@@ -30,7 +28,6 @@ PODS:
3028
DEPENDENCIES:
3129
- app_links (from `Flutter/ephemeral/.symlinks/plugins/app_links/macos`)
3230
- desktop_drop (from `Flutter/ephemeral/.symlinks/plugins/desktop_drop/macos`)
33-
- device_info_plus (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos`)
3431
- FlutterMacOS (from `Flutter/ephemeral`)
3532
- macos_secure_bookmarks (from `Flutter/ephemeral/.symlinks/plugins/macos_secure_bookmarks/macos`)
3633
- package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`)
@@ -47,8 +44,6 @@ EXTERNAL SOURCES:
4744
:path: Flutter/ephemeral/.symlinks/plugins/app_links/macos
4845
desktop_drop:
4946
:path: Flutter/ephemeral/.symlinks/plugins/desktop_drop/macos
50-
device_info_plus:
51-
:path: Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos
5247
FlutterMacOS:
5348
:path: Flutter/ephemeral
5449
macos_secure_bookmarks:
@@ -73,16 +68,15 @@ EXTERNAL SOURCES:
7368
SPEC CHECKSUMS:
7469
app_links: 10e0a0ab602ffaf34d142cd4862f29d34b303b2a
7570
desktop_drop: 69eeff437544aa619c8db7f4481b3a65f7696898
76-
device_info_plus: 74e614483d05c89290d30a4c8feae15d555f7427
7771
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
7872
macos_secure_bookmarks: cff041c4b377fa00941bb901aaec4d27fac5edf2
79-
package_info_plus: f5790acc797bf17c3e959e9d6cf162cc68ff7523
80-
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
73+
package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce
74+
path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
8175
screen_retriever: 59634572a57080243dd1bf715e55b6c54f241a38
82-
share_plus: fd717ef89a2801d3491e737630112b80c310640e
83-
shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
76+
share_plus: 76dd39142738f7a68dd57b05093b5e8193f220f7
77+
shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
8478
tray_manager: 9064e219c56d75c476e46b9a21182087930baf90
85-
url_launcher_macos: c82c93949963e55b228a30115bd219499a6fe404
79+
url_launcher_macos: 5f437abeda8c85500ceb03f5c1938a8c5a705399
8680
window_manager: 3a1844359a6295ab1e47659b1a777e36773cd6e8
8781

8882
PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7

ui/flutter/macos/Runner.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@
206206
isa = PBXProject;
207207
attributes = {
208208
LastSwiftUpdateCheck = 0920;
209-
LastUpgradeCheck = 1510;
209+
LastUpgradeCheck = 1430;
210210
ORGANIZATIONNAME = "";
211211
TargetAttributes = {
212212
33CC10EC2044A3C60003C045 = {

ui/flutter/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1510"
3+
LastUpgradeVersion = "1430"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

ui/flutter/macos/Runner/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Cocoa
22
import FlutterMacOS
33

4-
@main
4+
@NSApplicationMain
55
class AppDelegate: FlutterAppDelegate {
66
override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
77
return false

0 commit comments

Comments
 (0)