From c1a46033c86b768c9d6307330a5aa99c2eaede5b Mon Sep 17 00:00:00 2001 From: Le Tan Date: Sun, 29 Apr 2018 08:52:49 +0800 Subject: [PATCH] release v1.15 --- .linux_bintray.json | 6 +++--- .macos_bintray.json | 6 +++--- .travis.yml | 2 +- appveyor.yml | 6 +++--- src/vconfigmanager.cpp | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.linux_bintray.json b/.linux_bintray.json index 71c611de..2583873e 100644 --- a/.linux_bintray.json +++ b/.linux_bintray.json @@ -16,10 +16,10 @@ }, "version": { - "name": "1.14", + "name": "1.15", "desc": "VNote Releases", - "released": "2018-04-03", - "vcs_tag": "1.14", + "released": "2018-04-29", + "vcs_tag": "1.15", "gpgSign": false }, diff --git a/.macos_bintray.json b/.macos_bintray.json index d720f514..93ae96c5 100644 --- a/.macos_bintray.json +++ b/.macos_bintray.json @@ -16,10 +16,10 @@ }, "version": { - "name": "1.14", + "name": "1.15", "desc": "VNote Releases", - "released": "2018-04-03", - "vcs_tag": "1.14", + "released": "2018-04-29", + "vcs_tag": "1.15", "gpgSign": false }, diff --git a/.travis.yml b/.travis.yml index ddb06711..f7a352af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ branches: before_install: - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then sudo apt-get -qq update ; fi -- export version="1.14" +- export version="1.15" install: - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install p7zip-full ; fi diff --git a/appveyor.yml b/appveyor.yml index 9b02d4a8..50b4e306 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ image: Visual Studio 2015 -version: 1.14.{build} +version: 1.15.{build} branches: only: @@ -39,7 +39,7 @@ build_script: # scripts that run after build after_build: - - set vnote_version=1.14 + - set vnote_version=1.15 # Clone OpenSSL DLLs - git clone https://github.com/tamlok/openssl-utils.git openssl-utils.git - mkdir distrib\VNote @@ -72,7 +72,7 @@ deploy: subject: tamlok repo: vnote package: vnote - version: 1.14 + version: 1.15 publish: true override: true artifact: portable diff --git a/src/vconfigmanager.cpp b/src/vconfigmanager.cpp index 511fff4c..8b6fa032 100644 --- a/src/vconfigmanager.cpp +++ b/src/vconfigmanager.cpp @@ -17,7 +17,7 @@ const QString VConfigManager::orgName = QString("vnote"); const QString VConfigManager::appName = QString("vnote"); -const QString VConfigManager::c_version = QString("1.14"); +const QString VConfigManager::c_version = QString("1.15"); const QString VConfigManager::c_obsoleteDirConfigFile = QString(".vnote.json");