diff --git a/common/pom.xml b/common/pom.xml
index e1f0a73254..35cf6da866 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -5,7 +5,7 @@
parent
io.bitsquare
- 0.3.2.1
+ 0.3.2.2-SNAPSHOT
4.0.0
diff --git a/common/src/main/java/io/bitsquare/app/Version.java b/common/src/main/java/io/bitsquare/app/Version.java
index 6f78a5d27d..965f871da1 100644
--- a/common/src/main/java/io/bitsquare/app/Version.java
+++ b/common/src/main/java/io/bitsquare/app/Version.java
@@ -24,7 +24,7 @@ public class Version {
private static final Logger log = LoggerFactory.getLogger(Version.class);
// The application versions
- public static final String VERSION = "0.3.2.1";
+ public static final String VERSION = "0.3.2.2";
// The version nr. 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.
diff --git a/core/pom.xml b/core/pom.xml
index 6c96f62926..bf44e389b1 100755
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -6,7 +6,7 @@
parent
io.bitsquare
- 0.3.2.1
+ 0.3.2.2-SNAPSHOT
core
diff --git a/doc/bitsquare.conf b/doc/bitsquare.conf
index 3a60c30762..1a0b3b09bd 100644
--- a/doc/bitsquare.conf
+++ b/doc/bitsquare.conf
@@ -2,21 +2,10 @@
# Here are the typical locations for the data directory:
-# Windows:
-# %APPDATA%\Bitcoin\
-# (XP) C:\Documents and Settings\username\Application Data\Bitcoin\bitcoin.conf
-# (Vista, 7) C:\Users\username\AppData\Roaming\Bitcoin\bitcoin.conf
-
-# Linux:
-# $HOME/.bitcoin/
-# /home/username/.bitcoin/bitcoin.conf
-
-# Mac OSX:
-# $HOME/Library/Application Support/Bitcoin/
-# /Users/username/Library/Application Support/Bitcoin/bitcoin.conf
-
-
-# Supported properties:
-# bitcoin.network=regtest | testnet | mainnet
+# Mac OSX: /Users/username/Library/Application Support/Bitsquare/
+# Linux: /home/username/.Bitsquare/
+# Windows XP: C:\Documents and Settings\username\Application Data\Bitsquare\
+# Windows Vista or 7: %appdata%/Bitsquare/
+# Supported properties for bitcoin.network=regtest | testnet | mainnet
bitcoin.network = regtest
diff --git a/gui/pom.xml b/gui/pom.xml
index fc469da03d..c24c66e2f3 100644
--- a/gui/pom.xml
+++ b/gui/pom.xml
@@ -22,7 +22,7 @@
parent
io.bitsquare
- 0.3.2.1
+ 0.3.2.2-SNAPSHOT
4.0.0
diff --git a/gui/src/main/java/io/bitsquare/app/BitsquareApp.java b/gui/src/main/java/io/bitsquare/app/BitsquareApp.java
index 01f4045227..3078b06334 100644
--- a/gui/src/main/java/io/bitsquare/app/BitsquareApp.java
+++ b/gui/src/main/java/io/bitsquare/app/BitsquareApp.java
@@ -73,7 +73,7 @@ import static io.bitsquare.app.BitsquareEnvironment.APP_NAME_KEY;
public class BitsquareApp extends Application {
private static final Logger log = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(BitsquareApp.class);
- public static final boolean DEV_MODE = false;
+ public static final boolean DEV_MODE = true;
public static final boolean IS_RELEASE_VERSION = !DEV_MODE && true;
private static Environment env;
diff --git a/gui/src/main/java/io/bitsquare/gui/util/ImageUtil.java b/gui/src/main/java/io/bitsquare/gui/util/ImageUtil.java
index 1ba41e07f5..9d5ff14ba6 100644
--- a/gui/src/main/java/io/bitsquare/gui/util/ImageUtil.java
+++ b/gui/src/main/java/io/bitsquare/gui/util/ImageUtil.java
@@ -55,6 +55,8 @@ public class ImageUtil {
}
public static boolean isRetina() {
+ // Latest JDK renamed getMaxPixelScale to getMaxRenderScale
+ // return ((QuantumToolkit) QuantumToolkit.getToolkit()).getMaxRenderScale() > 1.9f;
return ((QuantumToolkit) QuantumToolkit.getToolkit()).getMaxPixelScale() > 1.9f;
}
diff --git a/jsocks/pom.xml b/jsocks/pom.xml
index f241ee69f9..609cfe156f 100644
--- a/jsocks/pom.xml
+++ b/jsocks/pom.xml
@@ -5,7 +5,7 @@
parent
io.bitsquare
- 0.3.2.1
+ 0.3.2.2-SNAPSHOT
4.0.0
diff --git a/jtorctl/pom.xml b/jtorctl/pom.xml
index d10e1ce5e7..c739117904 100644
--- a/jtorctl/pom.xml
+++ b/jtorctl/pom.xml
@@ -5,7 +5,7 @@
parent
io.bitsquare
- 0.3.2.1
+ 0.3.2.2-SNAPSHOT
4.0.0
diff --git a/jtorproxy/pom.xml b/jtorproxy/pom.xml
index b62df49954..4110f9768c 100644
--- a/jtorproxy/pom.xml
+++ b/jtorproxy/pom.xml
@@ -5,7 +5,7 @@
parent
io.bitsquare
- 0.3.2.1
+ 0.3.2.2-SNAPSHOT
4.0.0
diff --git a/network/pom.xml b/network/pom.xml
index d08ca7e196..a2dc86ef0c 100644
--- a/network/pom.xml
+++ b/network/pom.xml
@@ -5,7 +5,7 @@
parent
io.bitsquare
- 0.3.2.1
+ 0.3.2.2-SNAPSHOT
4.0.0
diff --git a/network/src/main/java/io/bitsquare/p2p/P2PService.java b/network/src/main/java/io/bitsquare/p2p/P2PService.java
index f80ce58bf0..8b16f01acd 100644
--- a/network/src/main/java/io/bitsquare/p2p/P2PService.java
+++ b/network/src/main/java/io/bitsquare/p2p/P2PService.java
@@ -164,6 +164,7 @@ public class P2PService implements SetupListener, MessageListener, ConnectionLis
});
}
+
///////////////////////////////////////////////////////////////////////////////////////////
// MessageListener implementation
///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/package/linux/create_app.sh b/package/linux/create_app.sh
index 43326a89bf..bf2994b553 100644
--- a/package/linux/create_app.sh
+++ b/package/linux/create_app.sh
@@ -6,7 +6,7 @@ mkdir -p gui/deploy
set -e
# Edit versions
-fullVersion=0.3.2.1
+fullVersion=0.3.2.2
# Copy jar file from mac build (1.jar from processed folder) to linux box
# Note: fakeroot needs to be installed on linux
diff --git a/package/mac/create_app.sh b/package/mac/create_app.sh
index cbd61537ff..bde960e102 100644
--- a/package/mac/create_app.sh
+++ b/package/mac/create_app.sh
@@ -5,7 +5,7 @@ mkdir -p gui/deploy
set -e
-fullVersion="0.3.2.1"
+fullVersion="0.3.2.2"
mvn clean package -DskipTests -Dmaven.javadoc.skip=true
cp gui/target/shaded.jar gui/deploy/Bitsquare.jar
diff --git a/package/windows/Bitsquare.iss b/package/windows/Bitsquare.iss
index 0e5737078b..5acf20b4f4 100755
--- a/package/windows/Bitsquare.iss
+++ b/package/windows/Bitsquare.iss
@@ -3,7 +3,7 @@
[Setup]
AppId={{bitsquare}}
AppName=Bitsquare
-AppVersion=0.3.2.1
+AppVersion=0.3.2.2
AppVerName=Bitsquare
AppPublisher=Bitsquare
AppComments=Bitsquare
diff --git a/package/windows/create_app.bat b/package/windows/create_app.bat
index 8ba0bee368..b0386ff503 100644
--- a/package/windows/create_app.bat
+++ b/package/windows/create_app.bat
@@ -1,17 +1,17 @@
cd ..\..\
mkdir gui\deploy
-:: edit iss file -> AppVersion=0.3.2.1
+:: edit iss file -> AppVersion=0.3.2.2
:: Copy gui/deploy.Bitsquare.jar file from mac build to windows
-:: edit -> -BappVersion=0.3.2.1 and -srcfiles
+:: edit -> -BappVersion=0.3.2.2 and -srcfiles
:: 64 bit build
:: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
:: Build with jdk1.8.0_40 fails but jdk1.8.0_3 works
-call "C:\Program Files\Java\jdk1.8.0_31\bin\javapackager.exe" -deploy -BappVersion=0.3.2.1 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir gui\deploy -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "gui\deploy\Bitsquare.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_31\jre"
+call "C:\Program Files\Java\jdk1.8.0_31\bin\javapackager.exe" -deploy -BappVersion=0.3.2.2 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir gui\deploy -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "gui\deploy\Bitsquare.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_31\jre"
:: 32 bit build
-:: call "C:\Program Files (x86)\Java\jdk1.8.0_31\bin\javapackager.exe" -deploy -BappVersion=0.3.2.1 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir gui\deploy -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "gui\deploy\Bitsquare.jar" -outfile Bitsquare -Bruntime="C:\Program Files (x86)\Java\jdk1.8.0_31\jre"
+:: call "C:\Program Files (x86)\Java\jdk1.8.0_31\bin\javapackager.exe" -deploy -BappVersion=0.3.2.2 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir gui\deploy -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "gui\deploy\Bitsquare.jar" -outfile Bitsquare -Bruntime="C:\Program Files (x86)\Java\jdk1.8.0_31\jre"
cd package\windows
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 0001f4cb6f..bfa4d6089b 100755
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
io.bitsquare
parent
pom
- 0.3.2.1
+ 0.3.2.2-SNAPSHOT
Bitsquare - The decentralized bitcoin exchange
https://bitsquare.io
diff --git a/seednode/pom.xml b/seednode/pom.xml
index 5500bb52be..b8aa746f30 100644
--- a/seednode/pom.xml
+++ b/seednode/pom.xml
@@ -5,7 +5,7 @@
parent
io.bitsquare
- 0.3.2.1
+ 0.3.2.2-SNAPSHOT
4.0.0