diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 09114f5..e01c158 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -35,7 +35,7 @@ jobs:
SOURCE_DIR: ${{github.workspace}}/.cache/source
TOOSL_DIR: ${{github.workspace}}/.cache/tools
INSTALL_DIR: ${{github.workspace}}/.cache/install_${{matrix.BUILD_TYPE}}
- Calendar_VERSION: v1.0.13
+ Calendar_VERSION: v1.0.14
VCPKGGITCOMMITID: 980ec0f49d81f794778386f7bd518b2cc9c092f0
ANDROID_PLATFORM: android-23
ANDROID_NATIVE_API_LEVEL: 23
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7ce26d9..c1430bb 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 }}
- Calendar_VERSION: v1.0.13
+ Calendar_VERSION: v1.0.14
on:
push:
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index fc9ec14..0b293b8 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -34,7 +34,7 @@ jobs:
TOOSL_DIR: ${{github.workspace}}/.cache/tools
INSTALL_DIR: ${{github.workspace}}/.cache/install_macos
qt_modules: qtwebengine ${{matrix.qt_modules}}
- Calendar_VERSION: 1.0.13
+ Calendar_VERSION: 1.0.14
artifact_name: build_macos
VCPKGGITCOMMITID: 980ec0f49d81f794778386f7bd518b2cc9c092f0
diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml
index 0363525..1b55aa3 100644
--- 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}}
- Calendar_VERSION: v1.0.13
+ Calendar_VERSION: v1.0.14
VCPKGGITCOMMITID: 980ec0f49d81f794778386f7bd518b2cc9c092f0
qt_modules: ${{matrix.qt_modules}}
artifact_name: build_msvc
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index d5494eb..1704b61 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -22,7 +22,7 @@ jobs:
SOURCE_DIR: ${{github.workspace}}/.cache/source
TOOSL_DIR: ${{github.workspace}}/.cache/tools
INSTALL_DIR: ${{github.workspace}}/.cache/install_ubuntu
- Calendar_VERSION: 1.0.13
+ Calendar_VERSION: 1.0.14
artifact_name: build_ubuntu
# Map the job outputs to step outputs
diff --git a/.travis.yml b/.travis.yml
index 67179e5..73ac868 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,7 +50,7 @@ before_install:
- sudo Xvfb :99 -ac &
- export DISPLAY=:99.0
- mkdir -p ${SOURCE_DIR}/Tools
- - export VERSION="v1.0.13"
+ - export VERSION="v1.0.14"
install:
- cd ${SOURCE_DIR}
diff --git a/3th_libs/LunarCalendar b/3th_libs/LunarCalendar
index 4b724db..6b27d66 160000
--- a/3th_libs/LunarCalendar
+++ b/3th_libs/LunarCalendar
@@ -1 +1 @@
-Subproject commit 4b724db1d4bd7c7613c2d7fa84663ffe09fbe8ec
+Subproject commit 6b27d6692e1f89485fb31efd2cb1f721c5f1f760
diff --git a/App/android/AndroidManifest.xml b/App/android/AndroidManifest.xml
index c207135..5b020a0 100644
--- a/App/android/AndroidManifest.xml
+++ b/App/android/AndroidManifest.xml
@@ -3,7 +3,7 @@
package="org.KangLinStudio.Calendar"
android:installLocation="auto"
android:versionCode="1"
- android:versionName="1.0.13">
+ android:versionName="1.0.14">
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f582150..df72a40 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -130,7 +130,7 @@ GET_VERSION(OUT_VERSION Calendar_VERSION
OUT_REVISION Calendar_REVISION)
message("Calendar_VERSION:${Calendar_VERSION}; Calendar_REVISION:${Calendar_REVISION}")
if(NOT Calendar_VERSION)
- set(Calendar_VERSION "v1.0.13")
+ set(Calendar_VERSION "v1.0.14")
endif()
set(VERSION ${Calendar_VERSION})
add_subdirectory(3th_libs/LunarCalendar/Src)
diff --git a/Install/Install.nsi b/Install/Install.nsi
index 1ae55dd..fd59d12 100644
--- a/Install/Install.nsi
+++ b/Install/Install.nsi
@@ -3,7 +3,7 @@
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "Calendar"
!define PRODUCT_APP_NAME "CalendarApp"
-!define PRODUCT_VERSION "v1.0.13"
+!define PRODUCT_VERSION "v1.0.14"
!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/Update/update.xml b/Update/update.xml
index 1a90223..5cbab66 100644
--- a/Update/update.xml
+++ b/Update/update.xml
@@ -1,16 +1,16 @@
- v1.0.13
+ v1.0.14
- https://github.com/KangLin/Calendar/releases/download/v1.0.13/update_windows.xml
- https://sourceforge.net/projects/rabbitcalendar/files/v1.0.13/update_windows.xml/download
+ https://github.com/KangLin/Calendar/releases/download/v1.0.14/update_windows.xml
+ https://sourceforge.net/projects/rabbitcalendar/files/v1.0.14/update_windows.xml/download
- https://github.com/KangLin/Calendar/releases/download/v1.0.13/update_linux.xml
- https://sourceforge.net/projects/rabbitcalendar/files/v1.0.13/update_linux.xml/download
+ https://github.com/KangLin/Calendar/releases/download/v1.0.14/update_linux.xml
+ https://sourceforge.net/projects/rabbitcalendar/files/v1.0.14/update_linux.xml/download
- https://github.com/KangLin/Calendar/releases/download/v1.0.13/update_linux.xml
- https://sourceforge.net/projects/rabbitcalendar/files/v1.0.13/update_linux.xml/download
+ https://github.com/KangLin/Calendar/releases/download/v1.0.14/update_linux.xml
+ https://sourceforge.net/projects/rabbitcalendar/files/v1.0.14/update_linux.xml/download
diff --git a/appveyor.yml b/appveyor.yml
index db9142f..0168578 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,5 @@
#TODO: Change version
-version: 'v1.0.13.{build}'
+version: 'v1.0.14.{build}'
cache:
- Package
diff --git a/ci/build.sh b/ci/build.sh
index 898ddd5..b465a69 100644
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -115,10 +115,10 @@ esac
export PKG_CONFIG_PATH=${ThirdLibs_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
if [ -n "$appveyor_build_version" -a -z "$VERSION" ]; then
- export VERSION="v1.0.13"
+ export VERSION="v1.0.14"
fi
if [ -z "$VERSION" ]; then
- export VERSION="v1.0.13"
+ export VERSION="v1.0.14"
fi
export UPLOADTOOL_BODY="Release Calendar ${VERSION}.
The change see [ChangeLog.md](ChangeLog.md) or [ChangeLog_zh_CN.md](ChangeLog_zh_CN.md)"
diff --git a/debian/changelog b/debian/changelog
index a7e51e1..22c6bfe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-calendar (1.0.13) stable; urgency=medium
+calendar (1.0.14) stable; urgency=medium
* Initial Release.
diff --git a/debian/control b/debian/control
index ef7c926..d0836c5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: main
Priority: optional
Maintainer: Kang Lin
Build-Depends: debhelper (>= 6)
-Standards-Version:"v1.0.13"
+Standards-Version:"v1.0.14"
Homepage: https://github.com/KangLin/Calendar
Vcs-Git: https://github.com/KangLin/Calendar.git
Vcs-Browser: https://github.com/KangLin/Calendar