summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2021-01-20 01:12:13 +0100
committerNicolas Werner <nicolas.werner@hotmail.de>2021-01-20 01:15:28 +0100
commita9faecea47a87a813450d110fcfd35fea8d91efa (patch)
tree4d5ad89c0cb4292e492a8734f7b95ab5563ec89e
parent6f17e2ff6e44ccb0783ca29c32e6b2c064a9c44c (diff)
Bump versionv0.8.0
-rw-r--r--CHANGELOG.md2
-rw-r--r--CMakeLists.txt8
-rw-r--r--README.md2
-rw-r--r--appveyor.yml12
-rw-r--r--io.github.NhekoReborn.Nheko.json5
-rw-r--r--resources/nheko.appdata.xml1
6 files changed, 16 insertions, 14 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45155539..8f84fece 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
# Changelog
-## [0.8.0] -- unreleased
+## [0.8.0] -- 2021-01-21
### Highlights
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 37c9b370..5fc2a2bf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,8 +79,8 @@ include(QtCommon)
project(nheko LANGUAGES CXX C)
set(CPACK_PACKAGE_VERSION_MAJOR "0")
-set(CPACK_PACKAGE_VERSION_MINOR "7")
-set(CPACK_PACKAGE_VERSION_PATCH "2")
+set(CPACK_PACKAGE_VERSION_MINOR "8")
+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})
@@ -354,13 +354,13 @@ if(USE_BUNDLED_MTXCLIENT)
FetchContent_Declare(
MatrixClient
GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
- GIT_TAG f83988606723da50b486022d859b6451228c814d
+ GIT_TAG v0.4.0
)
set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "")
set(BUILD_LIB_TESTS OFF CACHE INTERNAL "")
FetchContent_MakeAvailable(MatrixClient)
else()
- find_package(MatrixClient 0.3.1 REQUIRED)
+ find_package(MatrixClient 0.4.0 REQUIRED)
endif()
if(USE_BUNDLED_OLM)
include(FetchContent)
diff --git a/README.md b/README.md
index 5118512c..a1936ed4 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@ nheko
----
[![Build Status](https://nheko.im/nheko-reborn/nheko/badges/master/pipeline.svg)](https://nheko.im/nheko-reborn/nheko/-/pipelines/latest)
[![Build status](https://ci.appveyor.com/api/projects/status/07qrqbfylsg4hw2h/branch/master?svg=true)](https://ci.appveyor.com/project/redsky17/nheko/branch/master)
-[![Stable Version](https://img.shields.io/badge/download-stable-green.svg)](https://github.com/Nheko-Reborn/nheko/releases/v0.7.2)
+[![Stable Version](https://img.shields.io/badge/download-stable-green.svg)](https://github.com/Nheko-Reborn/nheko/releases/v0.8.0)
[![Nightly](https://img.shields.io/badge/download-nightly-green.svg)](https://matrix-static.neko.dev/room/!TshDrgpBNBDmfDeEGN:neko.dev/)
[![#nheko-reborn:matrix.org](https://img.shields.io/matrix/nheko-reborn:matrix.org.svg?label=%23nheko-reborn:matrix.org)](https://matrix.to/#/#nheko-reborn:matrix.org)
[![AUR: nheko](https://img.shields.io/badge/AUR-nheko-blue.svg)](https://aur.archlinux.org/packages/nheko)
diff --git a/appveyor.yml b/appveyor.yml
index 2bf96688..3b1b52fc 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,6 @@
---
-version: 0.7.2-{build}
+version: 0.8.0-{build}
configuration: Release
image: Visual Studio 2019
@@ -30,8 +30,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.7.2
- - if "%APPVEYOR_REPO_TAG%"=="false" set VERSION=0.7.2
+ - if "%APPVEYOR_REPO_TAG%"=="false" set INSTVERSION=0.8.0
+ - if "%APPVEYOR_REPO_TAG%"=="false" set VERSION=0.8.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
@@ -91,9 +91,9 @@ after_build:
- copy %BUILD%\deploy\installer\cleanup\package.xml installer\packages\io.github.nhekoreborn.nheko.cleanup\meta
- copy %BUILD%\deploy\installer\cleanup\installscript.qs installer\packages\io.github.nhekoreborn.nheko.cleanup\meta
# Amend version and date
- - sed -i "s/__VERSION__/0.7.2/" installer\config\config.xml
- - sed -i "s/__VERSION__/0.7.2/" installer\packages\io.github.nhekoreborn.nheko\meta\package.xml
- - sed -i "s/__VERSION__/0.7.2/" installer\packages\io.github.nhekoreborn.nheko.cleanup\meta\package.xml
+ - sed -i "s/__VERSION__/0.8.0/" installer\config\config.xml
+ - sed -i "s/__VERSION__/0.8.0/" installer\packages\io.github.nhekoreborn.nheko\meta\package.xml
+ - sed -i "s/__VERSION__/0.8.0/" installer\packages\io.github.nhekoreborn.nheko.cleanup\meta\package.xml
- sed -i "s/__DATE__/%DATE%/" installer\packages\io.github.nhekoreborn.nheko\meta\package.xml
- sed -i "s/__DATE__/%DATE%/" installer\packages\io.github.nhekoreborn.nheko.cleanup\meta\package.xml
# Copy nheko data
diff --git a/io.github.NhekoReborn.Nheko.json b/io.github.NhekoReborn.Nheko.json
index 82a8a3d0..37958470 100644
--- a/io.github.NhekoReborn.Nheko.json
+++ b/io.github.NhekoReborn.Nheko.json
@@ -220,7 +220,8 @@
"name": "mtxclient",
"sources": [
{
- "commit": "f83988606723da50b486022d859b6451228c814d",
+ "commit": "2d6e3f79917ce2065a54ca32e6a9f9d42c0b6347",
+ "tag": "v0.4.0",
"type": "git",
"url": "https://github.com/Nheko-Reborn/mtxclient.git"
}
@@ -254,7 +255,7 @@
{
"path": ".",
"type": "dir",
- "skip": ["build-flatpak"]
+ "skip": ["build-flatpak"]
},
{
"dest": ".deps/lmdbxx",
diff --git a/resources/nheko.appdata.xml b/resources/nheko.appdata.xml
index cb2323ab..1352bb76 100644
--- a/resources/nheko.appdata.xml
+++ b/resources/nheko.appdata.xml
@@ -43,6 +43,7 @@
<url type="homepage">https://github.com/Nheko-Reborn/nheko</url>
<update_contact>https://github.com/Nheko-Reborn</update_contact>
<releases>
+ <release date="2021-01-21" version="0.8.0"/>
<release date="2020-06-12" version="0.7.2"/>
<release date="2020-04-24" version="0.7.1"/>
<release date="2020-04-19" version="0.7.0"/>