diff --git a/CMakeLists.txt b/CMakeLists.txt index 0512acc3..ad1565fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,7 +110,7 @@ include(GNUInstallDirs) set(CPACK_PACKAGE_VERSION_MAJOR "0") set(CPACK_PACKAGE_VERSION_MINOR "11") -set(CPACK_PACKAGE_VERSION_PATCH "1") +set(CPACK_PACKAGE_VERSION_PATCH "2") set(PROJECT_VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR}) set(PROJECT_VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR}) set(PROJECT_VERSION_PATCH ${CPACK_PACKAGE_VERSION_PATCH}) @@ -121,7 +121,7 @@ fix_project_version() # Set additional project information set(COMPANY "Nheko") -set(COPYRIGHT "Copyright (c) 2022 Nheko Contributors") +set(COPYRIGHT "Copyright (c) 2023 Nheko Contributors") set(IDENTIFIER "io.github.nheko-reborn.nheko") add_project_meta(META_FILES_TO_INCLUDE) @@ -597,7 +597,7 @@ if(USE_BUNDLED_MTXCLIENT) FetchContent_Declare( MatrixClient GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git - GIT_TAG a2ea44e15ea5bdd340e39d4ed32ff082ca972a6d + GIT_TAG 0.9.2 ) set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "") set(BUILD_LIB_TESTS OFF CACHE INTERNAL "") diff --git a/appveyor.yml b/appveyor.yml index 13b9abc9..ad849ca1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ --- -version: 0.11.1-{build} +version: 0.11.2-{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.11.1 - - if "%APPVEYOR_REPO_TAG%"=="false" set VERSION=0.11.1 + - if "%APPVEYOR_REPO_TAG%"=="false" set INSTVERSION=0.11.2 + - if "%APPVEYOR_REPO_TAG%"=="false" set VERSION=0.11.2 - 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.11.1/" installer\config\config.xml - - sed -i "s/__VERSION__/0.11.1/" installer\packages\io.github.nhekoreborn.nheko\meta\package.xml + - sed -i "s/__VERSION__/0.11.2/" installer\config\config.xml + - sed -i "s/__VERSION__/0.11.2/" 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 cbaf6e1c..5e437801 100644 --- a/io.github.NhekoReborn.Nheko.yaml +++ b/io.github.NhekoReborn.Nheko.yaml @@ -213,8 +213,8 @@ modules: buildsystem: cmake-ninja name: mtxclient sources: - - commit: f30d77a719f3deb66b17b99f3585ee919dbbe120 - tag: v0.9.0 + - commit: a9a6087ae820c8fb9332422b094cab8e2301db25 + tag: v0.9.2 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 a2f4c2c5..5e5d8a14 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 +