Release v2.2.0

KangLin · Mar 20, 2024 · 39c7789 · 39c7789
1 parent d1a1ca5
commit 39c7789
Show file tree

Hide file tree

Showing 20 changed files with 26 additions and 19 deletions.
diff --git 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
-      RabbitCommon_VERSION: v2.1.0
+      RabbitCommon_VERSION: v2.2.0
       VCPKGGITCOMMITID: a1a1cbc975abf909a6c8985a6a2b8fe20bbd9bd6
       ANDROID_ABI: ${{matrix.ANDROID_ABI}}
       ANDROID_PLATFORM: android-28

diff --git 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 }}
-  RabbitCommon_VERSION: v2.1.0
+  RabbitCommon_VERSION: v2.2.0
 
 on:
   push:

diff --git 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.1.0
+      RabbitCommon_VERSION: v2.2.0
       artifact_name: build_doxygen
 
     # Map the job outputs to step outputs

diff --git 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: a1a1cbc975abf909a6c8985a6a2b8fe20bbd9bd6
-      RabbitCommon_VERSION: v2.1.0
+      RabbitCommon_VERSION: v2.2.0
       artifact_name: build_macos
 
     # Map the job outputs to step outputs

diff --git a/.github/workflows/mingw.yml b/.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.1.0
+      RabbitCommon_VERSION: v2.2.0
       artifact_name: build_mingw
       CMAKE_GENERATOR: "MinGW Makefiles"
 

diff --git a/.github/workflows/msvc.yml b/.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.1.0
+      RabbitCommon_VERSION: v2.2.0
       VCPKGGITCOMMITID: a1a1cbc975abf909a6c8985a6a2b8fe20bbd9bd6
       qt_modules: qtwebengine ${{matrix.qt_modules}}
       artifact_name: build_msvc

diff --git a/.github/workflows/qmake.yml b/.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.1.0
+      RabbitCommon_VERSION: 2.2.0
 
     steps:
       - name: Checkout Repository

diff --git a/.github/workflows/ubuntu.yml b/.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.1.0
+      RabbitCommon_VERSION: 2.2.0
       artifact_name: build_ubuntu
 
     # Map the job outputs to step outputs

diff --git a/App/App.pro b/App/App.pro
@@ -37,7 +37,7 @@ isEmpty(RabbitCommon_VERSION) {
     }
 }
 isEmpty(RabbitCommon_VERSION){
-    RabbitCommon_VERSION="v2.1.0"
+    RabbitCommon_VERSION="v2.2.0"
 }
 message("RabbitCommon_VERSION:$$RabbitCommon_VERSION")
 DEFINES += RabbitCommon_VERSION=\"\\\"$$quote($$RabbitCommon_VERSION)\\\"\"

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ if(POLICY CMP0020)
     cmake_policy(SET CMP0020 NEW)
 endif()
 
-SET(RabbitCommon_VERSION "v2.1.0")
+SET(RabbitCommon_VERSION "v2.2.0")
 # Find Git Version Patch
 IF(EXISTS "${CMAKE_SOURCE_DIR}/.git")
     if(NOT GIT)

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -3,6 +3,9 @@
   - CTools::InstallTranslator
   - CTools::RemoveTranslator
   - CDir::GetDirDocument
+- Fix: INSTALL_LOG_CONFIG_FILE bug
+- Download: fix check file is null
+- CMake: windeployqt with --compiler-runtime
 
 ### Version: v2.1.0
 - Fix: CMake: fix the shared library symlinks bug. #1  

diff --git a/ChangeLog_zh_CN.md b/ChangeLog_zh_CN.md
@@ -3,6 +3,10 @@
   - CTools::InstallTranslator
   - CTools::RemoveTranslator
   - CDir::GetDirDocument
+- 修复:
+  - INSTALL_LOG_CONFIG_FILE 错误
+  - 下载: 修复 file 指针是空错误
+- CMake: windeployqt 使用 --compiler-runtime
 
 ### 版本： v2.1.0
 - 修复 linux 下动态库接错误 #1  

diff --git a/README.md b/README.md
@@ -408,7 +408,7 @@ See: [FrmUpdater.h](Src/FrmUpdater/FrmUpdater.h)
 
       <?xml version="1.0" encoding="UTF-8"?>
           <REDIRECT>
-              <VERSION>v2.1.0</VERSION>
+              <VERSION>v2.2.0</VERSION>
               <WINDOWS>
                   <URL>url</URL>
               </WINDOWS>

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

diff --git a/Src/CMakeLists.txt b/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 "v2.1.0")
+SET(RabbitCommon_VERSION "v2.2.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
@@ -21,7 +21,7 @@ isEmpty(RabbitCommon_VERSION) {
     }
 }
 isEmpty(RabbitCommon_VERSION){
-    RabbitCommon_VERSION="v2.1.0"
+    RabbitCommon_VERSION="v2.2.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
@@ -1,7 +1,7 @@
 {
     "redirect": [
         {
-          "version":"v2.1.0"
+          "version":"v2.2.0"
         }
     ]
 }
diff --git a/Update/update.xml b/Update/update.xml
@@ -1,4 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <REDIRECT>
-    <VERSION>v2.1.0</VERSION>
+    <VERSION>v2.2.0</VERSION>
 </REDIRECT>
diff --git a/debian/changelog b/debian/changelog
@@ -1,5 +1,5 @@
-rabbitcommon (2.1.0) unstable; urgency=medium
+rabbitcommon (2.2.0) unstable; urgency=medium
 
 
 
- -- Kang Lin <[email protected]>  Fri, 15 Mar 2024 14:35:41 +0800
+ -- Kang Lin <[email protected]>  Wed, 20 Mar 2024 15:30:19 +0800
diff --git a/vcpkg.json b/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "rabbitcommon",
-  "version-string": "2.1.0",
+  "version-string": "2.2.0",
   "license": "GPL-3.0",
   "homepage": "https://github.com/KangLin/RabbitCommon",