From 84cb60d8821469cf4cdccb19de6624d38f47e2ee Mon Sep 17 00:00:00 2001 From: Le Tan Date: Mon, 1 Jul 2024 22:47:11 +0800 Subject: [PATCH] release v3.18.0 --- .github/workflows/ci-linux.yml | 2 +- .github/workflows/ci-macos.yml | 2 +- .github/workflows/ci-win.yml | 2 +- CMakeLists.txt | 2 +- changes.md | 8 ++++++++ scripts/update_version.py | 5 +++++ src/data/core/Info.plist | 2 +- src/data/core/vnotex.json | 2 +- src/data/extra/docs/en/welcome.md | 2 +- 9 files changed, 20 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml index 47bf58d711..02e476b437 100644 --- a/.github/workflows/ci-linux.yml +++ b/.github/workflows/ci-linux.yml @@ -16,7 +16,7 @@ on: default: false env: - VNOTE_VER: 3.17.0 + VNOTE_VER: 3.18.0 CMAKE_VER: 3.24.3 jobs: diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml index eb7dab055c..1c3f8b967c 100644 --- a/.github/workflows/ci-macos.yml +++ b/.github/workflows/ci-macos.yml @@ -16,7 +16,7 @@ on: default: false env: - VNOTE_VER: 3.17.0 + VNOTE_VER: 3.18.0 CMAKE_VER: 3.24.3 jobs: diff --git a/.github/workflows/ci-win.yml b/.github/workflows/ci-win.yml index 1ef07933fc..8eac62838f 100644 --- a/.github/workflows/ci-win.yml +++ b/.github/workflows/ci-win.yml @@ -16,7 +16,7 @@ on: default: false env: - VNOTE_VER: 3.17.0 + VNOTE_VER: 3.18.0 jobs: build: diff --git a/CMakeLists.txt b/CMakeLists.txt index bb1aa80540..eb82459226 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.17.0 + VERSION 3.18.0 DESCRIPTION "A pleasant note-taking platform" HOMEPAGE_URL "https://app.vnote.fun" LANGUAGES C CXX) diff --git a/changes.md b/changes.md index dff3b21f45..481541907d 100644 --- a/changes.md +++ b/changes.md @@ -1,4 +1,12 @@ # Changes +## v3.18.0 +* Upgrade to Qt6 +* Support MacOS universal build +* Upgrade Mermaid, Flowchart.js, and markdown-it +* Markdown-it + * Fix XSS protection and turn it on by default + * Support mark by `==xx==` + ## v3.17.0 * Quick note: create note in given scheme (@feloxx) * MarkdownEditor: support inserting multiple images (@feloxx) diff --git a/scripts/update_version.py b/scripts/update_version.py index 7f873002a8..08f61c092b 100644 --- a/scripts/update_version.py +++ b/scripts/update_version.py @@ -9,6 +9,11 @@ newVersion = sys.argv[1] print("New version: {0}".format(newVersion)) +# CMakeList +regExp = re.compile('(\\s+)VERSION \\S+') +for line in fileinput.input(['CMakeLists.txt'], inplace = True): + print(regExp.sub('\\1VERSION ' + newVersion, line), end='') + # vnotex.json regExp = re.compile('(\\s+)"version" : "\\S+"') for line in fileinput.input(['src/data/core/vnotex.json'], inplace = True): diff --git a/src/data/core/Info.plist b/src/data/core/Info.plist index 86e7f45678..c90f6a3b0d 100644 --- a/src/data/core/Info.plist +++ b/src/data/core/Info.plist @@ -27,7 +27,7 @@ CFBundleShortVersionString 3.17 CFBundleVersion - 3.17.0 + 3.18.0 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 98ef3826e3..78aec14321 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.17.0" + "version" : "3.18.0" }, "core" : { "theme" : "pure", diff --git a/src/data/extra/docs/en/welcome.md b/src/data/extra/docs/en/welcome.md index 65a5f43bdd..a92f5c36d7 100644 --- a/src/data/extra/docs/en/welcome.md +++ b/src/data/extra/docs/en/welcome.md @@ -11,4 +11,4 @@ For more information, please visit [**VNote's Home Page**](https://vnotex.github * Feedbacks are appreciated! Please [post an issue](https://github.com/vnotex/vnote/issues) on GitHub if there is any. ### Windows Users -* if VNote hangs frequently or behaves unexpectedly in interface, please check the **OpenGL** option. [Details here](https://github.com/vnotex/vnote/issues/853). +* If VNote hangs frequently or behaves unexpectedly in interface, please check the **OpenGL** option. Check details [here](https://github.com/vnotex/vnote/issues/853).