From f6cb42de4c15dd38b6a22dcbbf9686759ff0acca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9B=AE=E6=A3=83?= Date: Thu, 7 Nov 2024 10:54:40 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=80=20v0.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit close #1 --- .github/workflows/release.yml | 67 ++++++----- .github/workflows/release_mac.yml | 43 -------- lib/widgets/app/config/app_config_device.dart | 5 +- lib/widgets/app/config/app_config_info.dart | 5 +- macos/Flutter/GeneratedPluginRegistrant.swift | 4 +- pubspec.lock | 104 ++++++++++++------ pubspec.yaml | 4 +- .../flutter/generated_plugin_registrant.cc | 6 +- windows/flutter/generated_plugins.cmake | 2 +- 9 files changed, 122 insertions(+), 118 deletions(-) delete mode 100644 .github/workflows/release_mac.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f4fb8b7..0afb25e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,45 +1,50 @@ name: Build Release on: - workflow_dispatch: push: tags: - 'v*.*.*' jobs: - build: + createRelease: + name: Create Release + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Release + uses: softprops/action-gh-release@v2 + with: + draft: true + body: | + + + + + buildWindows: name: Build Windows runs-on: windows-latest permissions: contents: write steps: - - name: 签出仓库 uses: actions/checkout@v4 with: fetch-depth: 0 ref: master - - name: 初始化 Flutter 环境 uses: subosito/flutter-action@v2 with: channel: stable architecture: x64 - - - name: 检查环境 - run: flutter doctor - - name: 拉取依赖 run: flutter pub get - - name: 打包并压缩 run: | flutter build windows Compress-Archive -Path ./build/windows/x64/runner/Release/* -DestinationPath ShufflePlay.zip - - name: 打包msix run: dart run msix:create -p ${{ secrets.SIGN_SECRET }} - - name: 打包msix-Store run: > dart run msix:create @@ -48,23 +53,31 @@ jobs: -b "CN=5FE33156-C3CE-4E71-A036-81BAA99521CB" -n "ShufflePlay_Store" -p ${{ secrets.SIGN_SECRET }} - - name: 上传文件 - uses: actions/upload-artifact@v4 + uses: xresloader/upload-to-github-release@v1 with: - name: ShufflePlay - compression-level: 0 - path: | - ShufflePlay.zip - ShufflePlay.msix - ShufflePlay_Store.msix + file: ShufflePlay.zip,ShufflePlay.msix,ShufflePlay_Store.msix - - name: 发行Release - uses: marvinpinto/action-automatic-releases@latest + buildMac: + runs-on: macos-latest + permissions: + contents: write + steps: + - name: 签出仓库 + uses: actions/checkout@v4 with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - draft: true - files: | - ShufflePlay.zip - ShufflePlay.msix - ShufflePlay_Store.msix + fetch-depth: 0 + ref: master + - name: 初始化 Flutter 环境 + uses: subosito/flutter-action@v2 + with: + channel: stable + architecture: x64 + - name: 拉取依赖 + run: flutter pub get + - name: 打包 + run: flutter build macos + - name: 上传文件 + - uses: xresloader/upload-to-github-release@v1 + with: + file: 'build/macos/Build/Products/Release/ShufflePlay.app' diff --git a/.github/workflows/release_mac.yml b/.github/workflows/release_mac.yml deleted file mode 100644 index 321865f..0000000 --- a/.github/workflows/release_mac.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: Build Release Mac - -on: - workflow_dispatch: - push: - tags: - - 'v*.*.*' - -jobs: - build: - name: Build Mac - runs-on: macos-latest - permissions: - contents: write - steps: - - - name: 签出仓库 - uses: actions/checkout@v4 - with: - fetch-depth: 0 - ref: master - - - name: 初始化 Flutter 环境 - uses: subosito/flutter-action@v2 - with: - channel: stable - architecture: x64 - - - name: 检查环境 - run: flutter doctor - - - name: 拉取依赖 - run: flutter pub get - - - name: 打包 - run: flutter build macos - - - name: 发行Release - uses: marvinpinto/action-automatic-releases@latest - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - draft: true - files: 'build/macos/Build/Products/Release/shuffle_play.app' diff --git a/lib/widgets/app/config/app_config_device.dart b/lib/widgets/app/config/app_config_device.dart index b1c1843..300a9f9 100644 --- a/lib/widgets/app/config/app_config_device.dart +++ b/lib/widgets/app/config/app_config_device.dart @@ -4,14 +4,15 @@ import 'package:flutter/foundation.dart'; // Package imports: import 'package:device_info_plus/device_info_plus.dart'; import 'package:fluent_ui/fluent_ui.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart' - as mdi; import 'package:url_launcher/url_launcher_string.dart'; import 'package:webview_windows/webview_windows.dart'; // Project imports: import '../app_icon.dart'; +import 'package:material_design_icons_flutter/material_design_icons_flutter.dart' + as mdi; + class AppConfigDeviceWidget extends StatefulWidget { const AppConfigDeviceWidget({super.key}); diff --git a/lib/widgets/app/config/app_config_info.dart b/lib/widgets/app/config/app_config_info.dart index 9cfdf39..047ca9a 100644 --- a/lib/widgets/app/config/app_config_info.dart +++ b/lib/widgets/app/config/app_config_info.dart @@ -6,8 +6,6 @@ import 'package:flutter/material.dart' as material; import 'package:fluent_ui/fluent_ui.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart' - as mdi; import 'package:package_info_plus/package_info_plus.dart'; import 'package:url_launcher/url_launcher_string.dart'; @@ -22,6 +20,9 @@ import '../../../utils/get_app_theme.dart'; import '../../bbs/bbs_infobar.dart'; import '../app_icon.dart'; +import 'package:material_design_icons_flutter/material_design_icons_flutter.dart' + as mdi; + class AppConfigInfoWidget extends ConsumerStatefulWidget { const AppConfigInfoWidget({super.key}); diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 66e7745..7dbcca9 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -13,7 +13,7 @@ import just_audio import macos_window_utils import package_info_plus import path_provider_foundation -import screen_retriever +import screen_retriever_macos import sqflite_darwin import system_theme import url_launcher_macos @@ -31,7 +31,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { MacOSWindowUtilsPlugin.register(with: registry.registrar(forPlugin: "MacOSWindowUtilsPlugin")) FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) - ScreenRetrieverPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverPlugin")) + ScreenRetrieverMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverMacosPlugin")) SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin")) SystemThemePlugin.register(with: registry.registrar(forPlugin: "SystemThemePlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) diff --git a/pubspec.lock b/pubspec.lock index 2efcf78..b2986a7 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -58,10 +58,10 @@ packages: dependency: transitive description: name: asn1lib - sha256: "6b151826fcc95ff246cd219a0bf4c753ea14f4081ad71c61939becf3aba27f70" + sha256: "4bae5ae63e6d6dd17c4aac8086f3dec26c0236f6a0f03416c6c19d830c367cf5" url: "https://pub.flutter-io.cn" source: hosted - version: "1.5.5" + version: "1.5.8" async: dependency: transitive description: @@ -202,10 +202,10 @@ packages: dependency: transitive description: name: cli_util - sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19 + sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c url: "https://pub.flutter-io.cn" source: hosted - version: "0.4.1" + version: "0.4.2" clock: dependency: transitive description: @@ -218,10 +218,10 @@ packages: dependency: transitive description: name: code_builder - sha256: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37 + sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e" url: "https://pub.flutter-io.cn" source: hosted - version: "4.10.0" + version: "4.10.1" collection: dependency: transitive description: @@ -266,10 +266,10 @@ packages: dependency: transitive description: name: csslib - sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb" + sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e" url: "https://pub.flutter-io.cn" source: hosted - version: "1.0.0" + version: "1.0.2" cupertino_icons: dependency: "direct main" description: @@ -492,10 +492,10 @@ packages: dependency: transitive description: name: flutter_svg - sha256: "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2" + sha256: de82e6bf958cec7190fbc1c5298282c851228e35ae2b14e2b103e7f777818c64 url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.10+1" + version: "2.0.13" flutter_web_plugins: dependency: transitive description: flutter @@ -601,10 +601,10 @@ packages: dependency: transitive description: name: html - sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a" + sha256: "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec" url: "https://pub.flutter-io.cn" source: hosted - version: "0.15.4" + version: "0.15.5" http: dependency: transitive description: @@ -713,10 +713,10 @@ packages: dependency: transitive description: name: just_audio - sha256: b41646a8241688f1d99c2e69c4da2bb26aa4b3a99795f6ff205c2a165e033fda + sha256: a49e7120b95600bd357f37a2bb04cd1e88252f7cdea8f3368803779b925b1049 url: "https://pub.flutter-io.cn" source: hosted - version: "0.9.41" + version: "0.9.42" just_audio_platform_interface: dependency: transitive description: @@ -769,10 +769,10 @@ packages: dependency: transitive description: name: macos_window_utils - sha256: "230be594d26f6dee92c5a1544f4242d25138a5bfb9f185b27f14de3949ef0be8" + sha256: "3d3982495376077f23556b1e235faab3c6d478fe1238766f824e920708d60eba" url: "https://pub.flutter-io.cn" source: hosted - version: "1.5.0" + version: "1.6.0" macros: dependency: transitive description: @@ -899,18 +899,18 @@ packages: dependency: transitive description: name: path_parsing - sha256: "45f7d6bba1128761de5540f39d5ca000ea8a1f22f06b76b61094a60a2997bd0e" + sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca" url: "https://pub.flutter-io.cn" source: hosted - version: "1.0.2" + version: "1.1.0" path_provider: dependency: "direct main" description: name: path_provider - sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378 + sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd" url: "https://pub.flutter-io.cn" source: hosted - version: "2.1.4" + version: "2.1.5" path_provider_android: dependency: transitive description: @@ -1059,10 +1059,42 @@ packages: dependency: transitive description: name: screen_retriever - sha256: "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90" + sha256: "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c" url: "https://pub.flutter-io.cn" source: hosted - version: "0.1.9" + version: "0.2.0" + screen_retriever_linux: + dependency: transitive + description: + name: screen_retriever_linux + sha256: f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18 + url: "https://pub.flutter-io.cn" + source: hosted + version: "0.2.0" + screen_retriever_macos: + dependency: transitive + description: + name: screen_retriever_macos + sha256: "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149" + url: "https://pub.flutter-io.cn" + source: hosted + version: "0.2.0" + screen_retriever_platform_interface: + dependency: transitive + description: + name: screen_retriever_platform_interface + sha256: ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0 + url: "https://pub.flutter-io.cn" + source: hosted + version: "0.2.0" + screen_retriever_windows: + dependency: transitive + description: + name: screen_retriever_windows + sha256: "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13" + url: "https://pub.flutter-io.cn" + source: hosted + version: "0.2.0" scroll_pos: dependency: transitive description: @@ -1304,10 +1336,10 @@ packages: dependency: transitive description: name: url_launcher_android - sha256: "0dea215895a4d254401730ca0ba8204b29109a34a99fb06ae559a2b60988d2de" + sha256: "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193" url: "https://pub.flutter-io.cn" source: hosted - version: "6.3.13" + version: "6.3.14" url_launcher_ios: dependency: transitive description: @@ -1368,26 +1400,26 @@ packages: dependency: transitive description: name: vector_graphics - sha256: "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3" + sha256: "773c9522d66d523e1c7b25dfb95cc91c26a1e17b107039cfe147285e92de7878" url: "https://pub.flutter-io.cn" source: hosted - version: "1.1.11+1" + version: "1.1.14" vector_graphics_codec: dependency: transitive description: name: vector_graphics_codec - sha256: c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da + sha256: "2430b973a4ca3c4dbc9999b62b8c719a160100dcbae5c819bae0cacce32c9cdb" url: "https://pub.flutter-io.cn" source: hosted - version: "1.1.11+1" + version: "1.1.12" vector_graphics_compiler: dependency: transitive description: name: vector_graphics_compiler - sha256: "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81" + sha256: "26d520739b7c6b5d2a2b3274427874a8390831fd4cd5bb8cfbd7d913477d3a2e" url: "https://pub.flutter-io.cn" source: hosted - version: "1.1.11+1" + version: "1.1.14" vector_math: dependency: transitive description: @@ -1520,10 +1552,10 @@ packages: dependency: transitive description: name: webview_flutter_wkwebview - sha256: d4034901d96357beb1b6717ebf7d583c88e40cfc6eb85fe76dd1bf0979a9f251 + sha256: f14ee08021772fed913da8daebcfdeb46be457081e521e93e9918fe6cd1ce9e8 url: "https://pub.flutter-io.cn" source: hosted - version: "3.16.0" + version: "3.16.1" webview_windows: dependency: "direct main" description: @@ -1536,10 +1568,10 @@ packages: dependency: transitive description: name: win32 - sha256: e1d0cc62e65dc2561f5071fcbccecf58ff20c344f8f3dc7d4922df372a11df1f + sha256: "84ba388638ed7a8cb3445a320c8273136ab2631cd5f2c57888335504ddab1bc2" url: "https://pub.flutter-io.cn" source: hosted - version: "5.7.1" + version: "5.8.0" win32_registry: dependency: transitive description: @@ -1552,10 +1584,10 @@ packages: dependency: "direct main" description: name: window_manager - sha256: ab8b2a7f97543d3db2b506c9d875e637149d48ee0c6a5cb5f5fd6e0dac463792 + sha256: "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059" url: "https://pub.flutter-io.cn" source: hosted - version: "0.4.2" + version: "0.4.3" windows_taskbar: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 345e9a8..96db19a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -54,14 +54,14 @@ dependencies: ref: main package_info_plus: ^8.0.3 path: ^1.9.0 - path_provider: ^2.1.4 + path_provider: ^2.1.5 provider: ^6.1.2 sqflite_common_ffi: ^2.3.3 system_theme: ^3.1.2 url_launcher: ^6.3.1 uuid: ^4.4.2 webview_windows: ^0.4.0 - window_manager: ^0.4.2 + window_manager: ^0.4.3 windows_taskbar: ^1.1.2 material_design_icons_flutter: ^7.0.7296 diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index b679c5e..0b8dca4 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include @@ -26,8 +26,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) { registry->GetRegistrarForPlugin("FlutterAcrylicPlugin")); MsvcredistPluginCApiRegisterWithRegistrar( registry->GetRegistrarForPlugin("MsvcredistPluginCApi")); - ScreenRetrieverPluginRegisterWithRegistrar( - registry->GetRegistrarForPlugin("ScreenRetrieverPlugin")); + ScreenRetrieverWindowsPluginCApiRegisterWithRegistrar( + registry->GetRegistrarForPlugin("ScreenRetrieverWindowsPluginCApi")); SystemThemePluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("SystemThemePlugin")); UrlLauncherWindowsRegisterWithRegistrar( diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index c2c9833..34c26da 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -7,7 +7,7 @@ list(APPEND FLUTTER_PLUGIN_LIST file_selector_windows flutter_acrylic msvcredist - screen_retriever + screen_retriever_windows system_theme url_launcher_windows webview_windows