diff --git a/CMakeLists.txt b/CMakeLists.txt index e3b8defa..8204df9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,8 +12,8 @@ include(QtCommon) project(nheko LANGUAGES C CXX) set(CPACK_PACKAGE_VERSION_MAJOR "0") -set(CPACK_PACKAGE_VERSION_MINOR "4") -set(CPACK_PACKAGE_VERSION_PATCH "3") +set(CPACK_PACKAGE_VERSION_MINOR "5") +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}) @@ -24,7 +24,7 @@ fix_project_version() # Set additional project information set(COMPANY "Nheko") -set(COPYRIGHT "Copyright (c) 2017 Nheko Contributors") +set(COPYRIGHT "Copyright (c) 2018 Nheko Contributors") set(IDENTIFIER "com.github.mujx.nheko") add_project_meta(META_FILES_TO_INCLUDE) diff --git a/README.md b/README.md index 4f4439bb..59aafa96 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ nheko ---- [![Build Status](https://travis-ci.org/mujx/nheko.svg?branch=master)](https://travis-ci.org/mujx/nheko) [![Build status](https://ci.appveyor.com/api/projects/status/07qrqbfylsg4hw2h/branch/master?svg=true)](https://ci.appveyor.com/project/mujx/nheko/branch/master) -[![Latest Stable Version](https://img.shields.io/badge/download-stable-green.svg)](https://bintray.com/mujx/matrix/nheko/v0.4.3) +[![Latest Stable Version](https://img.shields.io/badge/download-stable-green.svg)](https://bintray.com/mujx/matrix/nheko/v0.5.0) [![Nightly](https://img.shields.io/badge/download-nightly-green.svg)](https://bintray.com/mujx/matrix/nheko/nightly) [![Chat on Matrix](https://img.shields.io/badge/chat-on%20matrix-blue.svg)](https://matrix.to/#/#nheko: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 07116c44..bcd14540 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ --- -version: 0.4.3-{build} +version: 0.5.0-{build} configuration: Release image: Visual Studio 2017 @@ -37,8 +37,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.4.3 - - if "%APPVEYOR_REPO_TAG%"=="false" set VERSION=0.4.3 + - if "%APPVEYOR_REPO_TAG%"=="false" set INSTVERSION=0.5.0 + - if "%APPVEYOR_REPO_TAG%"=="false" set VERSION=0.5.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 @@ -105,9 +105,9 @@ after_build: - copy %BUILD%\deploy\installer\cleanup\package.xml installer\packages\com.mujx.nheko.cleanup\meta - copy %BUILD%\deploy\installer\cleanup\installscript.qs installer\packages\com.mujx.nheko.cleanup\meta # Amend version and date - - sed -i "s/__VERSION__/0.4.3/" installer\config\config.xml - - sed -i "s/__VERSION__/0.4.3/" installer\packages\com.mujx.nheko\meta\package.xml - - sed -i "s/__VERSION__/0.4.3/" installer\packages\com.mujx.nheko.cleanup\meta\package.xml + - sed -i "s/__VERSION__/0.5.0/" installer\config\config.xml + - sed -i "s/__VERSION__/0.5.0/" installer\packages\com.mujx.nheko\meta\package.xml + - sed -i "s/__VERSION__/0.5.0/" installer\packages\com.mujx.nheko.cleanup\meta\package.xml - sed -i "s/__DATE__/%DATE%/" installer\packages\com.mujx.nheko\meta\package.xml - sed -i "s/__DATE__/%DATE%/" installer\packages\com.mujx.nheko.cleanup\meta\package.xml # Copy nheko data diff --git a/package.nix b/package.nix index 615dbbcf..fb8a5106 100644 --- a/package.nix +++ b/package.nix @@ -1,6 +1,6 @@ { stdenv, qtbase, qttranslations, qtmultimedia, lmdb, cmake }: stdenv.mkDerivation rec { - version = "0.4.3"; + version = "0.5.0"; name = "nheko-${version}"; src = builtins.filterSource (path: type: