mirror of
https://github.com/bisq-network/bisq.git
synced 2025-02-22 14:42:37 +01:00
Prepare release 0.6.2
This commit is contained in:
Manfred Karrer
parent
966903427f
commit
5ce2a67d0c
18 changed files with 55 additions and 31 deletions
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<artifactId>parent</artifactId>
|
||||
<groupId>io.bisq</groupId>
|
||||
<version>0.6.1</version>
|
||||
<version>0.6.2</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,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.6.1";
|
||||
public static final String VERSION = "0.6.2";
|
||||
|
||||
public static int getMajorVersion(String version) {
|
||||
return getSubVersion(version, 0);
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<artifactId>parent</artifactId>
|
||||
<groupId>io.bisq</groupId>
|
||||
<version>0.6.1</version>
|
||||
<version>0.6.2</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<parent>
|
||||
<artifactId>parent</artifactId>
|
||||
<groupId>io.bisq</groupId>
|
||||
<version>0.6.1</version>
|
||||
<version>0.6.2</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>core</artifactId>
|
||||
|
|
|
|||
|
|
@ -202,8 +202,7 @@ public class AltCoinAddressValidatorTest {
|
|||
assertFalse(validator.validate("NXT-2222-2222-2222-22222").isValid);
|
||||
}
|
||||
|
||||
// Added at 0.6.1
|
||||
|
||||
// Added at 0.6.0
|
||||
@Test
|
||||
public void testDCT() {
|
||||
AltCoinAddressValidator validator = new AltCoinAddressValidator();
|
||||
|
|
@ -413,6 +412,7 @@ public class AltCoinAddressValidatorTest {
|
|||
assertFalse(validator.validate("").isValid);
|
||||
}
|
||||
|
||||
// Added 0.6.2
|
||||
@Test
|
||||
public void testCAGE() {
|
||||
AltCoinAddressValidator validator = new AltCoinAddressValidator();
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
<parent>
|
||||
<artifactId>parent</artifactId>
|
||||
<groupId>io.bisq</groupId>
|
||||
<version>0.6.1</version>
|
||||
<version>0.6.2</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
@ -88,11 +88,6 @@
|
|||
<artifactId>maven-shade-plugin</artifactId>
|
||||
<version>2.3</version>
|
||||
<configuration>
|
||||
<artifactSet>
|
||||
<excludes>
|
||||
<exclude>org.bouncycastle:*:*:*</exclude>
|
||||
</excludes>
|
||||
</artifactSet>
|
||||
<!-- broken with Java 8 (MSHADE-174), using ProGuard instead. -->
|
||||
<minimizeJar>false</minimizeJar>
|
||||
<transformers>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<artifactId>parent</artifactId>
|
||||
<groupId>io.bisq</groupId>
|
||||
<version>0.6.1</version>
|
||||
<version>0.6.2</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -6,9 +6,9 @@ mkdir -p gui/deploy
|
|||
set -e
|
||||
|
||||
# Edit version
|
||||
version=0.6.1
|
||||
version=0.6.2
|
||||
|
||||
jarFile="/media/sf_vm_shared_ubuntu14_32bit/Bisq-$version.jar"
|
||||
dir="/media/sf_vm_shared_ubuntu14_32bit"
|
||||
|
||||
# Note: fakeroot needs to be installed on linux
|
||||
$JAVA_HOME/bin/javapackager \
|
||||
|
|
@ -25,7 +25,9 @@ $JAVA_HOME/bin/javapackager \
|
|||
-title Bisq \
|
||||
-vendor Bisq \
|
||||
-outdir gui/deploy \
|
||||
-srcfiles $jarFile \
|
||||
-srcfiles "$dir/Bisq-$version.jar" \
|
||||
-srcfiles "$dir/bcpg-jdk15on.jar" \
|
||||
-srcfiles "$dir/bcprov-jdk15on.jar" \
|
||||
-srcfiles package/linux/LICENSE \
|
||||
-appclass io.bisq.gui.app.BisqAppMain \
|
||||
-BjvmOptions=-Xss1280k \
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@ mkdir -p gui/deploy
|
|||
set -e
|
||||
|
||||
# Edit version
|
||||
version=0.6.1
|
||||
version=0.6.2
|
||||
|
||||
jarFile="/media/sf_vm_shared_ubuntu/Bisq-$version.jar"
|
||||
dir="/media/sf_vm_shared_ubuntu"
|
||||
|
||||
# Note: fakeroot needs to be installed on linux
|
||||
$JAVA_HOME/bin/javapackager \
|
||||
|
|
@ -25,7 +25,9 @@ $JAVA_HOME/bin/javapackager \
|
|||
-title Bisq \
|
||||
-vendor Bisq \
|
||||
-outdir gui/deploy \
|
||||
-srcfiles $jarFile \
|
||||
-srcfiles "$dir/Bisq-$version.jar" \
|
||||
-srcfiles "$dir/bcpg-jdk15on.jar" \
|
||||
-srcfiles "$dir/bcprov-jdk15on.jar" \
|
||||
-srcfiles package/linux/LICENSE \
|
||||
-appclass io.bisq.gui.app.BisqAppMain \
|
||||
-BjvmOptions=-Xss1280k \
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
# pull base image
|
||||
FROM openjdk:8-jdk
|
||||
ENV version 0.6.1
|
||||
ENV version 0.6.2
|
||||
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends openjfx && rm -rf /var/lib/apt/lists/* &&
|
||||
apt-get install -y vim fakeroot
|
||||
|
|
|
|||
|
|
@ -9,12 +9,33 @@ version="0.6.2"
|
|||
|
||||
mvn clean package verify -DskipTests -Dmaven.javadoc.skip=true
|
||||
|
||||
# At windows we don't add the version nr as it would keep multiple versions of jar files in app dir
|
||||
linux32=/Users/dev/vm_shared_ubuntu14_32bit
|
||||
linux64=/Users/dev/vm_shared_ubuntu
|
||||
win32=/Users/dev/vm_shared_windows_32bit
|
||||
win64=/Users/dev/vm_shared_windows
|
||||
|
||||
cp gui/target/shaded.jar "gui/deploy/Bisq-$version.jar"
|
||||
cp gui/target/shaded.jar "/Users/dev/vm_shared_ubuntu/Bisq-$version.jar"
|
||||
cp gui/target/shaded.jar "/Users/dev/vm_shared_windows/Bisq.jar"
|
||||
cp gui/target/shaded.jar "/Users/dev/vm_shared_ubuntu14_32bit/Bisq-$version.jar"
|
||||
cp gui/target/shaded.jar "/Users/dev/vm_shared_windows_32bit/Bisq.jar"
|
||||
|
||||
# copy app jar to VM shared folders
|
||||
cp gui/target/shaded.jar "$linux32/Bisq-$version.jar"
|
||||
cp gui/target/shaded.jar "$linux64/Bisq-$version.jar"
|
||||
# At windows we don't add the version nr as it would keep multiple versions of jar files in app dir
|
||||
cp gui/target/shaded.jar "$win32/Bisq.jar"
|
||||
cp gui/target/shaded.jar "$win64/Bisq.jar"
|
||||
|
||||
# copy bouncycastle jars to VM shared folders
|
||||
lib1=bcpg-jdk15on.jar
|
||||
cp gui/target/lib/$lib1 "$linux32/$lib1"
|
||||
cp gui/target/lib/$lib1 "$linux64/$lib1"
|
||||
cp gui/target/lib/$lib1 "$win32/$lib1"
|
||||
cp gui/target/lib/$lib1 "$win64/$lib1"
|
||||
|
||||
lib2=bcprov-jdk15on.jar
|
||||
cp gui/target/lib/$lib2 "$linux32/$lib2"
|
||||
cp gui/target/lib/$lib2 "$linux64/$lib2"
|
||||
cp gui/target/lib/$lib2 "$win32/$lib2"
|
||||
cp gui/target/lib/$lib2 "$win64/$lib2"
|
||||
|
||||
|
||||
echo "Using JAVA_HOME: $JAVA_HOME"
|
||||
$JAVA_HOME/bin/javapackager \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
version="0.6.1"
|
||||
version="0.6.2"
|
||||
|
||||
target_dir="/Users/dev/Documents/__bisq/_releases/$version"
|
||||
src_dir="/Users/dev/Documents/intellij/exchange_bisq"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
:: 32 bit build
|
||||
:: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
|
||||
|
||||
SET version=0.6.1
|
||||
SET version=0.6.2
|
||||
|
||||
:: Private setup
|
||||
SET outdir=\\VBOXSVR\vm_shared_windows_32bit
|
||||
|
|
@ -21,6 +21,8 @@ call "%JAVA_HOME%\bin\javapackager.exe" -deploy ^
|
|||
-outdir %outdir% ^
|
||||
-appclass io.bisq.gui.app.BisqAppMain ^
|
||||
-srcfiles %outdir%\Bisq.jar ^
|
||||
-srcfiles %outdir%\bcpg-jdk15on.jar ^
|
||||
-srcfiles %outdir%\bcprov-jdk15on.jar ^
|
||||
-outfile Bisq ^
|
||||
-Bruntime="%JAVA_HOME%\jre"
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
[Setup]
|
||||
AppId={{bisq}}
|
||||
AppName=Bisq
|
||||
AppVersion=0.6.1
|
||||
AppVersion=0.6.2
|
||||
AppVerName=Bisq
|
||||
AppPublisher=Bisq
|
||||
AppComments=Bisq
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
:: 64 bit build
|
||||
:: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
|
||||
|
||||
SET version=0.6.1
|
||||
SET version=0.6.2
|
||||
|
||||
:: Private setup
|
||||
SET outdir=\\VBOXSVR\vm_shared_windows
|
||||
|
|
@ -21,6 +21,8 @@ call "%JAVA_HOME%\bin\javapackager.exe" -deploy ^
|
|||
-outdir %outdir% ^
|
||||
-appclass io.bisq.gui.app.BisqAppMain ^
|
||||
-srcfiles %outdir%\Bisq.jar ^
|
||||
-srcfiles %outdir%\bcpg-jdk15on.jar ^
|
||||
-srcfiles %outdir%\bcprov-jdk15on.jar ^
|
||||
-outfile Bisq ^
|
||||
-Bruntime="%JAVA_HOME%\jre"
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
[Setup]
|
||||
AppId={{bisq}}
|
||||
AppName=Bisq
|
||||
AppVersion=0.6.1
|
||||
AppVersion=0.6.2
|
||||
AppVerName=Bisq
|
||||
AppPublisher=Bisq
|
||||
AppComments=Bisq
|
||||
|
|
|
|||
2
pom.xml
2
pom.xml
|
|
@ -6,7 +6,7 @@
|
|||
<groupId>io.bisq</groupId>
|
||||
<artifactId>parent</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<version>0.6.1</version>
|
||||
<version>0.6.2</version>
|
||||
<description>Bisq - The decentralized exchange network</description>
|
||||
<url>https://bisq.io</url>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue