From 3507698ea565d0fedc4cad98c7598a4c61a45241 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Thu, 12 Jan 2023 22:03:54 +0100 Subject: [PATCH] v0.11.0 --- CHANGELOG.md | 2 +- CMakeLists.txt | 12 ++++++------ appveyor.yml | 10 +++++----- io.github.NhekoReborn.Nheko.yaml | 8 ++++---- resources/nheko.appdata.xml.in | 1 + 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f7e568c..c585cd2c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## [0.11.0] -- UNRELEASED +## [0.11.0] -- 2023-01-12 ### Highlights diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a359dbc..ae5320e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -107,8 +107,8 @@ project(nheko LANGUAGES CXX C) include(GNUInstallDirs) set(CPACK_PACKAGE_VERSION_MAJOR "0") -set(CPACK_PACKAGE_VERSION_MINOR "10") -set(CPACK_PACKAGE_VERSION_PATCH "2") +set(CPACK_PACKAGE_VERSION_MINOR "11") +set(CPACK_PACKAGE_VERSION_PATCH "0") set(PROJECT_VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR}) set(PROJECT_VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR}) set(PROJECT_VERSION_PATCH ${CPACK_PACKAGE_VERSION_PATCH}) @@ -186,13 +186,13 @@ if(USE_BUNDLED_COEURL) FetchContent_Declare( coeurl GIT_REPOSITORY https://nheko.im/Nheko-Reborn/coeurl.git - GIT_TAG f989f3c54c1ca15e29c5bd6b1ce4efbcb3fd8078 + GIT_TAG v0.3.0 ) FetchContent_MakeAvailable(coeurl) set(COEURL_TARGET_NAME coeurl::coeurl) else() find_package(PkgConfig) - pkg_check_modules(coeurl IMPORTED_TARGET coeurl>=0.1.1) + pkg_check_modules(coeurl IMPORTED_TARGET coeurl>=0.3.0) if (TARGET PkgConfig::coeurl) set(COEURL_TARGET_NAME PkgConfig::coeurl) endif() @@ -595,13 +595,13 @@ if(USE_BUNDLED_MTXCLIENT) FetchContent_Declare( MatrixClient GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git - GIT_TAG 79dcdbb8daad2efb06147e136702a12cd8877aba + GIT_TAG v0.9.0 ) set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "") set(BUILD_LIB_TESTS OFF CACHE INTERNAL "") FetchContent_MakeAvailable(MatrixClient) else() - find_package(MatrixClient 0.8.1 REQUIRED) + find_package(MatrixClient 0.9.0 REQUIRED) endif() if (VOIP) diff --git a/appveyor.yml b/appveyor.yml index e2511c22..3b95c0d2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ --- -version: 0.10.2-{build} +version: 0.11.0-{build} configuration: Release image: Visual Studio 2022 @@ -29,8 +29,8 @@ build_script: # VERSION format: branch-master/branch-1.2 # INSTVERSION format: x.y.z # WINVERSION format: 9999.0.0.123/1.2.0.234 - - if "%APPVEYOR_REPO_TAG%"=="false" set INSTVERSION=0.10.2 - - if "%APPVEYOR_REPO_TAG%"=="false" set VERSION=0.10.2 + - if "%APPVEYOR_REPO_TAG%"=="false" set INSTVERSION=0.11.0 + - if "%APPVEYOR_REPO_TAG%"=="false" set VERSION=0.11.0 - if "%APPVEYOR_REPO_TAG%"=="false" if "%APPVEYOR_REPO_BRANCH%"=="master" set INSTVERSION=9999.0 - if "%APPVEYOR_REPO_TAG%"=="false" set WINVERSION=%INSTVERSION%.0.%APPVEYOR_BUILD_NUMBER% # VERSION format: v1.2.3/v1.3.4 @@ -93,8 +93,8 @@ after_build: - copy %BUILD%\deploy\installer\gui\package.xml installer\packages\io.github.nhekoreborn.nheko\meta - copy %BUILD%\deploy\installer\gui\installscript.qs installer\packages\io.github.nhekoreborn.nheko\meta # Amend version and date - - sed -i "s/__VERSION__/0.10.2/" installer\config\config.xml - - sed -i "s/__VERSION__/0.10.2/" installer\packages\io.github.nhekoreborn.nheko\meta\package.xml + - sed -i "s/__VERSION__/0.11.0/" installer\config\config.xml + - sed -i "s/__VERSION__/0.11.0/" installer\packages\io.github.nhekoreborn.nheko\meta\package.xml - sed -i "s/__DATE__/%DATE%/" installer\packages\io.github.nhekoreborn.nheko\meta\package.xml # Copy nheko data - xcopy NhekoData\*.* installer\packages\io.github.nhekoreborn.nheko\data\*.* /s /e /c /y diff --git a/io.github.NhekoReborn.Nheko.yaml b/io.github.NhekoReborn.Nheko.yaml index 9788055d..45dc385b 100644 --- a/io.github.NhekoReborn.Nheko.yaml +++ b/io.github.NhekoReborn.Nheko.yaml @@ -170,8 +170,8 @@ modules: - -Ddefault_library=static name: coeurl sources: - - commit: f989f3c54c1ca15e29c5bd6b1ce4efbcb3fd8078 - #tag: v0.2.1 + - commit: 2a20a129240a1a017b37b6874faab499ca4e523b + tag: v0.3.0 type: git url: https://nheko.im/nheko-reborn/coeurl.git - config-opts: @@ -182,8 +182,8 @@ modules: buildsystem: cmake-ninja name: mtxclient sources: - - commit: 79dcdbb8daad2efb06147e136702a12cd8877aba - #tag: v0.8.2 + - commit: f30d77a719f3deb66b17b99f3585ee919dbbe120 + tag: v0.9.0 type: git url: https://github.com/Nheko-Reborn/mtxclient.git - config-opts: diff --git a/resources/nheko.appdata.xml.in b/resources/nheko.appdata.xml.in index 58372b72..2e384ff4 100644 --- a/resources/nheko.appdata.xml.in +++ b/resources/nheko.appdata.xml.in @@ -61,6 +61,7 @@ https://github.com/Nheko-Reborn/nheko https://github.com/Nheko-Reborn +