Merged master

build.gradle

@@ -15,7 +15,7 @@ apply plugin: 'witness'
 apply plugin: 'com.github.johnrengelman.shadow'
 
 group = 'network.bisq'
-version = '0.7.1-SNAPSHOT'
+version = '0.8.0-SNAPSHOT'
 
 sourceCompatibility = 1.8
 

package/linux/32bitBuild.sh

@@ -6,7 +6,7 @@ mkdir -p deploy
 set -e
 
 # Edit version
-version=0.7.1
+version=0.8.0
 
 dir="/media/sf_vm_shared_ubuntu14_32bit"
 

package/linux/64bitBuild.sh

@@ -6,7 +6,7 @@ mkdir -p deploy
 set -e
 
 # Edit version
-version=0.7.1
+version=0.8.0
 
 dir="/media/sf_vm_shared_ubuntu"
 

package/linux/Dockerfile

@@ -8,7 +8,7 @@
 
 # pull base image
 FROM openjdk:8-jdk
-ENV version 0.7.1
+ENV version 0.8.0
 
 RUN apt-get update && apt-get install -y --no-install-recommends openjfx && rm -rf /var/lib/apt/lists/* &&
 apt-get install -y vim fakeroot

package/linux/rpm.sh

@@ -2,7 +2,7 @@
 
 ## From https://github.com/bisq-network/bisq-desktop/issues/401#issuecomment-372091261
 
-version=0.7.1
+version=0.8.0
 
 alien -r -g /home/$USER/Desktop/Bisq-64bit-$version.deb
 find bisq-$version -type f | while read LIB; do LDDOUT=$(ldd $LIB 2>&1); LDDRETVAL=$?;if [ \( -z "${LDDOUT%%*you do not have execution permission for*}" \) -a \( $LDDRETVAL -eq 0 \) ]; then chmod -v +x $LIB;fi;done

package/osx/Info.plist

@@ -40,7 +40,7 @@
         <key>JVMAppClasspath</key>
         <string></string>
         <key>JVMMainJarName</key>
-        <string>Bisq-0.7.1.jar</string>
+        <string>Bisq-0.8.0.jar</string>
         <key>JVMPreferencesID</key>
         <string>bisq</string>
         <key>JVMOptions</key>

package/osx/create_app.sh

@@ -6,7 +6,7 @@ mkdir -p deploy
 
 set -e
 
-version="0.7.1"
+version="0.8.0"
 
 ./gradlew --include-build ../common --include-build ../assets --include-build ../p2p --include-build ../core build -x test shadowJar
 
@@ -23,10 +23,10 @@ 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
 
 
-linux32=build/vm/vm_shared_ubuntu14_32bit
-linux64=build/vm/vm_shared_ubuntu
-win32=build/vm/vm_shared_windows_32bit
-win64=build/vm/vm_shared_windows
+linux32=/Volumes/vm_shared_ubuntu14_32bit
+linux64=/Volumes/vm_shared_ubuntu
+win32=/Volumes/vm_shared_windows_32bit
+win64=/Volumes/vm_shared_windows
 
 mkdir -p $linux32 $linux64 $win32 $win64
 

package/osx/finalize.sh

@@ -2,14 +2,14 @@
 
 cd ../../
 
-version="0.7.1"
+version="0.8.0"
 
 target_dir="releases/$version"
 
-linux32=build/vm/vm_shared_ubuntu14_32bit
-linux64=build/vm/vm_shared_ubuntu
-win32=build/vm/vm_shared_windows_32bit
-win64=build/vm/vm_shared_windows
+linux32=/Volumes/vm_shared_ubuntu14_32bit
+linux64=/Volumes/vm_shared_ubuntu
+win32=/Volumes/vm_shared_windows_32bit
+win64=/Volumes/vm_shared_windows
 
 #macOS=build/vm/vm_shared_macosx
 macOS=deploy
@@ -70,7 +70,7 @@ gpg --digest-algo SHA256 --verify $deb32{.asc*,}
 gpg --digest-algo SHA256 --verify $exe64{.asc*,}
 gpg --digest-algo SHA256 --verify $exe32{.asc*,}
 
-mkdir ../../build/vm/vm_shared_windows_32bit/$version
-cp -r . ../../build/vm/vm_shared_windows_32bit/$version
+#mkdir ../../build/vm/vm_shared_windows_32bit/$version
+cp -r . $win32/$version
 
 open "."

package/windows/32bitBuild.bat

@@ -5,7 +5,7 @@
 :: 32 bit build
 :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
 
-SET version=0.7.1
+SET version=0.8.0
 
 :: Private setup
 SET outdir=\\VBOXSVR\vm_shared_windows_32bit

package/windows/64bitBuild.bat

@@ -5,7 +5,7 @@
 :: 64 bit build
 :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
 
-SET version=0.7.1
+SET version=0.8.0
 
 :: Private setup
 SET outdir=\\VBOXSVR\vm_shared_windows

package/windows/Bisq.iss

@@ -3,7 +3,7 @@
 [Setup]
 AppId={{bisq}}
 AppName=Bisq
-AppVersion=0.7.1
+AppVersion=0.8.0
 AppVerName=Bisq
 AppPublisher=Bisq
 AppComments=Bisq