Skip to content

Commit

Permalink
Release v1.0.11
Browse files Browse the repository at this point in the history
  • Loading branch information
KangLin committed Jul 19, 2023
1 parent 1392146 commit b888b60
Show file tree
Hide file tree
Showing 15 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.10
Calendar_VERSION: v1.0.11
VCPKGGITCOMMITID: 5ac89392d779288ec8073ebba69cf12d3537f6d7
ANDROID_PLATFORM: android-23
ANDROID_NATIVE_API_LEVEL: 23
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: build
env:
artifact_path: artifact_path
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Calendar_VERSION: v1.0.10
Calendar_VERSION: v1.0.11

on:
push:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.10
Calendar_VERSION: 1.0.11
artifact_name: build_macos
VCPKGGITCOMMITID: 5ac89392d779288ec8073ebba69cf12d3537f6d7

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/msvc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.10
Calendar_VERSION: v1.0.11
VCPKGGITCOMMITID: 5ac89392d779288ec8073ebba69cf12d3537f6d7
qt_modules: ${{matrix.qt_modules}}
artifact_name: build_msvc
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.10
Calendar_VERSION: 1.0.11
artifact_name: build_ubuntu

# Map the job outputs to step outputs
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ before_install:
- sudo Xvfb :99 -ac &
- export DISPLAY=:99.0
- mkdir -p ${SOURCE_DIR}/Tools
- export VERSION="v1.0.10"
- export VERSION="v1.0.11"

install:
- cd ${SOURCE_DIR}
Expand Down
2 changes: 1 addition & 1 deletion App/android/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
package="org.KangLinStudio.Calendar"
android:installLocation="auto"
android:versionCode="1"
android:versionName="1.0.10">
android:versionName="1.0.11">

<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.INTERNET"/>
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.10")
set(Calendar_VERSION "v1.0.11")
endif()
set(VERSION ${Calendar_VERSION})
add_subdirectory(3th_libs/LunarCalendar/Src)
Expand Down
2 changes: 1 addition & 1 deletion Install/Install.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "Calendar"
!define PRODUCT_APP_NAME "CalendarApp"
!define PRODUCT_VERSION "v1.0.10"
!define PRODUCT_VERSION "v1.0.11"
!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"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Author: KangLin ([email protected])
Mac os and IOS, I don't have the corresponding equipment,
please compile and test the students with the corresponding equipment.

See: [Qt5](https://doc.qt.io/qt-5/supported-platforms.html), [Qt6](https://doc.qt.io/qt-6/supported-platforms.html)
See: [Qt5](https://doc.qt.io/qt-5/supported-platforms.html), [Qt6](https://doc.qt.io/qt-6/supported-platforms.html)

### ScreentShot
- Unix screent shot
Expand Down
14 changes: 7 additions & 7 deletions Update/update.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?xml version='1.0' encoding='UTF-8'?>
<REDIRECT>
<VERSION>v1.0.10</VERSION>
<VERSION>v1.0.11</VERSION>
<WINDOWS>
<URL>https://github.com/KangLin/Calendar/releases/download/v1.0.10/update_windows.xml</URL>
<URL>https://sourceforge.net/projects/rabbitcalendar/files/v1.0.10/update_windows.xml/download</URL>
<URL>https://github.com/KangLin/Calendar/releases/download/v1.0.11/update_windows.xml</URL>
<URL>https://sourceforge.net/projects/rabbitcalendar/files/v1.0.11/update_windows.xml/download</URL>
</WINDOWS>
<LINUX>
<URL>https://github.com/KangLin/Calendar/releases/download/v1.0.10/update_linux.xml</URL>
<URL>https://sourceforge.net/projects/rabbitcalendar/files/v1.0.10/update_linux.xml/download</URL>
<URL>https://github.com/KangLin/Calendar/releases/download/v1.0.11/update_linux.xml</URL>
<URL>https://sourceforge.net/projects/rabbitcalendar/files/v1.0.11/update_linux.xml/download</URL>
</LINUX>
<LINUX_APPIMAGE>
<URL>https://github.com/KangLin/Calendar/releases/download/v1.0.10/update_linux.xml</URL>
<URL>https://sourceforge.net/projects/rabbitcalendar/files/v1.0.10/update_linux.xml/download</URL>
<URL>https://github.com/KangLin/Calendar/releases/download/v1.0.11/update_linux.xml</URL>
<URL>https://sourceforge.net/projects/rabbitcalendar/files/v1.0.11/update_linux.xml/download</URL>
</LINUX_APPIMAGE>
</REDIRECT>
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#TODO: Change version
version: 'v1.0.10.{build}'
version: 'v1.0.11.{build}'

cache:
- Package
Expand Down
4 changes: 2 additions & 2 deletions ci/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.10"
export VERSION="v1.0.11"
fi
if [ -z "$VERSION" ]; then
export VERSION="v1.0.10"
export VERSION="v1.0.11"
fi

export UPLOADTOOL_BODY="Release Calendar ${VERSION}.<br> The change see [ChangeLog.md](ChangeLog.md) or [ChangeLog_zh_CN.md](ChangeLog_zh_CN.md)"
Expand Down
2 changes: 1 addition & 1 deletion debian/changelog
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
calendar (1.0.10) stable; urgency=medium
calendar (1.0.11) stable; urgency=medium

* Initial Release.

Expand Down
2 changes: 1 addition & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Section: main
Priority: optional
Maintainer: Kang Lin <[email protected]>
Build-Depends: debhelper (>= 6)
Standards-Version:"v1.0.10"
Standards-Version:"v1.0.11"
Homepage: https://github.com/KangLin/Calendar
Vcs-Git: https://github.com/KangLin/Calendar.git
Vcs-Browser: https://github.com/KangLin/Calendar
Expand Down

0 comments on commit b888b60

Please sign in to comment.