Skip to content

Commit aa514dd

Browse files
SlotSunSlotSun
committed
release v1.8.5
1 parent ef4bfe1 commit aa514dd

File tree

58 files changed

+2757
-702
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+2757
-702
lines changed

‎.github/workflows/pr.yaml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,19 @@ jobs:
9090
- name: Install Dependencies
9191
run: |
9292
sudo apt-get update
93-
sudo apt-get install -y clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev libmpv-dev mpv libasound2-dev
93+
sudo apt-get install -y clang cmake libgtk-3-dev unzip libasound2-dev gcc g++ autoconf automake \
94+
debhelper glslang-dev ladspa-sdk xutils-dev libasound2-dev libarchive-dev libbluray-dev \
95+
libdav1d-dev libdvdnav-dev libegl1-mesa-dev libepoxy-dev libfontconfig-dev libfreetype6-dev \
96+
libfribidi-dev libgl1-mesa-dev libgbm-dev libgme-dev libgsm1-dev libharfbuzz-dev libjpeg-dev \
97+
libbrotli-dev liblcms2-dev libmodplug-dev libmp3lame-dev libopenal-dev \
98+
libopus-dev libopencore-amrnb-dev libopencore-amrwb-dev libpulse-dev librtmp-dev \
99+
libsdl2-dev libsixel-dev libssh-dev libsoxr-dev libspeex-dev libtool \
100+
libv4l-dev libva-dev libvdpau-dev libvorbis-dev libvo-amrwbenc-dev \
101+
libunwind-dev libvpx-dev libwayland-dev libx11-dev libxext-dev libdrm-dev \
102+
libxkbcommon-dev libxrandr-dev libxss-dev libxv-dev libxvidcore-dev \
103+
linux-libc-dev nasm ninja-build pkg-config python3 python3-docutils wayland-protocols \
104+
x11proto-core-dev zlib1g-dev libfdk-aac-dev libtheora-dev libwebp-dev \
105+
unixodbc-dev libpq-dev libxxhash-dev libaom-dev libbs2b-dev libcaca-dev libcdio-paranoia-dev
94106
95107
- name: Enable Flutter Desktop
96108
run: flutter config --enable-linux-desktop

‎.github/workflows/publish_app_dev.yaml‎

Lines changed: 77 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,15 @@ concurrency:
1212
cancel-in-progress: true
1313

1414
jobs:
15-
# 打包 Android、iOS、Mac
16-
build-mac-ios-android:
17-
# https://github.com/actions/runner-images/issues/12541
18-
runs-on: macos-15
1915

20-
permissions:
21-
contents: write
16+
# packing android on ubuntu, macos slowly
17+
build-android:
18+
runs-on: ubuntu-latest
19+
permissions: write-all
2220

2321
steps:
2422
# 签出代码
25-
- uses: actions/checkout@v4
23+
- uses: actions/checkout@v6
2624
with:
2725
ref: dev
2826

@@ -40,6 +38,61 @@ jobs:
4038
echo "keyPassword=${{ secrets.KEY_PASSWORD }}" >> simple_live_app/android/key.properties
4139
echo "keyAlias=${{ secrets.KEY_ALIAS }}" >> simple_live_app/android/key.properties
4240
41+
# 设置 JAVA 环境
42+
- uses: actions/setup-java@v5
43+
with:
44+
distribution: "zulu"
45+
java-version: "17"
46+
cache: "gradle"
47+
cache-dependency-path: |
48+
simple_live_app/android/*.gradle*
49+
simple_live_app/android/**/gradle-wrapper.properties
50+
51+
# 设置 Flutter
52+
- name: Flutter action
53+
uses: subosito/flutter-action@v2
54+
with:
55+
channel: stable
56+
flutter-version-file: simple_live_app/pubspec.yaml
57+
cache: true
58+
59+
# 更新 Flutter 的 packages
60+
- name: Restore packages
61+
run: |
62+
cd simple_live_app
63+
flutter pub get
64+
65+
# 打包 APK
66+
- name: Build APK
67+
run: |
68+
cd simple_live_app
69+
flutter build apk --release --split-per-abi
70+
71+
# 上传 Artifacts
72+
- name: Upload APK to Artifacts
73+
uses: actions/upload-artifact@v4
74+
with:
75+
name: android
76+
path: |
77+
simple_live_app/build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk
78+
simple_live_app/build/app/outputs/flutter-apk/app-arm64-v8a-release.apk
79+
simple_live_app/build/app/outputs/flutter-apk/app-x86_64-release.apk
80+
81+
82+
# 打包iOS、Mac
83+
build-mac-ios:
84+
# https://github.com/actions/runner-images/issues/12541
85+
runs-on: macos-15
86+
87+
permissions:
88+
contents: write
89+
90+
steps:
91+
# 签出代码
92+
- uses: actions/checkout@v4
93+
with:
94+
ref: dev
95+
4396
# 设置 JAVA 环境
4497
- uses: actions/setup-java@v4
4598
with:
@@ -76,22 +129,6 @@ jobs:
76129
dart pub global activate melos
77130
melos run activate
78131
79-
# 打包 APK
80-
- name: Build APK
81-
run: |
82-
cd simple_live_app
83-
flutter build apk --release --split-per-abi
84-
85-
# 上传 Artifacts
86-
- name: Upload APK to Artifacts
87-
uses: actions/upload-artifact@v4
88-
with:
89-
name: android
90-
path: |
91-
simple_live_app/build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk
92-
simple_live_app/build/app/outputs/flutter-apk/app-arm64-v8a-release.apk
93-
simple_live_app/build/app/outputs/flutter-apk/app-x86_64-release.apk
94-
95132
# 打包 iOS
96133
- name: Build IPA
97134
run: |
@@ -160,7 +197,21 @@ jobs:
160197
- name: Update apt-get
161198
run: sudo apt-get update
162199
- name: Install Dependencies
163-
run: sudo apt-get install -y clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev libmpv-dev mpv libasound2-dev
200+
run: |
201+
sudo apt-get update
202+
sudo apt-get install -y clang cmake libgtk-3-dev unzip libasound2-dev gcc g++ autoconf automake \
203+
debhelper glslang-dev ladspa-sdk xutils-dev libasound2-dev libarchive-dev libbluray-dev \
204+
libdav1d-dev libdvdnav-dev libegl1-mesa-dev libepoxy-dev libfontconfig-dev libfreetype6-dev \
205+
libfribidi-dev libgl1-mesa-dev libgbm-dev libgme-dev libgsm1-dev libharfbuzz-dev libjpeg-dev \
206+
libbrotli-dev liblcms2-dev libmodplug-dev libmp3lame-dev libopenal-dev \
207+
libopus-dev libopencore-amrnb-dev libopencore-amrwb-dev libpulse-dev librtmp-dev \
208+
libsdl2-dev libsixel-dev libssh-dev libsoxr-dev libspeex-dev libtool \
209+
libv4l-dev libva-dev libvdpau-dev libvorbis-dev libvo-amrwbenc-dev \
210+
libunwind-dev libvpx-dev libwayland-dev libx11-dev libxext-dev libdrm-dev \
211+
libxkbcommon-dev libxrandr-dev libxss-dev libxv-dev libxvidcore-dev \
212+
linux-libc-dev nasm ninja-build pkg-config python3 python3-docutils wayland-protocols \
213+
x11proto-core-dev zlib1g-dev libfdk-aac-dev libtheora-dev libwebp-dev \
214+
unixodbc-dev libpq-dev libxxhash-dev libaom-dev libbs2b-dev libcaca-dev libcdio-paranoia-dev
164215
# 打开 Linux Desktop 支持
165216
- name: Enable Flutter Desktop
166217
run: flutter config --enable-linux-desktop
@@ -238,6 +289,7 @@ jobs:
238289
run: |
239290
cd simple_live_app
240291
fastforge package --platform windows --targets msix,zip,exe --skip-clean
292+
cd build/dist/*
241293
Get-ChildItem "simple_live_app-*" | ForEach-Object {
242294
$newName = $_.Name -replace '^simple_live_app', 'Slive'
243295
Rename-Item $_ -NewName $newName
@@ -291,7 +343,7 @@ jobs:
291343
--install-deps-from=flathub \
292344
--ccache \
293345
--disable-rofiles-fuse
294-
flatpak build-bundle ${{ matrix.arch }} Slive-${{ matrix.arch }}.flatpak io.github.SlotSun.dart_simple_live
346+
flatpak build-bundle ${{ matrix.arch }} Slive-${{ matrix.arch }}.flatpak io.github.SlotSun.Slive
295347
296348
# 上传 Flatpak 包至 Artifacts
297349
- name: Upload linux flatpak to artifacts

‎.github/workflows/publish_app_release.yml‎

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@ on:
88
jobs:
99
# 打包 Android
1010
build-android:
11-
runs-on: macos-latest
12-
permissions:
13-
contents: write
11+
runs-on: ubuntu-latest
12+
permissions: write-all
13+
1414
steps:
1515
# 签出代码
16-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v6
17+
with:
18+
ref: dev
1719

1820
# APK 签名设置
1921
- name: Download Android keystore
@@ -30,16 +32,20 @@ jobs:
3032
echo "keyAlias=${{ secrets.KEY_ALIAS }}" >> simple_live_app/android/key.properties
3133
3234
# 设置 JAVA 环境
33-
- uses: actions/setup-java@v4
35+
- uses: actions/setup-java@v5
3436
with:
35-
distribution: 'zulu'
36-
java-version: "21"
37+
distribution: "zulu"
38+
java-version: "17"
3739
cache: "gradle"
40+
cache-dependency-path: |
41+
simple_live_app/android/*.gradle*
42+
simple_live_app/android/**/gradle-wrapper.properties
3843
3944
# 设置 Flutter
4045
- name: Flutter action
4146
uses: subosito/flutter-action@v2
4247
with:
48+
channel: stable
4349
flutter-version-file: simple_live_app/pubspec.yaml
4450
cache: true
4551

@@ -116,7 +122,21 @@ jobs:
116122
- name: Update apt-get
117123
run: sudo apt-get update
118124
- name: Install Dependencies
119-
run: sudo apt-get install -y clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev libmpv-dev mpv libasound2-dev
125+
run: |
126+
sudo apt-get update
127+
sudo apt-get install -y clang cmake libgtk-3-dev unzip libasound2-dev gcc g++ autoconf automake \
128+
debhelper glslang-dev ladspa-sdk xutils-dev libasound2-dev libarchive-dev libbluray-dev \
129+
libdav1d-dev libdvdnav-dev libegl1-mesa-dev libepoxy-dev libfontconfig-dev libfreetype6-dev \
130+
libfribidi-dev libgl1-mesa-dev libgbm-dev libgme-dev libgsm1-dev libharfbuzz-dev libjpeg-dev \
131+
libbrotli-dev liblcms2-dev libmodplug-dev libmp3lame-dev libopenal-dev \
132+
libopus-dev libopencore-amrnb-dev libopencore-amrwb-dev libpulse-dev librtmp-dev \
133+
libsdl2-dev libsixel-dev libssh-dev libsoxr-dev libspeex-dev libtool \
134+
libv4l-dev libva-dev libvdpau-dev libvorbis-dev libvo-amrwbenc-dev \
135+
libunwind-dev libvpx-dev libwayland-dev libx11-dev libxext-dev libdrm-dev \
136+
libxkbcommon-dev libxrandr-dev libxss-dev libxv-dev libxvidcore-dev \
137+
linux-libc-dev nasm ninja-build pkg-config python3 python3-docutils wayland-protocols \
138+
x11proto-core-dev zlib1g-dev libfdk-aac-dev libtheora-dev libwebp-dev \
139+
unixodbc-dev libpq-dev libxxhash-dev libaom-dev libbs2b-dev libcaca-dev libcdio-paranoia-dev
120140
# 打开 Linux Desktop 支持
121141
- name: Enable Flutter Desktop
122142
run: flutter config --enable-linux-desktop
@@ -214,6 +234,12 @@ jobs:
214234
run: |
215235
cd simple_live_app
216236
fastforge package --platform windows --targets msix,zip,exe --skip-clean
237+
cd build/dist/*
238+
Get-ChildItem "simple_live_app-*" | ForEach-Object {
239+
$newName = $_.Name -replace '^simple_live_app', 'Slive'
240+
Rename-Item $_ -NewName $newName
241+
}
242+
shell: pwsh
217243
# 上传 Windows 至 Artifacts
218244
- name: Upload Windows APP to Artifacts
219245
uses: actions/upload-artifact@v4
@@ -285,7 +311,7 @@ jobs:
285311
--install-deps-from=flathub \
286312
--ccache \
287313
--disable-rofiles-fuse
288-
flatpak build-bundle ${{ matrix.arch }} Slive-${{ matrix.arch }}.flatpak io.github.SlotSun.dart_simple_live
314+
flatpak build-bundle ${{ matrix.arch }} Slive-${{ matrix.arch }}.flatpak io.github.SlotSun.Slive
289315
290316
# 上传 Flatpak 包至 Artifacts
291317
- name: Upload linux flatpak to artifacts

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
- [x] Windows
3131
- [x] MacOS `自测`
3232
- [x] Linux
33-
- [ ] Android TV `请自行打包` [说明](https://github.com/SlotSun/dart_simple_live/issues/4)
33+
- [ ] Android TV `请自行打包` [说明](https://github.com/SlotSun/dart_simple_live/issues/89)
3434

3535
只保证Android, Linux和Windows可用性
3636

‎assets/app_version.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"version": "1.8.4",
3-
"version_num": 10804,
4-
"version_desc": "### 已修改包名slotsun.slive,相关事宜请查看 #93 \n- fix：huya \n- 优化弹幕去重功能 \n- 关于linux的一系列修复 @pugaizai\n- fix: 一些代码和逻辑错误\n- tips: ios和macos用户请到action更新测试或者下载上游仓库版本",
5-
"prerelease": false,
2+
"version": "1.8.5",
3+
"version_num": 10805,
4+
"version_desc": "- 支持 huya wup v2\n- 支持 自定义字体 [说明](https://github.com/SlotSun/dart_simple_live/issues/86#issuecomment-3698650006)\n- 支持 修改备注\n- 支持 关注页面多项排序\n- 支持 关注页面显示样式切换\n- 修复 douyin解析\n- 弱网调整-请保证网络流畅使用\n- 关于linux的一系列修复 @pugaizai\n- fix: 一些代码和逻辑错误\n- tips: ios和macos用户请到action更新测试或者下载上游仓库版本",
5+
"prerelease": true,
66
"download_url": "https://github.com/SlotSun/dart_simple_live/releases"
77
}

‎assets/update-linux-metainfo.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ void main() {
1212
final projectRoot = Directory.current.path;
1313
final jsonPath = '$projectRoot/assets/app_version.json';
1414
final targetPath =
15-
'$projectRoot/simple_live_app/assets/io.github.SlotSun.dart_simple_live.metainfo.xml';
15+
'$projectRoot/simple_live_app/assets/io.github.SlotSun.Slive.metainfo.xml';
1616

1717
final jsonFile = File(jsonPath);
1818
if (!jsonFile.existsSync()) {

‎flatpak/flatpak-manifest.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
app-id: io.github.SlotSun.dart_simple_live
1+
app-id: io.github.SlotSun.Slive
22
runtime: org.freedesktop.Platform
33
runtime-version: '25.08'
44
sdk: org.freedesktop.Sdk
55
sdk-extensions:
66
- org.freedesktop.Sdk.Extension.llvm21
7-
command: Slive
7+
command: io.github.SlotSun.Slive
88
finish-args:
99
- --share=ipc
1010
- --socket=fallback-x11
@@ -47,7 +47,7 @@ modules:
4747
url: https://static.rust-lang.org/rustup/dist/aarch64-unknown-linux-gnu/rustup-init
4848
sha256: e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c
4949

50-
- name: dart_simple_live
50+
- name: Slive
5151
buildsystem: simple
5252
build-options:
5353
build-args:
@@ -59,12 +59,12 @@ modules:
5959
aarch64:
6060
env:
6161
BUNDLE_PATH: simple_live_app/build/linux/arm64/release/bundle
62-
append-path: /var/lib/rustup/bin:/usr/lib/sdk/llvm21/bin:/run/build/dart_simple_live/flutter/bin
62+
append-path: /var/lib/rustup/bin:/usr/lib/sdk/llvm21/bin:/run/build/Slive/flutter/bin
6363
prepend-ld-library-path: /usr/lib/sdk/llvm21/lib
6464
env:
6565
RUSTUP_HOME: /var/lib/rustup
6666
CARGO_HOME: /var/lib/rustup
67-
PUB_CACHE: /run/build/dart_simple_live/.pub-cache
67+
PUB_CACHE: /run/build/Slive/.pub-cache
6868
build-commands:
6969
- cd simple_live_app && flutter build linux --release
7070
- install -dvm755 ${FLATPAK_DEST}/bin

‎simple_live_app/analysis_options.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ linter:
3030
rules:
3131
# avoid_print: false # Uncomment to disable the `avoid_print` rule
3232
# prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule
33+
constant_identifier_names: false
3334

3435
# Additional information about this file can be found at
3536
# https://dart.dev/guides/language/analysis-options

0 commit comments

Comments
 (0)