diff --git a/build.gradle b/build.gradle index a1a78b8966..77d32f3f0a 100644 --- a/build.gradle +++ b/build.gradle @@ -271,7 +271,7 @@ configure(project(':desktop')) { apply plugin: 'witness' apply from: '../gradle/witness/gradle-witness.gradle' - version = '0.9.5-SNAPSHOT' + version = '0.9.6' 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 2d88eab21d..6555e687d0 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 = "0.9.5"; + public static final String VERSION = "0.9.6"; public static int getMajorVersion(String version) { return getSubVersion(version, 0); diff --git a/desktop/package/linux/Dockerfile b/desktop/package/linux/Dockerfile index ae1b484a19..bc4d4b2059 100644 --- a/desktop/package/linux/Dockerfile +++ b/desktop/package/linux/Dockerfile @@ -8,7 +8,7 @@ # pull base image FROM openjdk:8-jdk -ENV version 0.9.5-SNAPSHOT +ENV version 0.9.6 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 ae83450a82..9773647c3b 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=0.9.5-SNAPSHOT +version=0.9.6 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 e4f1547d43..5e05eb5799 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=0.9.5-SNAPSHOT +version=0.9.6 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 52b244a056..5828716d7e 100644 --- a/desktop/package/macosx/Info.plist +++ b/desktop/package/macosx/Info.plist @@ -5,10 +5,10 @@ CFBundleVersion - 0.9.5 + 0.9.6 CFBundleShortVersionString - 0.9.5 + 0.9.6 CFBundleExecutable Bisq diff --git a/desktop/package/macosx/create_app.sh b/desktop/package/macosx/create_app.sh index 433e39dbcb..9a400935a2 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="0.9.5-SNAPSHOT" +version="0.9.6" cd .. ./gradlew :desktop:build -x test shadowJar @@ -38,8 +38,8 @@ java -jar ./package/tools-1.0.jar $EXE_JAR echo SHA 256 after stripping jar file to get a deterministic jar: shasum -a256 $EXE_JAR | awk '{print $1}' | tee deploy/Bisq-$version.jar.txt -#vmPath=/Users/christoph/Documents/Workspaces/Java -vmPath=/Volumes +vmPath=/Users/christoph/Documents/Workspaces/Java +#vmPath=/Volumes linux64=$vmPath/vm_shared_ubuntu/desktop linux64Package=$linux64/package/linux win64=$vmPath/vm_shared_windows/desktop diff --git a/desktop/package/macosx/finalize.sh b/desktop/package/macosx/finalize.sh index 2a1204283d..67da8493b8 100755 --- a/desktop/package/macosx/finalize.sh +++ b/desktop/package/macosx/finalize.sh @@ -2,12 +2,12 @@ cd ../../ -version="0.9.5-SNAPSHOT" +version="0.9.6" target_dir="releases/$version" -#vmPath=/Users/christoph/Documents/Workspaces/Java -vmPath=/Volumes +vmPath=/Users/christoph/Documents/Workspaces/Java +#vmPath=/Volumes linux64=$vmPath/vm_shared_ubuntu/desktop/package/linux win64=$vmPath/vm_shared_windows/desktop/package/windows diff --git a/desktop/package/macosx/insert_snapshot_version.sh b/desktop/package/macosx/insert_snapshot_version.sh index 3d2c22f65f..6f66f055b8 100755 --- a/desktop/package/macosx/insert_snapshot_version.sh +++ b/desktop/package/macosx/insert_snapshot_version.sh @@ -2,7 +2,7 @@ cd $(dirname $0)/../../../ -version=0.9.5 +version=0.9.6 find . -type f \( -name "finalize.sh" \ -o -name "create_app.sh" \ diff --git a/desktop/package/macosx/replace_version_number.sh b/desktop/package/macosx/replace_version_number.sh index 25807f7a0a..276a17445c 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=0.9.4 -newVersion=0.9.5 +oldVersion=0.9.5 +newVersion=0.9.6 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 e48db8a32f..82161f4b02 100644 --- a/desktop/package/windows/package.bat +++ b/desktop/package/windows/package.bat @@ -8,7 +8,7 @@ @echo off -set version=0.9.5-SNAPSHOT +set version=0.9.6 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 aaab643daf..9d1dfe1e06 100644 --- a/desktop/package/windows/release.bat +++ b/desktop/package/windows/release.bat @@ -6,7 +6,7 @@ @echo off -set version=0.9.5-SNAPSHOT +set version=0.9.6 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 5c11a25a75..85b7c695b8 100644 --- a/relay/src/main/resources/version.txt +++ b/relay/src/main/resources/version.txt @@ -1 +1 @@ -0.9.5-SNAPSHOT +0.9.6 diff --git a/seednode/src/main/java/bisq/seednode/SeedNodeMain.java b/seednode/src/main/java/bisq/seednode/SeedNodeMain.java index b2b982a312..0bc392ad4b 100644 --- a/seednode/src/main/java/bisq/seednode/SeedNodeMain.java +++ b/seednode/src/main/java/bisq/seednode/SeedNodeMain.java @@ -30,13 +30,11 @@ import bisq.common.setup.CommonSetup; import joptsimple.OptionSet; -import java.util.List; - import lombok.extern.slf4j.Slf4j; @Slf4j public class SeedNodeMain extends ExecutableForAppWithP2p { - private static final String VERSION = "0.9.5"; + private static final String VERSION = "0.9.6"; private SeedNode seedNode; public SeedNodeMain() {