Release v2.3.0

KangLin · Dec 5, 2024 · 999127e · 999127e
1 parent fbe9bec
commit 999127e
Show file tree

Hide file tree

Showing 23 changed files with 36 additions and 36 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -3,7 +3,7 @@
     package="org.KangLinStudio.FileBrowser"
     android:installLocation="auto"
     android:versionCode="0"
-    android:versionName="2.2.6">
+    android:versionName="2.3.0">
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"  />
     <uses-permission android:name="android.permission.INTERNET"  />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"  />

diff --git 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">
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"  />
     <uses-permission android:name="android.permission.INTERNET"  />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"  />

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

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

diff --git 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
@@ -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
@@ -1,7 +1,7 @@
 {
     "redirect": [
         {
-          "version":"2.2.6"
+          "version":"2.3.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.2.6</VERSION>
+    <VERSION>v2.3.0</VERSION>
 </REDIRECT>
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,7 +1,7 @@
 # 作者：康林<[email protected]>
 
 #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
@@ -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 <[email protected]>  Wed, 19 Jun 2024 15:09:58 +0800
+ -- Kang Lin <[email protected]>  Thu, 05 Dec 2024 16:14:47 +0800
diff --git 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
@@ -2,7 +2,7 @@
 # Snapcraft.yaml schema: https://snapcraft.io/docs/snapcraft-yaml-schema
 name: rabbitcommon # you probably want to 'snapcraft register <name>'
 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: [email protected]
 donation:

diff --git 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",