diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 404a987c58..7b22f0f69d 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -24,8 +24,8 @@ A clear and concise description of what you expected to happen. If applicable, add screenshots to help explain your problem. **MediaElch Version:** - - [ ] 2.10.5-dev (nightly) - - [ ] 2.10.4 (stable) + - [ ] 2.10.7-dev (nightly) + - [ ] 2.10.6 (stable) **Operating System:** diff --git a/.github/ISSUE_TEMPLATE/scraper-does-not-work.md b/.github/ISSUE_TEMPLATE/scraper-does-not-work.md index 9d388f1b7d..bcd14ceb30 100644 --- a/.github/ISSUE_TEMPLATE/scraper-does-not-work.md +++ b/.github/ISSUE_TEMPLATE/scraper-does-not-work.md @@ -22,8 +22,8 @@ assignees: '' Add a list of information that is not loaded correctly. **MediaElch Version:** - - [ ] 2.10.5-dev (nightly) - - [ ] 2.10.4 (stable) + - [ ] 2.10.7-dev (nightly) + - [ ] 2.10.6 (stable) **Operating System:** - [ ] Windows diff --git a/CHANGELOG.md b/CHANGELOG.md index 21cb7ee6a7..2fc1f25a7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,11 @@ # Changelog -## Upcoming +## 2.10.6 - 2023-12-03 ### Notes -- MediaElch for macOS 11 and later now uses Qt 6.6.0 +- MediaElch for macOS 11 and later now uses Qt 6.6.1 ### Fixed diff --git a/CMakeLists.txt b/CMakeLists.txt index 4895c3ae3d..7f15a0e582 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.15.0 FATAL_ERROR) project( mediaelch - VERSION 2.10.5 + VERSION 2.10.6 DESCRIPTION "Media Manager for Kodi" HOMEPAGE_URL "https://mediaelch.github.io/" ) diff --git a/MediaElch.plist b/MediaElch.plist index 0c9e02a295..4be5503db2 100644 --- a/MediaElch.plist +++ b/MediaElch.plist @@ -7,11 +7,11 @@ CFBundlePackageType APPL CFBundleGetInfoString - 2.10.5 + 2.10.6 CFBundleVersion - 2.10.5 + 2.10.6 CFBundleShortVersionString - 2.10.5 + 2.10.6 CFBundleExecutable MediaElch CFBundleHelpBookFolder diff --git a/Version.h b/Version.h index 122b6eea8c..1b9fa162e3 100644 --- a/Version.h +++ b/Version.h @@ -10,8 +10,8 @@ namespace constants { // Update versions via ./scripts/release/bump_version.py constexpr char AppName[] = "MediaElch"; -constexpr char AppVersionStr[] = "2.10.5"; // major.minor.patch -constexpr char AppVersionFullStr[] = "2.10.5-dev"; // major.minor.patch[-identifier] +constexpr char AppVersionStr[] = "2.10.6"; // major.minor.patch +constexpr char AppVersionFullStr[] = "2.10.6"; // major.minor.patch[-identifier] constexpr char VersionName[] = "Benzar"; constexpr char OrganizationName[] = "kvibes"; diff --git a/docs/admin/release.md b/docs/admin/release.md index b1934fad96..21c6fd3088 100644 --- a/docs/admin/release.md +++ b/docs/admin/release.md @@ -48,9 +48,9 @@ But better check all commit messages since the last version tag: ```sh # Print all commits between a git tag and the current master branch -git log --oneline v2.10.5..master +git log --oneline v2.10.6..master # Count the number of commits since the last version -git log --oneline v2.10.5..master | wc -l +git log --oneline v2.10.6..master | wc -l ``` @@ -89,7 +89,7 @@ add a Git tag (see next section), it includes the latest documentation state. 1. Commit your changes (MediaElch version and changelogs). 2. Add a version tag and push your changes - - `git tag -a v2.10.5 -m "MediaElch Version 2.10.5"` + - `git tag -a v2.10.6 -m "MediaElch Version 2.10.6"` - `git push origin master` (or better: Create a pull request) - `git push --tags` - `git checkout release && git merge master && git push origin release` diff --git a/obs/MediaElch.spec b/obs/MediaElch.spec index 65c7975411..694596fea9 100644 --- a/obs/MediaElch.spec +++ b/obs/MediaElch.spec @@ -3,7 +3,7 @@ # Name: MediaElch -Version: 2.10.5 +Version: 2.10.6 Release: 1%{?dist} License: LGPL-3.0-only Summary: A Media Manager for Kodi diff --git a/obs/README.md b/obs/README.md index 5ee35a93ee..033387cd2f 100644 --- a/obs/README.md +++ b/obs/README.md @@ -72,7 +72,7 @@ osc commit ```sh rm MediaElch-*.tar.gz -export ME_VERSION=2.10.5 +export ME_VERSION=2.10.6 # Clone latest version. Shallow clone is enough. git clone --depth=1 --branch release --single-branch --recursive https://github.com/Komet/MediaElch.git # Exclude .git, documentation and build folder. diff --git a/scripts/release/bump_version.py b/scripts/release/bump_version.py index 3c29fcdb49..8f0149fe4d 100755 --- a/scripts/release/bump_version.py +++ b/scripts/release/bump_version.py @@ -202,7 +202,8 @@ def update_changelog(version): else: print(f" git commit -m 'release: Release MediaElch v{new_version_name.short}'") -print(""" git push -u origin prepare-release +print(""" git checkout -b prepare-release + git push -u origin prepare-release """) if not new_version_name.is_dev: