diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml index f17cc50d01..7a9516b5f6 100644 --- a/.github/workflows/ci-linux.yml +++ b/.github/workflows/ci-linux.yml @@ -16,7 +16,7 @@ on: default: false env: - VNOTE_VER: 3.18.1 + VNOTE_VER: 3.18.2 CMAKE_VER: 3.24.3 jobs: diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml index 87c7d7e892..c332da7c49 100644 --- a/.github/workflows/ci-macos.yml +++ b/.github/workflows/ci-macos.yml @@ -16,7 +16,7 @@ on: default: false env: - VNOTE_VER: 3.18.1 + VNOTE_VER: 3.18.2 CMAKE_VER: 3.24.3 jobs: diff --git a/.github/workflows/ci-win.yml b/.github/workflows/ci-win.yml index d3b5b8b9e1..5e5486c9e7 100644 --- a/.github/workflows/ci-win.yml +++ b/.github/workflows/ci-win.yml @@ -16,7 +16,7 @@ on: default: false env: - VNOTE_VER: 3.18.1 + VNOTE_VER: 3.18.2 jobs: build: diff --git a/CMakeLists.txt b/CMakeLists.txt index 323b25eaa5..2dee99fed4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required (VERSION 3.20) set(CMAKE_OSX_DEPLOYMENT_TARGET "12.1" CACHE STRING "Minimum OS X deployment version") project(VNote - VERSION 3.18.1 + VERSION 3.18.2 DESCRIPTION "A pleasant note-taking platform" HOMEPAGE_URL "https://app.vnote.fun" LANGUAGES C CXX) diff --git a/scripts/update_version.py b/scripts/update_version.py index 08f61c092b..f32ce74958 100644 --- a/scripts/update_version.py +++ b/scripts/update_version.py @@ -7,6 +7,7 @@ exit newVersion = sys.argv[1] +shortVersion = re.match('^(\\d+\\.\\d+).', newVersion).group(1) print("New version: {0}".format(newVersion)) # CMakeList @@ -25,6 +26,10 @@ print(regExp.sub('\\1VNOTE_VER: ' + newVersion, line), end='') # Info.plist +regExp = re.compile('(\\s+)(?!12\\.1)\\d+\\.\\d+') +for line in fileinput.input(['src/data/core/Info.plist'], inplace = True): + print(regExp.sub('\\1' + shortVersion + '', line), end='') + regExp = re.compile('(\\s+)\\d+\\.\\d+\\.\\d+') for line in fileinput.input(['src/data/core/Info.plist'], inplace = True): print(regExp.sub('\\1' + newVersion + '', line), end='') diff --git a/src/data/core/Info.plist b/src/data/core/Info.plist index 081f5938ce..af85b4a0e6 100644 --- a/src/data/core/Info.plist +++ b/src/data/core/Info.plist @@ -25,9 +25,9 @@ CFBundleExecutable vnote CFBundleShortVersionString - 3.17 + 3.18 CFBundleVersion - 3.18.1 + 3.18.2 NSHumanReadableCopyright Distributed under LGPL-3.0 license. Copyright (c) 2024 app.vnote.fun CFBundleIconFile diff --git a/src/data/core/vnotex.json b/src/data/core/vnotex.json index b3d26c4956..4016b7a9cd 100644 --- a/src/data/core/vnotex.json +++ b/src/data/core/vnotex.json @@ -3,7 +3,7 @@ "metadata" : { "//comment": "When releasing new version, please go through the following configs to check if override is needed.", "//Comment": "markdown_editor#override_viewer_resource", - "version" : "3.18.1" + "version" : "3.18.2" }, "core" : { "theme" : "pure",