Bump versionv0.3.0

5 files changed, 11 insertions, 66 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f2badd8..69daf7e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,8 +11,8 @@ include(QtCommon)
 
 project(nheko LANGUAGES C CXX)
 set(CPACK_PACKAGE_VERSION_MAJOR "0")
-set(CPACK_PACKAGE_VERSION_MINOR "2")
-set(CPACK_PACKAGE_VERSION_PATCH "1")
+set(CPACK_PACKAGE_VERSION_MINOR "3")
+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})
diff --git a/appveyor.yml b/appveyor.yml
index e25329f5..850137db 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,6 @@
 ---
 
-version: 0.2.0-{build}
+version: 0.3.0-{build}
 
 environment:
     global:
@@ -22,8 +22,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.2.0
-    - if "%APPVEYOR_REPO_TAG%"=="false" set VERSION=0.2.0
+    - if "%APPVEYOR_REPO_TAG%"=="false" set INSTVERSION=0.3.0
+    - if "%APPVEYOR_REPO_TAG%"=="false" set VERSION=0.3.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
@@ -78,9 +78,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.2.0/" installer\config\config.xml
-    - sed -i "s/__VERSION__/0.2.0/" installer\packages\com.mujx.nheko\meta\package.xml
-    - sed -i "s/__VERSION__/0.2.0/" installer\packages\com.mujx.nheko.cleanup\meta\package.xml
+    - sed -i "s/__VERSION__/0.3.0/" installer\config\config.xml
+    - sed -i "s/__VERSION__/0.3.0/" installer\packages\com.mujx.nheko\meta\package.xml
+    - sed -i "s/__VERSION__/0.3.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/dist/AUR/PKGBUILD b/dist/AUR/PKGBUILD
deleted file mode 100644
index 3ec5708d..00000000
--- a/dist/AUR/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# Maintainer: Konstantinos Sideris <siderisk at auth dot gr>
-
-pkgname=nheko-git
-pkgver=0.1.0.r174.c428ef4b
-pkgrel=1
-pkgdesc="Desktop client for the Matrix protocol"
-arch=("i686" "x86_64")
-
-url="https://github.com/mujx/nheko"
-license=("GPL3")
-
-depends=("qt5-base" "lmdb")
-makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools")
-
-source=($pkgname::git://github.com/mujx/nheko.git git://github.com/bendiken/lmdbxx.git)
-md5sums=("SKIP" "SKIP")
-
-prepare() {
-  cd "$pkgname"
-  git submodule init
-  git config submodule.lmdbxx.url $srcdir/libs/lmdbxx
-  git submodule update
-}
-
-pkgver() {
-    cd "$pkgname"
-    printf "0.1.0.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-build() {
-    cd "$pkgname"
-    cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release
-    make -C build -j2
-}
-
-package() {
-    # Creating needed directories
-    install -dm755 "$pkgdir/usr/bin"
-    install -dm755 "$pkgdir/usr/share/pixmaps/"
-    install -dm755 "$pkgdir/usr/share/applications/"
-
-    # Program
-    install -Dm755 "$pkgname/build/nheko" "$pkgdir/usr/bin/nheko"
-
-    # Desktop launcher
-    install -Dm644 "$srcdir/$pkgname/resources/nheko-256.png" "$pkgdir/usr/share/pixmaps/nheko.png"
-    install -Dm644 "$srcdir/$pkgname/resources/nheko.desktop" "$pkgdir/usr/share/applications/nheko.desktop"
-
-    # Icons
-    local icon_size icon_dir
-    for icon_size in 16 32 48 64 128 256 512; do
-        icon_dir="$pkgdir/usr/share/icons/hicolor/${icon_size}x${icon_size}/apps"
-        install -d "$icon_dir"
-        install -m644 "$srcdir/$pkgname/resources/nheko-${icon_size}.png" "$icon_dir/nheko.png"
-    done
-}
diff --git a/package.nix b/package.nix
index dfc014e2..dce4e4b3 100644
--- a/package.nix
+++ b/package.nix
@@ -1,6 +1,6 @@
 { stdenv, qtbase, qttranslations, qtmultimedia, lmdb, cmake }:
 stdenv.mkDerivation rec {
-  version = "0.2.0";
+  version = "0.3.0";
   name = "nheko-${version}";
   src = builtins.filterSource
     (path: type:
diff --git a/src/main.cc b/src/main.cc
index 1b78e538..82073454 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -33,6 +33,7 @@
 #include "MainWindow.h"
 #include "RaisedButton.h"
 #include "RunGuard.h"
+#include "version.hpp"
 
 QPoint
 screenCenter(int width, int height)
@@ -119,7 +120,7 @@ main(int argc, char *argv[])
         }
 
         QCoreApplication::setApplicationName("nheko");
-        QCoreApplication::setApplicationVersion("0.2.0");
+        QCoreApplication::setApplicationVersion(nheko::version);
         QCoreApplication::setOrganizationName("nheko");
         QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);