Merge branch 'master' into remove-ecm-ksh-submodules

cpeditor · Jun 1, 2024 · bc3ec6f · bc3ec6f
2 parents 391e076 + 35235e8
commit bc3ec6f
Show file tree

Hide file tree

Showing 13 changed files with 56 additions and 46 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -220,7 +220,7 @@ jobs:
 
       - name: "[Linux] Release AppImage"
         if: startsWith(matrix.config.os, 'ubuntu')
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           draft: true
           prerelease: ${{ steps.get_version.outputs.ISBETA }}
@@ -277,7 +277,7 @@ jobs:
 
       - name: "[Linux] Release deb"
         if: startsWith(matrix.config.os, 'ubuntu')
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           draft: true
           prerelease: ${{ steps.get_version.outputs.ISBETA }}
@@ -298,7 +298,7 @@ jobs:
 
       - name: "[Linux] Release full source"
         if: startsWith(matrix.config.os, 'ubuntu')
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           draft: true
           prerelease: ${{ steps.get_version.outputs.ISBETA }}
@@ -321,7 +321,7 @@ jobs:
 
       - name: "[macOS] Release"
         if: startsWith(matrix.config.os, 'macos')
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           draft: true
           prerelease: ${{ steps.get_version.outputs.ISBETA }}
@@ -385,7 +385,7 @@ jobs:
 
       - name: "[Windows] Release"
         if: startsWith(matrix.config.os, 'windows')
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           draft: true
           prerelease: ${{ steps.get_version.outputs.ISBETA }}

diff --git a/.github/workflows/release_checksums.yml b/.github/workflows/release_checksums.yml
@@ -36,7 +36,7 @@ jobs:
           shasum -a 256 *.* > cpeditor-${{ steps.get_version.outputs.VERSION }}-sha256-checksums.txt
 
       - name: Upload checksums
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           prerelease: ${{ steps.get_version.outputs.ISBETA }}
           name: CP Editor ${{ steps.get_version.outputs.VERSION }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## UNRELEASED
 
-## 7.0.1 (Beta)
+## v7.0
 
 In this version, we have switched to [KSyntaxHighlighting](https://api.kde.org/frameworks/syntax-highlighting/html/), the same framework used by [the Kate editor](https://kate-editor.org/). This upgrade results in significantly improved syntax highlighting, a wider selection of [color themes](https://kate-editor.org/themes/), and additional features like code folding. However, due to extensive refactoring, some bugs may arise.
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ if(APPLE)
   set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14" CACHE STRING "Minimum OS X deployment version")
 endif()
 
-project(cpeditor LANGUAGES CXX VERSION 7.0.1)
+project(cpeditor LANGUAGES CXX VERSION 7.1.0)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 

diff --git a/DONORS.md b/DONORS.md
@@ -5,6 +5,7 @@
 -   [mateus sze cosenza](https://github.com/cosenza987)
 -   [Marhoosh](https://github.com/Marhoosh)
 -   [Dmytro Fedoriaka](https://github.com/fedimser)
+-   [Yash Bhagwat (Blitztage)](https://github.com/Yash-bhagwat)
 <!-- END: GitHub Sponsors -->
 
 ## Open Collective

diff --git a/README.md b/README.md
@@ -23,8 +23,8 @@ English |
 |  type  |                           branch                           |                                                                                                       build                                                                                                        |                                                                   downloads                                                                    |                                                         AUR                                                         |                                                snap                                                  |
 | :----: | :--------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------: |
 | alpha  | [master](https://github.com/cpeditor/cpeditor/tree/master) | [![GitHub Workflow Status](https://github.com/cpeditor/cpeditor/workflows/CI:%20Build%20Test/badge.svg?branch=master&event=push)](https://github.com/cpeditor/cpeditor/actions?query=event%3Apush+branch%3Amaster) |                                                                       -                                                                        | [![AUR version](https://img.shields.io/aur/version/cpeditor-git)](https://aur.archlinux.org/packages/cpeditor-git/) |  [![snap version](https://badgen.net/snapcraft/v/cpeditor/amd64/edge)](https://snapcraft.io/cpeditor)
-|  beta  |   [v6.11](https://github.com/cpeditor/cpeditor/tree/v6.11)   |   [![GitHub Workflow Status](https://github.com/cpeditor/cpeditor/workflows/CI:%20Build%20Test/badge.svg?branch=v6.11&event=push)](https://github.com/cpeditor/cpeditor/actions?query=event%3Apush+branch%3Av6.11)   | [![Downloads](https://img.shields.io/github/downloads/cpeditor/cpeditor/6.11.1/total)](https://github.com/cpeditor/cpeditor/releases/tag/6.11.1) |                                                          -                                                          |                                                   -
-| stable |   [v6.10](https://github.com/cpeditor/cpeditor/tree/v6.10)   |   [![GitHub Workflow Status](https://github.com/cpeditor/cpeditor/workflows/CI:%20Build%20Test/badge.svg?branch=v6.10&event=push)](https://github.com/cpeditor/cpeditor/actions?query=event%3Apush+branch%3Av6.10)   | [![Downloads](https://img.shields.io/github/downloads/cpeditor/cpeditor/6.10.3/total)](https://github.com/cpeditor/cpeditor/releases/tag/6.10.3) |     [![AUR version](https://img.shields.io/aur/version/cpeditor)](https://aur.archlinux.org/packages/cpeditor/)     |  [![snap version](https://badgen.net/snapcraft/v/cpeditor/amd64/stable)](https://snapcraft.io/cpeditor)
+|  beta  |   [v7.0](https://github.com/cpeditor/cpeditor/tree/v7.0)   |   [![GitHub Workflow Status](https://github.com/cpeditor/cpeditor/workflows/CI:%20Build%20Test/badge.svg?branch=v7.0&event=push)](https://github.com/cpeditor/cpeditor/actions?query=event%3Apush+branch%3Av7.0)   | [![Downloads](https://img.shields.io/github/downloads/cpeditor/cpeditor/7.0.1/total)](https://github.com/cpeditor/cpeditor/releases/tag/7.0.1) |                                                          -                                                          |                                                   -
+| stable |   [v6.11](https://github.com/cpeditor/cpeditor/tree/v6.11)   |   [![GitHub Workflow Status](https://github.com/cpeditor/cpeditor/workflows/CI:%20Build%20Test/badge.svg?branch=v6.11&event=push)](https://github.com/cpeditor/cpeditor/actions?query=event%3Apush+branch%3Av6.11)   | [![Downloads](https://img.shields.io/github/downloads/cpeditor/cpeditor/6.11.2/total)](https://github.com/cpeditor/cpeditor/releases/tag/6.11.2) |     [![AUR version](https://img.shields.io/aur/version/cpeditor)](https://aur.archlinux.org/packages/cpeditor/)     |  [![snap version](https://badgen.net/snapcraft/v/cpeditor/amd64/stable)](https://snapcraft.io/cpeditor)
 
 </div>
 

diff --git a/README_el-GR.md b/README_el-GR.md
@@ -23,8 +23,8 @@
 |  Τύπος  |                           Κλάδος                           |                                                                                                       Έκδοση                                                                                                        |                                                                   Λήψεις                                                                    |                                                         AUR                                                         |                                                snap                                                  |
 | :----: | :--------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------: |
 | alpha  | [master](https://github.com/cpeditor/cpeditor/tree/master) | [![GitHub Workflow Status](https://github.com/cpeditor/cpeditor/workflows/CI:%20Build%20Test/badge.svg?branch=master&event=push)](https://github.com/cpeditor/cpeditor/actions?query=event%3Apush+branch%3Amaster) |                                                                       -                                                                        | [![AUR version](https://img.shields.io/aur/version/cpeditor-git)](https://aur.archlinux.org/packages/cpeditor-git/) |  [![snap version](https://badgen.net/snapcraft/v/cpeditor/amd64/edge)](https://snapcraft.io/cpeditor)
-|  beta  |   [v6.11](https://github.com/cpeditor/cpeditor/tree/v6.11)   |   [![GitHub Workflow Status](https://github.com/cpeditor/cpeditor/workflows/CI:%20Build%20Test/badge.svg?branch=v6.11&event=push)](https://github.com/cpeditor/cpeditor/actions?query=event%3Apush+branch%3Av6.11)   | [![Downloads](https://img.shields.io/github/downloads/cpeditor/cpeditor/6.11.1/total)](https://github.com/cpeditor/cpeditor/releases/tag/6.11.1) |                                                          -                                                          |                                                   -
-| stable |   [v6.10](https://github.com/cpeditor/cpeditor/tree/v6.10)   |   [![GitHub Workflow Status](https://github.com/cpeditor/cpeditor/workflows/CI:%20Build%20Test/badge.svg?branch=v6.10&event=push)](https://github.com/cpeditor/cpeditor/actions?query=event%3Apush+branch%3Av6.10)   | [![Downloads](https://img.shields.io/github/downloads/cpeditor/cpeditor/6.10.2/total)](https://github.com/cpeditor/cpeditor/releases/tag/6.10.2) |     [![AUR version](https://img.shields.io/aur/version/cpeditor)](https://aur.archlinux.org/packages/cpeditor/)     |  [![snap version](https://badgen.net/snapcraft/v/cpeditor/amd64/stable)](https://snapcraft.io/cpeditor)
+|  beta  |   [v7.0](https://github.com/cpeditor/cpeditor/tree/v7.0)   |   [![GitHub Workflow Status](https://github.com/cpeditor/cpeditor/workflows/CI:%20Build%20Test/badge.svg?branch=v7.0&event=push)](https://github.com/cpeditor/cpeditor/actions?query=event%3Apush+branch%3Av7.0)   | [![Downloads](https://img.shields.io/github/downloads/cpeditor/cpeditor/7.0.1/total)](https://github.com/cpeditor/cpeditor/releases/tag/7.0.1) |                                                          -                                                          |                                                   -
+| stable |   [v6.11](https://github.com/cpeditor/cpeditor/tree/v6.11)   |   [![GitHub Workflow Status](https://github.com/cpeditor/cpeditor/workflows/CI:%20Build%20Test/badge.svg?branch=v6.11&event=push)](https://github.com/cpeditor/cpeditor/actions?query=event%3Apush+branch%3Av6.11)   | [![Downloads](https://img.shields.io/github/downloads/cpeditor/cpeditor/6.11.2/total)](https://github.com/cpeditor/cpeditor/releases/tag/6.11.2) |     [![AUR version](https://img.shields.io/aur/version/cpeditor)](https://aur.archlinux.org/packages/cpeditor/)     |  [![snap version](https://badgen.net/snapcraft/v/cpeditor/amd64/stable)](https://snapcraft.io/cpeditor)
 
 </div>
 

diff --git a/README_ja-JP.md b/README_ja-JP.md
@@ -23,8 +23,8 @@
 |  タイプ  |                           ブランチ                           |                                                                                                       ビルド                                                                                                        |                                                                   ダウンロード                                                                    |                                                         AUR                                                         |                                                snap                                                  |
 | :----: | :--------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------: |
 | alpha  | [master](https://github.com/cpeditor/cpeditor/tree/master) | [![GitHub Workflow Status](https://github.com/cpeditor/cpeditor/workflows/CI:%20Build%20Test/badge.svg?branch=master&event=push)](https://github.com/cpeditor/cpeditor/actions?query=event%3Apush+branch%3Amaster) |                                                                       -                                                                        | [![AUR version](https://img.shields.io/aur/version/cpeditor-git)](https://aur.archlinux.org/packages/cpeditor-git/) |  [![snap version](https://badgen.net/snapcraft/v/cpeditor/amd64/edge)](https://snapcraft.io/cpeditor)
-|  beta  |   [v6.11](https://github.com/cpeditor/cpeditor/tree/v6.11)   |   [![GitHub Workflow Status](https://github.com/cpeditor/cpeditor/workflows/CI:%20Build%20Test/badge.svg?branch=v6.11&event=push)](https://github.com/cpeditor/cpeditor/actions?query=event%3Apush+branch%3Av6.11)   | [![Downloads](https://img.shields.io/github/downloads/cpeditor/cpeditor/6.11.1/total)](https://github.com/cpeditor/cpeditor/releases/tag/6.11.1) |                                                          -                                                          |                                                   -
-| stable |   [v6.10](https://github.com/cpeditor/cpeditor/tree/v6.10)   |   [![GitHub Workflow Status](https://github.com/cpeditor/cpeditor/workflows/CI:%20Build%20Test/badge.svg?branch=v6.10&event=push)](https://github.com/cpeditor/cpeditor/actions?query=event%3Apush+branch%3Av6.10)   | [![Downloads](https://img.shields.io/github/downloads/cpeditor/cpeditor/6.10.2/total)](https://github.com/cpeditor/cpeditor/releases/tag/6.10.2) |     [![AUR version](https://img.shields.io/aur/version/cpeditor)](https://aur.archlinux.org/packages/cpeditor/)     |  [![snap version](https://badgen.net/snapcraft/v/cpeditor/amd64/stable)](https://snapcraft.io/cpeditor)
+|  beta  |   [v7.0](https://github.com/cpeditor/cpeditor/tree/v7.0)   |   [![GitHub Workflow Status](https://github.com/cpeditor/cpeditor/workflows/CI:%20Build%20Test/badge.svg?branch=v7.0&event=push)](https://github.com/cpeditor/cpeditor/actions?query=event%3Apush+branch%3Av7.0)   | [![Downloads](https://img.shields.io/github/downloads/cpeditor/cpeditor/7.0.1/total)](https://github.com/cpeditor/cpeditor/releases/tag/7.0.1) |                                                          -                                                          |                                                   -
+| stable |   [v6.11](https://github.com/cpeditor/cpeditor/tree/v6.11)   |   [![GitHub Workflow Status](https://github.com/cpeditor/cpeditor/workflows/CI:%20Build%20Test/badge.svg?branch=v6.11&event=push)](https://github.com/cpeditor/cpeditor/actions?query=event%3Apush+branch%3Av6.11)   | [![Downloads](https://img.shields.io/github/downloads/cpeditor/cpeditor/6.11.2/total)](https://github.com/cpeditor/cpeditor/releases/tag/6.11.2) |     [![AUR version](https://img.shields.io/aur/version/cpeditor)](https://aur.archlinux.org/packages/cpeditor/)     |  [![snap version](https://badgen.net/snapcraft/v/cpeditor/amd64/stable)](https://snapcraft.io/cpeditor)
 
 </div>