Release v2.2.6

.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
-      RabbitCommon_VERSION: v2.2.5
+      RabbitCommon_VERSION: v2.2.6
       VCPKGGITCOMMITID: 59aeb8fe8fe1c980de6bd5ba634cf21024522d81
       ANDROID_ABI: ${{matrix.ANDROID_ABI}}
       ANDROID_PLATFORM: android-28

.github/workflows/build.yml

@@ -5,7 +5,7 @@ name: build
 env:
   artifact_path: artifact_path
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  RabbitCommon_VERSION: v2.2.5
+  RabbitCommon_VERSION: v2.2.6
 
 on:
   push:

.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.5
+      RabbitCommon_VERSION: v2.2.6
       artifact_name: build_doxygen
 
     # Map the job outputs to step outputs

.github/workflows/macos.yml

@@ -41,7 +41,7 @@ jobs:
       INSTALL_DIR: ${{github.workspace}}/.cache/install
       qt_modules: ${{matrix.qt_modules}}
       VCPKGGITCOMMITID: 59aeb8fe8fe1c980de6bd5ba634cf21024522d81
-      RabbitCommon_VERSION: v2.2.5
+      RabbitCommon_VERSION: v2.2.6
       artifact_name: build_macos
 
     # Map the job outputs to step outputs

.github/workflows/mingw.yml

@@ -28,7 +28,7 @@ jobs:
       SOURCE_DIR:  ${{github.workspace}}\.cache\source
       TOOSL_DIR:   ${{github.workspace}}\.cache\tools
       INSTALL_DIR: ${{github.workspace}}\.cache\install
-      RabbitCommon_VERSION: v2.2.5
+      RabbitCommon_VERSION: v2.2.6
       artifact_name: build_mingw
       CMAKE_GENERATOR: "MinGW Makefiles"
 

.github/workflows/msvc.yml

@@ -45,7 +45,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.5
+      RabbitCommon_VERSION: v2.2.6
       VCPKGGITCOMMITID: 59aeb8fe8fe1c980de6bd5ba634cf21024522d81
       qt_modules: qtwebengine ${{matrix.qt_modules}}
       artifact_name: build_msvc

.github/workflows/qmake.yml

@@ -21,7 +21,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.5
+      RabbitCommon_VERSION: 2.2.6
 
     steps:
       - name: Checkout Repository

.github/workflows/ubuntu.yml

@@ -25,7 +25,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.5
+      RabbitCommon_VERSION: 2.2.6
       artifact_name: build_ubuntu
 
     # Map the job outputs to step outputs

App/App.pro

@@ -37,7 +37,7 @@ isEmpty(RabbitCommon_VERSION) {
     }
 }
 isEmpty(RabbitCommon_VERSION){
-    RabbitCommon_VERSION="2.2.5"
+    RabbitCommon_VERSION="2.2.6"
 }
 message("RabbitCommon_VERSION:$$RabbitCommon_VERSION")
 DEFINES += RabbitCommon_VERSION=\"\\\"$$quote($$RabbitCommon_VERSION)\\\"\"

CMakeLists.txt

@@ -13,7 +13,7 @@ endif()
 
 # 参见：
 #   语义化版本: https://semver.org/lang/zh-CN/
-SET(RabbitCommon_VERSION "2.2.5")
+SET(RabbitCommon_VERSION "2.2.6")
 # Find Git Version Patch
 IF(EXISTS "${CMAKE_SOURCE_DIR}/.git")
     if(NOT GIT)

README.md

@@ -411,7 +411,7 @@ See: [FrmUpdater.h](Src/FrmUpdater/FrmUpdater.h)
 
       <?xml version="1.0" encoding="UTF-8"?>
           <REDIRECT>
-              <VERSION>v2.2.5</VERSION>
+              <VERSION>v2.2.6</VERSION>
               <WINDOWS>
                   <URL>url</URL>
               </WINDOWS>

README_zh_CN.md

@@ -399,7 +399,7 @@ Qt因为版权原因，没有提供openssl动态库，所以必须自己复制op
 
       <?xml version="1.0" encoding="UTF-8"?>
       <REDIRECT>
-           <VERSION>v2.2.5</VERSION>
+           <VERSION>v2.2.6</VERSION>
            <WINDOWS>
                 <URL>url</URL>
            </WINDOWS>

Src/CMakeLists.txt

@@ -32,7 +32,7 @@ include(CMakeDependentOption)
 include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/RabbitCommonUtils.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Download.cmake)
 
-SET(RabbitCommon_VERSION "2.2.5")
+SET(RabbitCommon_VERSION "2.2.6")
 SET(RABBITCOMMON_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..)
 GET_VERSION(SOURCE_DIR ${RABBITCOMMON_SOURCE_DIR}
     OUT_VERSION RabbitCommon_VERSION

Src/Src.pro

@@ -21,7 +21,7 @@ isEmpty(RabbitCommon_VERSION) {
     }
 }
 isEmpty(RabbitCommon_VERSION){
-    RabbitCommon_VERSION="2.2.5"
+    RabbitCommon_VERSION="2.2.6"
 }
 message("RabbitCommon RabbitCommon_VERSION:$$RabbitCommon_VERSION; RabbitCommon_REVISION:$$RabbitCommon_REVISION")
 DEFINES += RabbitCommon_VERSION=\"\\\"$$quote($$RabbitCommon_VERSION)\\\"\" RabbitCommon_REVISION=\"\\\"$$quote($$RabbitCommon_REVISION)\\\"\"

Update/update.json

@@ -1,7 +1,7 @@
 {
     "redirect": [
         {
-          "version":"2.2.5"
+          "version":"2.2.6"
         }
     ]
 }

Update/update.xml

@@ -1,4 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <REDIRECT>
-    <VERSION>v2.2.5</VERSION>
+    <VERSION>v2.2.6</VERSION>
 </REDIRECT>

debian/changelog

@@ -1,5 +1,6 @@
-rabbitcommon (2.2.5) unstable; urgency=medium
+rabbitcommon (2.2.6) unstable; urgency=medium
 
-  * New upstream version 2.2.5
+    * Use installed cmark in linux
+    * Modify debian package
 
- -- Kang Lin <[email protected]>  Mon, 17 Jun 2024 16:07:06 +0800
+ -- Kang Lin <[email protected]>  Wed, 19 Jun 2024 15:09:58 +0800

vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "rabbitcommon",
-  "version-string": "2.2.5",
+  "version-string": "2.2.6",
   "license": "GPL-3.0",
   "homepage": "https://github.com/KangLin/RabbitCommon",