diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index f6c8cb88..f62e704e 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -34,7 +34,7 @@ jobs: SOURCE_DIR: ${{github.workspace}}/.cache/source TOOSL_DIR: ${{github.workspace}}/.cache/tools INSTALL_DIR: ${{github.workspace}}/.cache/install - SerialPortAssistant_VERSION: v0.5.27 + SerialPortAssistant_VERSION: v0.5.28 VCPKGGITCOMMITID: 59aeb8fe8fe1c980de6bd5ba634cf21024522d81 VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}} VCPKG_DEFAULT_HOST_TRIPLET: x64-linux diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c886bb86..afa1cd95 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ name: build env: artifact_path: artifact_path GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SerialPortAssistant_VERSION: v0.5.27 + SerialPortAssistant_VERSION: v0.5.28 on: push: diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 9cfd692f..3e4c1b78 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -40,7 +40,7 @@ jobs: TOOSL_DIR: ${{github.workspace}}/.cache/tools INSTALL_DIR: ${{github.workspace}}/.cache/install_macos qt_modules: ${{matrix.qt_modules}} - SerialPortAssistant_VERSION: 0.5.27 + SerialPortAssistant_VERSION: 0.5.28 artifact_name: build_macos VCPKGGITCOMMITID: 59aeb8fe8fe1c980de6bd5ba634cf21024522d81 diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 5099ca08..c3307c84 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -30,7 +30,7 @@ jobs: SOURCE_DIR: ${{github.workspace}}\.cache\source TOOSL_DIR: ${{github.workspace}}\.cache\tools INSTALL_DIR: ${{github.workspace}}\.cache\install_mingw - SerialPortAssistant_VERSION: v0.5.27 + SerialPortAssistant_VERSION: v0.5.28 artifact_name: build_mingw # Map the job outputs to step outputs diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml index 12de25e0..c304611b 100644 --- a/.github/workflows/msvc.yml +++ b/.github/workflows/msvc.yml @@ -42,7 +42,7 @@ jobs: runs-on: windows-latest env: - SerialPortAssistant_VERSION: v0.5.27 + SerialPortAssistant_VERSION: v0.5.28 SOURCE_DIR: ${{github.workspace}}\.cache\source TOOSL_DIR: ${{github.workspace}}\.cache\tools INSTALL_DIR: ${{github.workspace}}\.cache\install_${{matrix.qt_arch}}_${{matrix.BUILD_TYPE}} diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 9281b084..5e51df41 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -26,7 +26,7 @@ jobs: SOURCE_DIR: ${{github.workspace}}/.cache/source TOOSL_DIR: ${{github.workspace}}/.cache/tools INSTALL_DIR: ${{github.workspace}}/.cache/install_ubuntu_${{matrix.BUILD_TYPE}} - SerialPortAssistant_VERSION: 0.5.27 + SerialPortAssistant_VERSION: 0.5.28 artifact_name: build_ubuntu # Map the job outputs to step outputs diff --git a/App/CMakeLists.txt b/App/CMakeLists.txt index 6e9749a3..7e976f94 100644 --- a/App/CMakeLists.txt +++ b/App/CMakeLists.txt @@ -28,7 +28,7 @@ endif() GET_VERSION(OUT_VERSION SerialPortAssistant_VERSION OUT_REVISION SerialPortAssistant_Revision) IF(NOT SerialPortAssistant_VERSION) - SET(SerialPortAssistant_VERSION "0.5.27") + SET(SerialPortAssistant_VERSION "0.5.28") ENDIF() message("SerialPortAssistant_VERSION:${SerialPortAssistant_VERSION};Revision:${SerialPortAssistant_Revision}") diff --git a/App/android/AndroidManifest.xml b/App/android/AndroidManifest.xml index a71b50d5..c0d32fb0 100644 --- a/App/android/AndroidManifest.xml +++ b/App/android/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/ChangeLog.md b/ChangeLog.md index dce4c932..e56db24c 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,6 @@ +- Version: v0.5.28 + - Use [RabbitCommon v2.3.1](https://github.com/KangLin/RabbitCommon/releases/tag/v2.3.1) + - Version: v0.5.27 - Add snap - Greater than Android 9 diff --git a/ChangeLog_zh_CN.md b/ChangeLog_zh_CN.md index 46cbfbf9..3665752d 100644 --- a/ChangeLog_zh_CN.md +++ b/ChangeLog_zh_CN.md @@ -1,3 +1,6 @@ +- 版本: v0.5.28 + - 使用 [RabbitCommon v2.3.1](https://github.com/KangLin/RabbitCommon/releases/tag/v2.3.1) + - 版本: v0.5.27 - 增加 snap - 大于 Android 9 diff --git a/Install/Install.nsi b/Install/Install.nsi index da157c85..3e382aa7 100644 --- a/Install/Install.nsi +++ b/Install/Install.nsi @@ -2,7 +2,7 @@ ; HM NIS Edit Wizard helper defines !define PRODUCT_NAME "SerialPortAssistant" -!define PRODUCT_VERSION "v0.5.27" +!define PRODUCT_VERSION "v0.5.28" !define PRODUCT_PUBLISHER "KangLin studio" !define PRODUCT_WEB_SITE "https://github.com/KangLin/${PRODUCT_NAME}" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}.exe" diff --git a/README.md b/README.md index 2356da2b..ee26cbf3 100644 --- a/README.md +++ b/README.md @@ -66,23 +66,23 @@ Author: Kang Lin (kl222@126.com) - Install - ubuntu - [serialportassistant_0.5.27_amd64.deb](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.27/serialportassistant_0.5.27_amd64.deb) + [serialportassistant_0.5.28_amd64.deb](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.28/serialportassistant_0.5.28_amd64.deb) - sudo apt install ./serialportassistant_0.5.27_amd64.deb + sudo apt install ./serialportassistant_0.5.28_amd64.deb # If you're on an older Linux distribution, you will need to run this instead: - # sudo dpkg -i serialportassistant_0.5.27_amd64.deb + # sudo dpkg -i serialportassistant_0.5.28_amd64.deb # sudo apt-get install -f # Install dependencies - Windows - Windows xp - - [SerialPortAssistant_v0.5.27_windows_xp_x86_Setup.exe](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.27/SerialPortAssistant_v0.5.27_windows_xp_x86_Setup.exe) + - [SerialPortAssistant_v0.5.28_windows_xp_x86_Setup.exe](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.28/SerialPortAssistant_v0.5.28_windows_xp_x86_Setup.exe) - Windows 7 or later - - [SerialPortAssistant_v0.5.27_win32_msvc2017_qt5.12.12_Setup.exe](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.27/SerialPortAssistant_v0.5.27_win32_msvc2017_qt5.12.12_Setup.exe) - - [SerialPortAssistant_v0.5.27_win64_msvc2022_64_qt6.8.1_Setup.exe](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.27/SerialPortAssistant_v0.5.27_win64_msvc2022_64_qt6.8.1_Setup.exe) + - [SerialPortAssistant_v0.5.28_win32_msvc2017_qt5.12.12_Setup.exe](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.28/SerialPortAssistant_v0.5.28_win32_msvc2017_qt5.12.12_Setup.exe) + - [SerialPortAssistant_v0.5.28_win64_msvc2022_64_qt6.8.1_Setup.exe](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.28/SerialPortAssistant_v0.5.28_win64_msvc2022_64_qt6.8.1_Setup.exe) - Andoird 9 or later - - [SerialPortAssistant_v0.5.27_android_arm64_v8a_qt6.8.1_Release.apk](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.27/SerialPortAssistant_v0.5.27_android_arm64_v8a_qt6.8.1_Release.apk) - - [SerialPortAssistant_v0.5.27_android_x86_64_qt6.8.1_Release.apk](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.27/SerialPortAssistant_v0.5.27_android_x86_64_qt6.8.1_Release.apk) + - [SerialPortAssistant_v0.5.28_android_arm64_v8a_qt6.8.1_Release.apk](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.28/SerialPortAssistant_v0.5.28_android_arm64_v8a_qt6.8.1_Release.apk) + - [SerialPortAssistant_v0.5.28_android_x86_64_qt6.8.1_Release.apk](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.28/SerialPortAssistant_v0.5.28_android_x86_64_qt6.8.1_Release.apk) ## Donate diff --git a/README_zh_CN.md b/README_zh_CN.md index 200bebaf..370f7667 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -60,23 +60,23 @@ - 安装说明: - ubuntu - [serialportassistant_0.5.27_amd64.deb](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.27/serialportassistant_0.5.27_amd64.deb) + [serialportassistant_0.5.28_amd64.deb](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.28/serialportassistant_0.5.28_amd64.deb) - sudo apt install ./serialportassistant_0.5.27_amd64.deb + sudo apt install ./serialportassistant_0.5.28_amd64.deb # 如果你是老的 Linux 发行系统。你需要用下列命令替换: - # sudo dpkg -i serialportassistant_0.5.27_amd64.deb + # sudo dpkg -i serialportassistant_0.5.28_amd64.deb # sudo apt-get install -f # Install dependencies - Windows - Windows xp - - [SerialPortAssistant_v0.5.27_windows_xp_x86_Setup.exe](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.27/SerialPortAssistant_v0.5.27_windows_xp_x86_Setup.exe) + - [SerialPortAssistant_v0.5.28_windows_xp_x86_Setup.exe](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.28/SerialPortAssistant_v0.5.28_windows_xp_x86_Setup.exe) - Windows 7 及以后 - - [SerialPortAssistant_v0.5.27_win32_msvc2017_qt5.12.12_Setup.exe](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.27/SerialPortAssistant_v0.5.27_win32_msvc2017_qt5.12.12_Setup.exe) - - [SerialPortAssistant_v0.5.27_win64_msvc2022_64_qt6.8.1_Setup.exe](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.27/SerialPortAssistant_v0.5.27_win64_msvc2022_64_qt6.8.1_Setup.exe) + - [SerialPortAssistant_v0.5.28_win32_msvc2017_qt5.12.12_Setup.exe](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.28/SerialPortAssistant_v0.5.28_win32_msvc2017_qt5.12.12_Setup.exe) + - [SerialPortAssistant_v0.5.28_win64_msvc2022_64_qt6.8.1_Setup.exe](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.28/SerialPortAssistant_v0.5.28_win64_msvc2022_64_qt6.8.1_Setup.exe) - Andoird 9 及以后 - - [SerialPortAssistant_v0.5.27_android_arm64_v8a_qt6.8.1_Release.apk](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.27/SerialPortAssistant_v0.5.27_android_arm64_v8a_qt6.8.1_Release.apk) - - [SerialPortAssistant_v0.5.27_android_x86_64_qt6.8.1_Release.apk](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.27/SerialPortAssistant_v0.5.27_android_x86_64_qt6.8.1_Release.apk) + - [SerialPortAssistant_v0.5.28_android_arm64_v8a_qt6.8.1_Release.apk](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.28/SerialPortAssistant_v0.5.28_android_arm64_v8a_qt6.8.1_Release.apk) + - [SerialPortAssistant_v0.5.28_android_x86_64_qt6.8.1_Release.apk](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.28/SerialPortAssistant_v0.5.28_android_x86_64_qt6.8.1_Release.apk) ### 捐赠 如果你用得满意,可以对本人进行捐赠 diff --git a/Update/update.json b/Update/update.json index 60d340d5..b356edd2 100644 --- a/Update/update.json +++ b/Update/update.json @@ -1,7 +1,7 @@ { "redirect": [ { - "version":"v0.5.27" + "version":"v0.5.28" } ] } diff --git a/appveyor.yml b/appveyor.yml index 75eaa051..25959793 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 'v0.5.27.{build}' +version: 'v0.5.28.{build}' cache: - ..\other_source @@ -6,7 +6,7 @@ cache: # https://www.appveyor.com/docs/build-cache/#cleaning-up-cache environment: - SerialPortAssistant_VERSION: "v0.5.27" + SerialPortAssistant_VERSION: "v0.5.28" STOREPASS: secure: l9BZEU39F1a4vSkhwl0CHR+yh6CD1c7byGzMv+1NUa4= QT_USER: diff --git a/debian/changelog b/debian/changelog index a313c7ea..2a388a8f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,18 +1,6 @@ -serialportassistant (0.5.27) stable; urgency=medium +serialportassistant (0.5.28) stable; urgency=medium - * Modify change log - * Modify snap - * vcpkg: add cmark - * Modify build_debpackage.sh - * Merge pull request #23 from KangLin/develop - * Fix typo - * CI: actions/upload-artifact@v4 * Modify README - * CI: update qt version - * SNAP: Add snap/snapcraft.yaml - * Modify README - * Modify debian package - * CI: modify android.yml - -- Kang Lin Fri, 06 Dec 2024 15:24:34 +0800 + -- Kang Lin Sat, 07 Dec 2024 11:29:01 +0800 diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index f5dea7cd..15bc03f9 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -4,7 +4,7 @@ # Debugging snaps: https://snapcraft.io/docs/debug-snaps name: serialportassistant base: core22 # the base snap is the execution environment for this snap -version: '0.5.27' +version: '0.5.28' type: app license: GPL-3.0+ contact: kl222@126.com diff --git a/vcpkg.json b/vcpkg.json index 7c484813..d1e45ffa 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,6 +1,6 @@ { "name": "serialportassistant", - "version-string": "0.5.27", + "version-string": "0.5.28", "license": "GPL-3.0", "homepage": "https://github.com/KangLin/SerialPortAssistant",