From 999127ea235329dc5009497ac17310d651a47b58 Mon Sep 17 00:00:00 2001 From: Kang Lin Date: Thu, 5 Dec 2024 16:23:00 +0800 Subject: [PATCH] Release v2.3.0 --- .github/workflows/android.yml | 7 +++++-- .github/workflows/build.yml | 4 ++-- .github/workflows/doxygen.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/mingw.yml | 2 +- .github/workflows/msvc.yml | 2 +- .github/workflows/qmake.yml | 2 +- .github/workflows/ubuntu.yml | 2 +- App/App.pro | 2 +- CMakeLists.txt | 2 +- FileBrowser/android/AndroidManifest.xml | 2 +- MimeTypeBrowser/android/AndroidManifest.xml | 2 +- README.md | 2 +- README_zh_CN.md | 2 +- Src/CMakeLists.txt | 2 +- Src/Src.pro | 2 +- Update/update.json | 2 +- Update/update.xml | 2 +- appveyor.yml | 4 ++-- debian/changelog | 7 ++----- deploy.sh | 14 +++++++------- snap/snapcraft.yaml | 2 +- vcpkg.json | 2 +- 23 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 9a694408..55c69b1a 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -32,11 +32,10 @@ jobs: env: artifact_name: build_android - STOREPASS: ${{secrets.STOREPASS}} SOURCE_DIR: ${{github.workspace}}/.cache/source TOOSL_DIR: ${{github.workspace}}/.cache/tools INSTALL_DIR: ${{github.workspace}}/.cache/install - RabbitCommon_VERSION: v2.2.6 + RabbitCommon_VERSION: v2.3.0 VCPKGGITCOMMITID: 59aeb8fe8fe1c980de6bd5ba634cf21024522d81 ANDROID_ABI: ${{matrix.ANDROID_ABI}} ANDROID_PLATFORM: android-35 @@ -112,6 +111,10 @@ jobs: - name: build RabbitCommon working-directory: ${{github.workspace}}/build + env: + QT_ANDROID_KEYSTORE_PATH: ${{env.SOURCE_DIR}}/RabbitCommon/RabbitCommon.keystore + QT_ANDROID_KEYSTORE_ALIAS: rabbitcommon + QT_ANDROID_KEYSTORE_STORE_PASS: ${{secrets.STOREPASS}} run: | echo "ls ${Qt6_DIR}/.." ls ${Qt6_DIR}/.. diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 250d8b10..ee00cd05 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,8 +5,8 @@ name: build env: artifact_path: artifact_path GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - RabbitCommon_VERSION: v2.2.6 - RabbitCommon_VERSION_PRE: v2.2.5 + RabbitCommon_VERSION: v2.3.0 + RabbitCommon_VERSION_PRE: v2.2.6 on: push: diff --git a/.github/workflows/doxygen.yml b/.github/workflows/doxygen.yml index b9eec91a..4baba55f 100644 --- a/.github/workflows/doxygen.yml +++ b/.github/workflows/doxygen.yml @@ -21,7 +21,7 @@ jobs: TOOSL_DIR: ${{github.workspace}}/.cache/tools INSTALL_DIR: ${{github.workspace}}/.cache/install_doxygen DOXYGEN_VERSION: 1.9.8 - RabbitCommon_VERSION: v2.2.6 + RabbitCommon_VERSION: v2.3.0 artifact_name: build_doxygen # Map the job outputs to step outputs diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 84827688..3c433ce0 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -39,7 +39,7 @@ jobs: INSTALL_DIR: ${{github.workspace}}/.cache/install qt_modules: ${{matrix.qt_modules}} VCPKGGITCOMMITID: 59aeb8fe8fe1c980de6bd5ba634cf21024522d81 - RabbitCommon_VERSION: v2.2.6 + RabbitCommon_VERSION: v2.3.0 artifact_name: build_macos # Map the job outputs to step outputs diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 32087535..a6c13d55 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 - RabbitCommon_VERSION: v2.2.6 + RabbitCommon_VERSION: v2.3.0 artifact_name: build_mingw CMAKE_GENERATOR: "MinGW Makefiles" diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml index 34c9ae6e..b6660d1e 100644 --- a/.github/workflows/msvc.yml +++ b/.github/workflows/msvc.yml @@ -47,7 +47,7 @@ jobs: CMAKE_GENERATOR: "Visual Studio 17 2022" VCPKG_PLATFORM_TOOLSET: ${{matrix.VCPKG_PLATFORM_TOOLSET}} CMAKE_GENERATOR_PLATFORM: ${{matrix.CMAKE_GENERATOR_PLATFORM}} - RabbitCommon_VERSION: v2.2.6 + RabbitCommon_VERSION: v2.3.0 VCPKGGITCOMMITID: 59aeb8fe8fe1c980de6bd5ba634cf21024522d81 qt_modules: ${{matrix.qt_modules}} artifact_name: build_msvc diff --git a/.github/workflows/qmake.yml b/.github/workflows/qmake.yml index 0139dea7..25d45c61 100644 --- a/.github/workflows/qmake.yml +++ b/.github/workflows/qmake.yml @@ -23,7 +23,7 @@ jobs: SOURCE_DIR: ${{github.workspace}}/.cache/source TOOSL_DIR: ${{github.workspace}}/.cache/tools INSTALL_DIR: ${{github.workspace}}/.cache/install_qmake - RabbitCommon_VERSION: 2.2.6 + RabbitCommon_VERSION: 2.3.0 steps: - name: Checkout Repository diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 234794f3..3162cd5b 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -27,7 +27,7 @@ jobs: SOURCE_DIR: ${{github.workspace}}/.cache/source TOOSL_DIR: ${{github.workspace}}/.cache/tools INSTALL_DIR: ${{github.workspace}}/.cache/install_ubuntu - RabbitCommon_VERSION: 2.2.6 + RabbitCommon_VERSION: 2.3.0 artifact_name: build_ubuntu # Map the job outputs to step outputs diff --git a/App/App.pro b/App/App.pro index 691d7430..b28eff49 100644 --- a/App/App.pro +++ b/App/App.pro @@ -37,7 +37,7 @@ isEmpty(RabbitCommon_VERSION) { } } isEmpty(RabbitCommon_VERSION){ - RabbitCommon_VERSION="2.2.6" + RabbitCommon_VERSION="2.3.0" } message("RabbitCommon_VERSION:$$RabbitCommon_VERSION") DEFINES += RabbitCommon_VERSION=\"\\\"$$quote($$RabbitCommon_VERSION)\\\"\" diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d65862d..573c3d8a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ endif() # 参见： # 语义化版本: https://semver.org/lang/zh-CN/ -SET(RabbitCommon_VERSION "2.2.6") +SET(RabbitCommon_VERSION "2.3.0") # Find Git Version Patch IF(EXISTS "${CMAKE_SOURCE_DIR}/.git") if(NOT GIT) diff --git a/FileBrowser/android/AndroidManifest.xml b/FileBrowser/android/AndroidManifest.xml index e89ee60f..b0fa846e 100644 --- a/FileBrowser/android/AndroidManifest.xml +++ b/FileBrowser/android/AndroidManifest.xml @@ -3,7 +3,7 @@ package="org.KangLinStudio.FileBrowser" android:installLocation="auto" android:versionCode="0" - android:versionName="2.2.6"> + android:versionName="2.3.0"> diff --git a/MimeTypeBrowser/android/AndroidManifest.xml b/MimeTypeBrowser/android/AndroidManifest.xml index 2fd918cc..2b46df48 100644 --- a/MimeTypeBrowser/android/AndroidManifest.xml +++ b/MimeTypeBrowser/android/AndroidManifest.xml @@ -3,7 +3,7 @@ package="org.KangLinStudio.MimeTypeBrowser" android:installLocation="auto" android:versionCode="0" - android:versionName="2.2.6"> + android:versionName="2.3.0"> diff --git a/README.md b/README.md index e17a75da..d5c1ae10 100644 --- a/README.md +++ b/README.md @@ -416,7 +416,7 @@ See: [FrmUpdater.h](Src/FrmUpdater/FrmUpdater.h) - v2.2.6 + v2.3.0 url diff --git a/README_zh_CN.md b/README_zh_CN.md index e98c5193..fff63203 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -404,7 +404,7 @@ Qt因为版权原因，没有提供openssl动态库，所以必须自己复制op - v2.2.6 + v2.3.0 url diff --git a/Src/CMakeLists.txt b/Src/CMakeLists.txt index 75f384c9..d4812004 100644 --- a/Src/CMakeLists.txt +++ b/Src/CMakeLists.txt @@ -37,7 +37,7 @@ include(CMakeDependentOption) include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/RabbitCommonUtils.cmake) include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Download.cmake) -SET(RabbitCommon_VERSION "2.2.6") +SET(RabbitCommon_VERSION "2.3.0") SET(RABBITCOMMON_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..) GET_VERSION(SOURCE_DIR ${RABBITCOMMON_SOURCE_DIR} OUT_VERSION RabbitCommon_VERSION diff --git a/Src/Src.pro b/Src/Src.pro index 6cd6dd40..1bac932c 100644 --- a/Src/Src.pro +++ b/Src/Src.pro @@ -21,7 +21,7 @@ isEmpty(RabbitCommon_VERSION) { } } isEmpty(RabbitCommon_VERSION){ - RabbitCommon_VERSION="2.2.6" + RabbitCommon_VERSION="2.3.0" } message("RabbitCommon RabbitCommon_VERSION:$$RabbitCommon_VERSION; RabbitCommon_REVISION:$$RabbitCommon_REVISION") DEFINES += RabbitCommon_VERSION=\"\\\"$$quote($$RabbitCommon_VERSION)\\\"\" RabbitCommon_REVISION=\"\\\"$$quote($$RabbitCommon_REVISION)\\\"\" diff --git a/Update/update.json b/Update/update.json index 38aca39d..07c0090c 100644 --- a/Update/update.json +++ b/Update/update.json @@ -1,7 +1,7 @@ { "redirect": [ { - "version":"2.2.6" + "version":"2.3.0" } ] } diff --git a/Update/update.xml b/Update/update.xml index 116857af..89fa5269 100644 --- a/Update/update.xml +++ b/Update/update.xml @@ -1,4 +1,4 @@ - v2.2.6 + v2.3.0 diff --git a/appveyor.yml b/appveyor.yml index 0e17021c..56d2930e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ # 作者：康林 #TODO: Change version -version: 'v2.2.6.{build}' +version: "v2.3.0.{build}" environment: STOREPASS: @@ -10,7 +10,7 @@ environment: secure: EoBPaPuJ6u9UDYpQWjKhUg== QT_PASSWORD: secure: ejAYGgB+3sBispRxUSr0xw== - RabbitCommon_VERSION: "v2.2.6" + RabbitCommon_VERSION: "v2.3.0" matrix: ##### msvc 2015 ######## diff --git a/debian/changelog b/debian/changelog index 8c8f965d..05e199bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,3 @@ -rabbitcommon (2.2.6) unstable; urgency=medium +rabbitcommon (2.3.0) unstable; urgency=medium - * Use installed cmark in linux - * Modify debian package - - -- Kang Lin Wed, 19 Jun 2024 15:09:58 +0800 + -- Kang Lin Thu, 05 Dec 2024 16:14:47 +0800 diff --git a/deploy.sh b/deploy.sh index 719895aa..dae30b92 100755 --- a/deploy.sh +++ b/deploy.sh @@ -78,13 +78,13 @@ if [ -f ${SOURCE_DIR}/vcpkg.json ]; then fi -CHANGLOG_TMP=${SOURCE_DIR}/debian/changelog.tmp -CHANGLOG_FILE=${SOURCE_DIR}/debian/changelog -echo "rabbitcommon (${DEBIAN_VERSION}) unstable; urgency=medium" > ${CHANGLOG_FILE} -echo "" >> ${CHANGLOG_FILE} -echo "`git log --pretty=format:' * %s' ${PRE_TAG}..HEAD`" >> ${CHANGLOG_FILE} -echo "" >> ${CHANGLOG_FILE} -echo " -- `git log --pretty=format:'%an <%ae>' HEAD^..HEAD` `date --rfc-email`" >> ${CHANGLOG_FILE} +#CHANGLOG_TMP=${SOURCE_DIR}/debian/changelog.tmp +#CHANGLOG_FILE=${SOURCE_DIR}/debian/changelog +#echo "rabbitcommon (${DEBIAN_VERSION}) unstable; urgency=medium" > ${CHANGLOG_FILE} +#echo "" >> ${CHANGLOG_FILE} +#echo "`git log --pretty=format:' * %s' ${PRE_TAG}..HEAD`" >> ${CHANGLOG_FILE} +#echo "" >> ${CHANGLOG_FILE} +#echo " -- `git log --pretty=format:'%an <%ae>' HEAD^..HEAD` `date --rfc-email`" >> ${CHANGLOG_FILE} MAJOR_VERSION=`echo ${DEBIAN_VERSION}|cut -d "." -f 1` #sed -i "s/android:versionCode=.*android/android:versionCode=\"${MAJOR_VERSION}\" android/g" ${SOURCE_DIR}/Tests/android/AndroidManifest.xml diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 50369331..65db9575 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -2,7 +2,7 @@ # Snapcraft.yaml schema: https://snapcraft.io/docs/snapcraft-yaml-schema name: rabbitcommon # you probably want to 'snapcraft register ' base: core22 # the base snap is the execution environment for this snap -version: '2.0.6' # just for humans, typically '1.2+git' or '1.3.2' +version: '2.3.0' license: GPL-3.0+ contact: kl222@126.com donation: diff --git a/vcpkg.json b/vcpkg.json index 31b30846..e8b3a526 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,6 +1,6 @@ { "name": "rabbitcommon", - "version-string": "2.2.6", + "version-string": "2.3.0", "license": "GPL-3.0", "homepage": "https://github.com/KangLin/RabbitCommon",