mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-22 14:42:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

Version 0.5.3 with hotfix for fixing wrong app data name (bisq was renamed to Bisq -> we rename the app data dir).

Browse source
This commit is contained in:
Manfred Karrer 2017-07-17 10:05:08 +02:00
parent 225fdb1e46
commit a7f3d68cb1
23 changed files with 56 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bisq</groupId>
<version>0.5.2</version>
<version>0.5.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
common/src/main/java/io/bisq/common/app/Version.java
View file

@ -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.5.2";
public static final String VERSION = "0.5.3";
public static int getMajorVersion(String version) {
return getSubVersion(version, 0);

2
common/src/main/resources/i18n/displayStrings.properties
View file

@ -1532,7 +1532,7 @@ If you have not fulfilled the above requirements you would lose your security de
to get in contact with the {1} buyer by using the provided email address or mobile number to verify that he or she \
is really the owner of the Zelle (ClearXchange) account.
popup.info.revertIdCheckRequirement=With version 0.5.2 we remove the requirement introduced in version 0.5.0 for verifying the peers ID by email when payment methods \
popup.info.revertIdCheckRequirement=With this version we remove the requirement introduced in version 0.5.0 for verifying the peers ID by email when payment methods \
with bank transfer or Faster Payment was used.\n\n\
The email address is not exposed anymore in Sepa, Faster Payment and national bank transfer payment methods.\n\n\
Please see the discussion on the Bisq Forum for further background:\n\

2
core/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bisq</groupId>
<version>0.5.2</version>
<version>0.5.3</version>
</parent>
<artifactId>core</artifactId>

34
core/src/main/java/io/bisq/core/app/BisqEnvironment.java
View file

@ -44,6 +44,8 @@ import org.springframework.core.io.support.ResourcePropertySource;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Properties;
@ -107,6 +109,38 @@ public class BisqEnvironment extends StandardEnvironment {
}
private static String appDataDir(String userDataDir, String appName) {
//TODO fix for changing app name form bisq to Bisq (add dir renamed as well)
final String newAppName = "Bisq";
if (appName.equals(newAppName)) {
final String oldAppName = "bisq";
Path oldPath = Paths.get(Paths.get(userDataDir, oldAppName).toString());// bisq
Path newPath = Paths.get(Paths.get(userDataDir, appName).toString());//Bisq
File oldDir = new File(oldPath.toString()); // bisq
File newDir = new File(newPath.toString()); //Bisq
try {
if (Files.exists(oldPath) && oldDir.getCanonicalPath().endsWith(oldAppName)) {
if (Files.exists(newPath) && newDir.getCanonicalPath().endsWith(newAppName)) {
// we have both bisq and Bisq and rename Bisq to Bisq_backup
File newDirBackup = new File(newDir.toString() + "_backup"); // Bisq
log.info("Rename Bisq data dir {} to {}", newPath.toString(), newDirBackup.toString());
if (!newDir.renameTo(newDirBackup))
throw new RuntimeException("Cannot rename dir");
log.info("Rename old data dir {} to {}", oldDir.toString(), newPath.toString());
if (!oldDir.renameTo(newDir))
throw new RuntimeException("Cannot rename dir");
} else {
log.info("Rename old data dir {} to {}", oldDir.toString(), newPath.toString());
if (!oldDir.renameTo(newDir))
throw new RuntimeException("Cannot rename dir");
}
}
} catch (IOException e) {
e.printStackTrace();
}
}
return Paths.get(userDataDir, appName).toString();
}

2
gui/pom.xml
View file

@ -22,7 +22,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bisq</groupId>
<version>0.5.2</version>
<version>0.5.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>

1
gui/src/main/java/io/bisq/gui/main/MainViewModel.java
View file

@ -306,7 +306,6 @@ public class MainViewModel implements ViewModel {
//TODO remove after v0.5.2
String key = "revertIdCheckRequirement";
if (preferences.showAgain(key) &&
Version.VERSION.equals("0.5.2") &&
user.getPaymentAccounts() != null &&
user.getPaymentAccounts().stream()
.filter(e -> e.getPaymentMethod().getId().equals(PaymentMethod.SEPA_ID) ||

2
jsocks/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bisq</groupId>
<version>0.5.2</version>
<version>0.5.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jtorctl/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bisq</groupId>
<version>0.5.2</version>
<version>0.5.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jtorproxy/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bisq</groupId>
<version>0.5.2</version>
<version>0.5.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
network/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bisq</groupId>
<version>0.5.2</version>
<version>0.5.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
package/linux/32bitBuild.sh
View file

@ -6,7 +6,7 @@ mkdir -p gui/deploy
set -e
# Edit version
version=0.5.2
version=0.5.3
jarFile="/media/sf_vm_shared_ubuntu14_32bit/Bisq-$version.jar"

2
package/linux/64bitBuild.sh
View file

@ -6,7 +6,7 @@ mkdir -p gui/deploy
set -e
# Edit version
version=0.5.2
version=0.5.3
jarFile="/media/sf_vm_shared_ubuntu/Bisq-$version.jar"

2
package/linux/Dockerfile
View file

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

2
package/osx/create_app.sh
View file

@ -5,7 +5,7 @@ mkdir -p gui/deploy
set -e
version="0.5.2"
version="0.5.3"
mvn clean package verify -DskipTests -Dmaven.javadoc.skip=true

2
package/osx/finalize.sh
View file

@ -1,6 +1,6 @@
#!/bin/bash
version="0.5.2"
version="0.5.3"
target_dir="/Users/dev/Documents/__bisq/_releases/$version"
src_dir="/Users/dev/Documents/intellij/bisq"

2
package/win/32bitBuild.bat
View file

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

2
package/win/64bitBuild.bat
View file

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

2
package/win/Bisq.iss
View file

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

4
pom.xml
View file

@ -6,7 +6,7 @@
<groupId>io.bisq</groupId>
<artifactId>parent</artifactId>
<packaging>pom</packaging>
<version>0.5.2</version>
<version>0.5.3</version>
<description>Bisq - The decentralized exchange network</description>
<url>https://bisq.io</url>
@ -66,7 +66,7 @@
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<version>0.5.2</version>
<version>0.5.3</version>
<configuration>
<protocExecutable>/usr/local/bin/protoc</protocExecutable>
</configuration>

2
provider/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bisq</groupId>
<version>0.5.2</version>
<version>0.5.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
seednode/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bisq</groupId>
<version>0.5.2</version>
<version>0.5.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
statistics/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.bisq</groupId>
<version>0.5.2</version>
<version>0.5.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>