From 29d0f5ebcf29b0c2e736af3004c63d1d82299758 Mon Sep 17 00:00:00 2001
From: madoka773 <85693457+madoka773@users.noreply.github.com>
Date: Thu, 4 Jan 2024 12:46:16 +0800
Subject: [PATCH] ci: use flutter distributor (#313)

---
 .github/workflows/build.yml                   | 127 +++---------------
 .gitignore                                    |   2 +-
 ui/flutter/distribute_options.yaml            |   1 +
 .../linux/assets/com.gopeed.Gopeed.desktop    |   2 +-
 .../linux/packaging/appimage/make_config.yaml |  17 +++
 .../linux/packaging/deb/make_config.yaml      |  30 +++++
 .../linux/packaging/rpm/make_config.yaml      |  24 ++++
 ui/flutter/pubspec.lock                       |  57 ++++----
 ui/flutter/pubspec.yaml                       |   5 +-
 9 files changed, 124 insertions(+), 141 deletions(-)
 create mode 100644 ui/flutter/distribute_options.yaml
 create mode 100644 ui/flutter/linux/packaging/appimage/make_config.yaml
 create mode 100644 ui/flutter/linux/packaging/deb/make_config.yaml
 create mode 100644 ui/flutter/linux/packaging/rpm/make_config.yaml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ea157ebc..25e12ec0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -223,126 +223,33 @@ jobs:
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
       - run: |
-          sudo apt-get update -y
-          sudo apt-get install -y ninja-build libgtk-3-dev libappindicator3-dev
+          sudo apt update -y
+          # flutter build dependencies
+          sudo apt install -y ninja-build libgtk-3-dev libappindicator3-dev
+          # rpm build dependencies
+          sudo apt install -y rpm patchelf
+          # appimage build dependencies
+          sudo apt install -y libfuse2 locate
+          wget -O appimagetool "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage"
+          chmod +x appimagetool
+          sudo mv appimagetool /usr/local/bin/
       - name: Build
         env:
           VERSION: ${{ needs.get-release.outputs.tag_name }}
         run: |
           go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/linux/bundle/lib/libgopeed.so github.com/GopeedLab/gopeed/bind/desktop
           cd ui/flutter
-          flutter build linux
-          mkdir -p build/dist
-          
-          # Build portable
-          tar -C build/linux/x64/release/bundle -czaf build/dist/Gopeed-$VERSION-linux-amd64-portable.tar.gz ./
-          
-          # Build deb package
-          mkdir -p debian/gopeed/opt/gopeed
-          mkdir -p debian/gopeed/usr/share/applications
-          mkdir -p debian/gopeed/usr/share/icons/hicolor/scalable/apps
-          mkdir -p debian/gopeed/DEBIAN
-
-          cp -r build/linux/x64/release/bundle/* debian/gopeed/opt/gopeed/
-          cp assets/icon/icon.svg debian/gopeed/usr/share/icons/hicolor/scalable/apps/com.gopeed.Gopeed.svg
-          
-          cat>debian/gopeed/DEBIAN/postinst<<EOF
-          #!/bin/bash
-          ln -sf /opt/gopeed/gopeed /usr/bin/gopeed
-          EOF
-
-          cat>debian/gopeed/DEBIAN/postrm<<EOF
-          #!/bin/bash
-          rm -rf /usr/bin/gopeed
-          EOF
-
-          chmod 0755 debian/gopeed/DEBIAN/postinst
-          chmod 0755 debian/gopeed/DEBIAN/postrm
-
-          cat>debian/gopeed/DEBIAN/control<<EOF
-          Package: gopeed
-          Version: ${VERSION:1}
-          Architecture: amd64
-          Essential: no
-          Priority: optional
-          Depends: 
-          Maintainer: monkeyWie
-          Description: High speed downloader that supports all platforms.
-          EOF
-
-          cp linux/assets/com.gopeed.Gopeed.desktop debian/gopeed/usr/share/applications/gopeed.desktop
-
-          dpkg-deb --build debian/gopeed
-          mv debian/gopeed.deb build/dist/Gopeed-$VERSION-linux-amd64.deb
-          
-          # Build AppImage
-          sudo apt-get -y install libfuse2
-          wget -O appimage-builder https://github.com/AppImageCrafters/appimage-builder/releases/download/v1.1.0/appimage-builder-1.1.0-x86_64.AppImage
-          chmod +x appimage-builder
-          mkdir AppDir
-          cp -r build/linux/x64/release/bundle/* AppDir
-          mkdir -p AppDir/usr/share/icons/hicolor/scalable/apps/
-          cp assets/icon/icon.svg AppDir/usr/share/icons/hicolor/scalable/apps/gopeed.svg
-          cat>AppImageBuilder.yml<<EOF
-          version: 1
-          AppDir:
-            path: ${PWD}/AppDir
-            app_info:
-              id: com.gopeed.gopeed
-              name: Gopeed
-              icon: gopeed
-              version: ${VERSION:1}
-              exec: gopeed
-              exec_args: \$@
-            apt:
-              arch: amd64
-              allow_unauthenticated: true
-              sources:
-                - sourceline: deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ jammy main restricted
-                    universe multiverse
-                - sourceline: deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ jammy-updates main
-                    restricted universe multiverse
-                - sourceline: deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ jammy-backports
-                    main restricted universe multiverse
-                - sourceline: deb http://security.ubuntu.com/ubuntu/ jammy-security main restricted
-                    universe multiverse
-              include: []
-            files:
-              include: []
-              exclude:
-                - usr/share/man
-                - usr/share/doc/*/README.*
-                - usr/share/doc/*/changelog.*
-                - usr/share/doc/*/NEWS.*
-                - usr/share/doc/*/TODO.*
-            test:
-              fedora-30:
-                image: appimagecrafters/tests-env:fedora-30
-                command: ./AppRun
-              debian-stable:
-                image: appimagecrafters/tests-env:debian-stable
-                command: ./AppRun
-              archlinux-latest:
-                image: appimagecrafters/tests-env:archlinux-latest
-                command: ./AppRun
-              centos-7:
-                image: appimagecrafters/tests-env:centos-7
-                command: ./AppRun
-              ubuntu-xenial:
-                image: appimagecrafters/tests-env:ubuntu-xenial
-                command: ./AppRun
-          AppImage:
-            arch: x86_64
-            update-information: guess
-          EOF
-          ./appimage-builder --skip-tests --recipe AppImageBuilder.yml
-          mv Gopeed-*-x86_64.AppImage build/dist/Gopeed-$VERSION-linux-amd64.AppImage
-
+          dart pub global activate flutter_distributor
+          flutter_distributor package --platform linux --targets appimage,deb,rpm
+          cd dist/*
+          mv gopeed-*-linux.AppImage Gopeed-${VERSION}-linux-x86_64.AppImage
+          mv gopeed-*-linux.deb Gopeed-${VERSION}-linux-amd64.deb
+          mv gopeed-*-linux.rpm Gopeed-${VERSION}-linux-x86_64.rpm
       - name: Upload
         uses: shogo82148/actions-upload-release-asset@v1
         with:
           upload_url: ${{ needs.get-release.outputs.upload_url }}
-          asset_path: ui/flutter/build/dist/*
+          asset_path: ui/flutter/dist/*/*
           overwrite: true
   build-snap:
     if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'snap' }}
diff --git a/.gitignore b/.gitignore
index de95dc47..ba8b5e5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@
 *.dll
 *.so
 *.dylib
-
+ui/flutter/dist/
 # Test binary, built with `go test -c`
 *.test
 
diff --git a/ui/flutter/distribute_options.yaml b/ui/flutter/distribute_options.yaml
new file mode 100644
index 00000000..57792289
--- /dev/null
+++ b/ui/flutter/distribute_options.yaml
@@ -0,0 +1 @@
+output: dist/
\ No newline at end of file
diff --git a/ui/flutter/linux/assets/com.gopeed.Gopeed.desktop b/ui/flutter/linux/assets/com.gopeed.Gopeed.desktop
index ad13d0e8..621762ba 100644
--- a/ui/flutter/linux/assets/com.gopeed.Gopeed.desktop
+++ b/ui/flutter/linux/assets/com.gopeed.Gopeed.desktop
@@ -11,4 +11,4 @@ Exec=gopeed
 Icon=com.gopeed.Gopeed
 Type=Application
 Categories=Utility;Internet
-Keywords=Bittorrent;Downloader;
+Keywords=Bittorrent;Downloader;
\ No newline at end of file
diff --git a/ui/flutter/linux/packaging/appimage/make_config.yaml b/ui/flutter/linux/packaging/appimage/make_config.yaml
new file mode 100644
index 00000000..3f1af7e7
--- /dev/null
+++ b/ui/flutter/linux/packaging/appimage/make_config.yaml
@@ -0,0 +1,17 @@
+display_name: Gopeed
+
+icon: assets/icon/icon.svg
+
+keywords:
+  - Application
+  - DownloadManager
+  - Network
+  - Utility
+
+generic_name: Download Manager
+
+categories:
+  - Network
+  - Utility
+
+startup_notify: true
\ No newline at end of file
diff --git a/ui/flutter/linux/packaging/deb/make_config.yaml b/ui/flutter/linux/packaging/deb/make_config.yaml
new file mode 100644
index 00000000..fa9e531b
--- /dev/null
+++ b/ui/flutter/linux/packaging/deb/make_config.yaml
@@ -0,0 +1,30 @@
+display_name: Gopeed
+package_name: gopeed
+maintainer:
+  name: monkeyWie
+  email: liwei-8466@qq.com
+co_authors:
+  - name: madoka773
+    email: valigarmanda55@gmail.com
+priority: optional
+section: x11
+installed_size: 6604
+essential: false
+icon: assets/icon/icon.svg
+
+dependencies:
+  - libappindicator3-1
+
+keywords:
+  - Application
+  - DownloadManager
+  - Network
+  - Utility
+
+generic_name: Download Manager
+
+categories:
+  - Network
+  - Utility
+
+startup_notify: true
\ No newline at end of file
diff --git a/ui/flutter/linux/packaging/rpm/make_config.yaml b/ui/flutter/linux/packaging/rpm/make_config.yaml
new file mode 100644
index 00000000..938d7d21
--- /dev/null
+++ b/ui/flutter/linux/packaging/rpm/make_config.yaml
@@ -0,0 +1,24 @@
+display_name: Gopeed
+icon: assets/icon/icon_1024.png
+summary: A modern download manager that supports all platforms. Built with Golang and Flutter.
+group: Applications/Internet
+vendor: monkeyWie
+packager: madoka773
+packagerEmail: valigarmanda55@gmail.com
+license: GPL-3.0-or-later
+url: https://github.com/GopeedLab/gopeed
+
+description: A modern download manager that supports all platforms. Built with Golang and Flutter.
+keywords:
+  - Application
+  - DownloadManager
+  - Network
+  - Utility
+
+generic_name: Download Manager
+
+categories:
+  - Network
+  - Utility
+
+startup_notify: true
\ No newline at end of file
diff --git a/ui/flutter/pubspec.lock b/ui/flutter/pubspec.lock
index 01e55a66..533519e2 100644
--- a/ui/flutter/pubspec.lock
+++ b/ui/flutter/pubspec.lock
@@ -181,10 +181,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.17.1"
+    version: "1.18.0"
   context_menus:
     dependency: "direct main"
     description:
@@ -441,10 +441,10 @@ packages:
     dependency: transitive
     description:
       name: intl
-      sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6
+      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.18.0"
+    version: "0.18.1"
   io:
     dependency: transitive
     description:
@@ -537,18 +537,18 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
+      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.12.15"
+    version: "0.12.16"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.2.0"
+    version: "0.5.0"
   math_expressions:
     dependency: transitive
     description:
@@ -569,10 +569,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   mime:
     dependency: transitive
     description:
@@ -894,10 +894,10 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   sprintf:
     dependency: transitive
     description:
@@ -910,18 +910,18 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.11.0"
+    version: "1.11.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   stream_transform:
     dependency: transitive
     description:
@@ -958,10 +958,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
+      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.5.1"
+    version: "0.6.1"
   timing:
     dependency: transitive
     description:
@@ -973,12 +973,11 @@ packages:
   tray_manager:
     dependency: "direct main"
     description:
-      path: "."
-      ref: "fix/libayatana-set-icon-deprecation"
-      resolved-ref: "056da3fef20e75877e8d2a4ae73d93f51a0f77cc"
-      url: "https://github.com/provokateurin/tray_manager.git"
-    source: git
-    version: "0.2.0"
+      name: tray_manager
+      sha256: "4ab709d70a4374af172f8c39e018db33a4271265549c6fc9d269a65e5f4b0225"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.2.1"
   typed_data:
     dependency: transitive
     description:
@@ -1083,6 +1082,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.0"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.3.0"
   web_socket_channel:
     dependency: transitive
     description:
@@ -1140,5 +1147,5 @@ packages:
     source: hosted
     version: "2.1.1"
 sdks:
-  dart: ">=3.0.0 <4.0.0"
+  dart: ">=3.2.0-194.0.dev <4.0.0"
   flutter: ">=3.10.0"
diff --git a/ui/flutter/pubspec.yaml b/ui/flutter/pubspec.yaml
index 1d04afb4..5c925514 100644
--- a/ui/flutter/pubspec.yaml
+++ b/ui/flutter/pubspec.yaml
@@ -56,16 +56,13 @@ dependencies:
   app_links: ^3.4.2
   uri_to_file: ^0.2.0
   window_manager: ^0.3.4
-  tray_manager:
-    git:
-      url: https://github.com/provokateurin/tray_manager.git
-      ref: fix/libayatana-set-icon-deprecation
   autoscale_tabbarview: ^1.0.2
   share_plus: ^7.1.0
   flutter_form_builder: ^9.1.1
   form_builder_validators: ^9.0.0
   flutter_foreground_task: ^6.1.2
   open_filex: ^4.3.4
+  tray_manager: ^0.2.1
 dev_dependencies:
   flutter_test:
     sdk: flutter