From 30f2e7c9820459ecfb4066f401653ad102c751fc Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Wed, 30 Oct 2019 12:10:37 +0100 Subject: [PATCH] Bump version number --- build.gradle | 2 +- common/src/main/java/bisq/common/app/Version.java | 6 +++--- desktop/package/linux/Dockerfile | 2 +- desktop/package/linux/package.sh | 2 +- desktop/package/linux/release.sh | 2 +- desktop/package/macosx/Info.plist | 4 ++-- desktop/package/macosx/create_app.sh | 2 +- desktop/package/macosx/finalize.sh | 2 +- desktop/package/macosx/replace_version_number.sh | 4 ++-- desktop/package/windows/package.bat | 2 +- desktop/package/windows/release.bat | 2 +- relay/src/main/resources/version.txt | 2 +- seednode/src/main/java/bisq/seednode/SeedNodeMain.java | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index 904e931cadf..44fe5a5369d 100644 --- a/build.gradle +++ b/build.gradle @@ -274,7 +274,7 @@ configure(project(':desktop')) { apply plugin: 'witness' apply from: '../gradle/witness/gradle-witness.gradle' - version = '1.2.0-SNAPSHOT' + version = '1.2.1' mainClassName = 'bisq.desktop.app.BisqAppMain' diff --git a/common/src/main/java/bisq/common/app/Version.java b/common/src/main/java/bisq/common/app/Version.java index de9004f7010..2ef33d2e0b1 100644 --- a/common/src/main/java/bisq/common/app/Version.java +++ b/common/src/main/java/bisq/common/app/Version.java @@ -27,7 +27,7 @@ public class Version { // VERSION = 0.5.0 introduces proto buffer for the P2P network and local DB and is a not backward compatible update // Therefore all sub versions start again with 1 // We use semantic versioning with major, minor and patch - public static final String VERSION = "1.2.0"; + public static final String VERSION = "1.2.1"; public static int getMajorVersion(String version) { return getSubVersion(version, 0); @@ -73,7 +73,7 @@ private static int getSubVersion(String version, int index) { // The version no. for the objects sent over the network. A change will break the serialization of old objects. // If objects are used for both network and database the network version is applied. // VERSION = 0.5.0 -> P2P_NETWORK_VERSION = 1 - // With version 1.2.0 we change to version 2 (new trade protocol) + // With version 1.2.1 we change to version 2 (new trade protocol) public static final int P2P_NETWORK_VERSION = 1; // The version no. of the serialized data stored to disc. A change will break the serialization of old objects. @@ -84,7 +84,7 @@ private static int getSubVersion(String version, int index) { // A taker will check the version of the offers to see if his version is compatible. // Offers created with the old version will become invalid and have to be canceled. // VERSION = 0.5.0 -> TRADE_PROTOCOL_VERSION = 1 - // Version 1.2.0 -> TRADE_PROTOCOL_VERSION = 2 + // Version 1.2.1 -> TRADE_PROTOCOL_VERSION = 2 public static final int TRADE_PROTOCOL_VERSION = 2; private static int p2pMessageVersion; diff --git a/desktop/package/linux/Dockerfile b/desktop/package/linux/Dockerfile index c593328bbb5..0b50efb576a 100644 --- a/desktop/package/linux/Dockerfile +++ b/desktop/package/linux/Dockerfile @@ -8,7 +8,7 @@ # pull base image FROM openjdk:8-jdk -ENV version 1.2.0-SNAPSHOT +ENV version 1.2.1 RUN apt-get update && apt-get install -y --no-install-recommends openjfx && rm -rf /var/lib/apt/lists/* && apt-get install -y vim fakeroot diff --git a/desktop/package/linux/package.sh b/desktop/package/linux/package.sh index 3142a10d95f..f5d2b315d48 100755 --- a/desktop/package/linux/package.sh +++ b/desktop/package/linux/package.sh @@ -6,7 +6,7 @@ # - Update version below # - Ensure JAVA_HOME below is pointing to OracleJDK 10 directory -version=1.2.0-SNAPSHOT +version=1.2.1 if [ ! -f "$JAVA_HOME/bin/javapackager" ]; then if [ -d "/usr/lib/jvm/jdk-10.0.2" ]; then JAVA_HOME=/usr/lib/jvm/jdk-10.0.2 diff --git a/desktop/package/linux/release.sh b/desktop/package/linux/release.sh index 8a4ff3c1f33..5dae342ad9f 100755 --- a/desktop/package/linux/release.sh +++ b/desktop/package/linux/release.sh @@ -4,7 +4,7 @@ # Prior to running this script: # - Update version below -version=1.2.0-SNAPSHOT +version=1.2.1 base_dir=$( cd "$(dirname "$0")" ; pwd -P )/../../.. package_dir=$base_dir/desktop/package release_dir=$base_dir/desktop/release/$version diff --git a/desktop/package/macosx/Info.plist b/desktop/package/macosx/Info.plist index 37307dd555b..6dc1844e34a 100644 --- a/desktop/package/macosx/Info.plist +++ b/desktop/package/macosx/Info.plist @@ -5,10 +5,10 @@ CFBundleVersion - 1.2.0 + 1.2.1 CFBundleShortVersionString - 1.2.0 + 1.2.1 CFBundleExecutable Bisq diff --git a/desktop/package/macosx/create_app.sh b/desktop/package/macosx/create_app.sh index d2146be8c2f..bdfe7e649e8 100755 --- a/desktop/package/macosx/create_app.sh +++ b/desktop/package/macosx/create_app.sh @@ -6,7 +6,7 @@ mkdir -p deploy set -e -version="1.2.0-SNAPSHOT" +version="1.2.1" cd .. ./gradlew :desktop:build -x test shadowJar diff --git a/desktop/package/macosx/finalize.sh b/desktop/package/macosx/finalize.sh index 7ab852ea21c..5ed46dca07b 100755 --- a/desktop/package/macosx/finalize.sh +++ b/desktop/package/macosx/finalize.sh @@ -2,7 +2,7 @@ cd ../../ -version="1.2.0-SNAPSHOT" +version="1.2.1" target_dir="releases/$version" diff --git a/desktop/package/macosx/replace_version_number.sh b/desktop/package/macosx/replace_version_number.sh index 4a3add6a098..3deaf1bced7 100755 --- a/desktop/package/macosx/replace_version_number.sh +++ b/desktop/package/macosx/replace_version_number.sh @@ -2,8 +2,8 @@ cd $(dirname $0)/../../../ -oldVersion=1.1.7 -newVersion=1.2.0 +oldVersion=1.2.0 +newVersion=1.2.1 find . -type f \( -name "finalize.sh" \ -o -name "create_app.sh" \ diff --git a/desktop/package/windows/package.bat b/desktop/package/windows/package.bat index be6175b4b54..4f2d20b9d8d 100644 --- a/desktop/package/windows/package.bat +++ b/desktop/package/windows/package.bat @@ -8,7 +8,7 @@ @echo off -set version=1.2.0-SNAPSHOT +set version=1.2.1 if not exist "%JAVA_HOME%\bin\javapackager.exe" ( if not exist "%ProgramFiles%\Java\jdk-10.0.2" ( echo Javapackager not found. Update JAVA_HOME variable to point to OracleJDK. diff --git a/desktop/package/windows/release.bat b/desktop/package/windows/release.bat index 00f595ef0f7..75a8cac341f 100644 --- a/desktop/package/windows/release.bat +++ b/desktop/package/windows/release.bat @@ -6,7 +6,7 @@ @echo off -set version=1.2.0-SNAPSHOT +set version=1.2.1 set release_dir=%~dp0..\..\..\releases\%version% set package_dir=%~dp0.. diff --git a/relay/src/main/resources/version.txt b/relay/src/main/resources/version.txt index 468e6c357b7..6085e946503 100644 --- a/relay/src/main/resources/version.txt +++ b/relay/src/main/resources/version.txt @@ -1 +1 @@ -1.2.0-SNAPSHOT +1.2.1 diff --git a/seednode/src/main/java/bisq/seednode/SeedNodeMain.java b/seednode/src/main/java/bisq/seednode/SeedNodeMain.java index 03d8763d023..92fd5cc20d3 100644 --- a/seednode/src/main/java/bisq/seednode/SeedNodeMain.java +++ b/seednode/src/main/java/bisq/seednode/SeedNodeMain.java @@ -34,7 +34,7 @@ @Slf4j public class SeedNodeMain extends ExecutableForAppWithP2p { - private static final String VERSION = "1.2.0"; + private static final String VERSION = "1.2.1"; private SeedNode seedNode; public SeedNodeMain() {