diff --git a/CHANGELOG.md b/CHANGELOG.md index b99617d23..713be83f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## [0.9.2] -- unreleased +## [0.9.2] -- 0.9.2 ### Highlights diff --git a/CMakeLists.txt b/CMakeLists.txt index 81d13be53..027bc44ea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,7 +106,7 @@ include(GNUInstallDirs) set(CPACK_PACKAGE_VERSION_MAJOR "0") set(CPACK_PACKAGE_VERSION_MINOR "9") -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}) @@ -117,7 +117,7 @@ fix_project_version() # Set additional project information set(COMPANY "Nheko") -set(COPYRIGHT "Copyright (c) 2021 Nheko Contributors") +set(COPYRIGHT "Copyright (c) 2022 Nheko Contributors") set(IDENTIFIER "io.github.nheko-reborn.nheko") add_project_meta(META_FILES_TO_INCLUDE) @@ -405,7 +405,7 @@ if(USE_BUNDLED_MTXCLIENT) FetchContent_Declare( MatrixClient GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git - GIT_TAG a3fec0ae53762a8a482cde50c9709671bcf0548d + GIT_TAG v0.7.0 ) set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "") set(BUILD_LIB_TESTS OFF CACHE INTERNAL "") diff --git a/appveyor.yml b/appveyor.yml index b64cb206b..0ceaab79b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -31,8 +31,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.9.1 - - if "%APPVEYOR_REPO_TAG%"=="false" set VERSION=0.9.1 + - if "%APPVEYOR_REPO_TAG%"=="false" set INSTVERSION=0.9.2 + - if "%APPVEYOR_REPO_TAG%"=="false" set VERSION=0.9.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 @@ -94,8 +94,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.9.1/" installer\config\config.xml - - sed -i "s/__VERSION__/0.9.1/" installer\packages\io.github.nhekoreborn.nheko\meta\package.xml + - sed -i "s/__VERSION__/0.9.2/" installer\config\config.xml + - sed -i "s/__VERSION__/0.9.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 847439875..6875afcc8 100644 --- a/io.github.NhekoReborn.Nheko.yaml +++ b/io.github.NhekoReborn.Nheko.yaml @@ -189,8 +189,8 @@ modules: buildsystem: cmake-ninja name: mtxclient sources: - - commit: a3fec0ae53762a8a482cde50c9709671bcf0548d - #tag: v0.6.2 + - commit: 9eb9c152faf3461237d4b97ffe12503e367c8809 + tag: v0.7.0 type: git url: https://github.com/Nheko-Reborn/mtxclient.git - config-opts: diff --git a/resources/nheko.appdata.xml b/resources/nheko.appdata.xml index c57fd1188..597d7b9c5 100644 --- a/resources/nheko.appdata.xml +++ b/resources/nheko.appdata.xml @@ -1,5 +1,5 @@ - + nheko.desktop CC0-1.0 @@ -56,6 +56,7 @@ https://github.com/Nheko-Reborn/nheko https://github.com/Nheko-Reborn +