From 2701af82bcaf56178938e8d4ae1322e6711a8864 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Mon, 28 Dec 2015 13:33:58 +0100 Subject: [PATCH] Version 0.3.2.2 --- common/pom.xml | 2 +- core/pom.xml | 2 +- .../io/bitsquare/trade/protocol/trade/TradeProtocol.java | 7 +++---- gui/pom.xml | 2 +- gui/src/main/java/io/bitsquare/app/BitsquareApp.java | 6 +++--- jsocks/pom.xml | 2 +- jtorctl/pom.xml | 2 +- jtorproxy/pom.xml | 2 +- network/pom.xml | 2 +- package/linux/create_app.sh | 5 ++++- package/mac/Info.plist | 4 ++++ package/windows/create_app.bat | 8 +++++--- pom.xml | 2 +- seednode/pom.xml | 2 +- 14 files changed, 28 insertions(+), 20 deletions(-) diff --git a/common/pom.xml b/common/pom.xml index 35cf6da866..69754cfb3b 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.2.2-SNAPSHOT + 0.3.2.2 4.0.0 diff --git a/core/pom.xml b/core/pom.xml index bf44e389b1..c5d5ff9f0a 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -6,7 +6,7 @@ parent io.bitsquare - 0.3.2.2-SNAPSHOT + 0.3.2.2 core diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/TradeProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/TradeProtocol.java index 30de7e9ba0..41b36149c9 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/TradeProtocol.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/TradeProtocol.java @@ -17,7 +17,6 @@ package io.bitsquare.trade.protocol.trade; -import io.bitsquare.arbitration.Arbitrator; import io.bitsquare.common.crypto.PubKeyRing; import io.bitsquare.common.util.Utilities; import io.bitsquare.p2p.Address; @@ -36,7 +35,6 @@ import org.slf4j.LoggerFactory; import java.security.PublicKey; import java.time.Duration; -import java.util.Optional; import static io.bitsquare.util.Validator.nonEmptyStringOf; @@ -69,15 +67,16 @@ public abstract class TradeProtocol { } } } else { + //TODO not clear anymore what case is handled here // it might be that we received a msg from the arbitrator, we don't handle that here but we don't want to log an error - Optional arbitratorOptional = processModel.getArbitratorManager().getArbitratorsObservableMap().values().stream() + /*Optional arbitratorOptional = processModel.getArbitratorManager().getArbitratorsObservableMap().values().stream() .filter(e -> e.getArbitratorAddress().equals(trade.getArbitratorAddress())).findFirst(); PubKeyRing arbitratorPubKeyRing = null; if (arbitratorOptional.isPresent()) arbitratorPubKeyRing = arbitratorOptional.get().getPubKeyRing(); if ((arbitratorPubKeyRing != null && !signaturePubKey.equals(arbitratorPubKeyRing.getSignaturePubKey()))) - log.error("Signature used in seal message does not match the one stored with that trade for the trading peer or arbitrator."); + log.error("Signature used in seal message does not match the one stored with that trade for the trading peer or arbitrator.");*/ } }; processModel.getP2PService().addDecryptedMailListener(decryptedMailListener); diff --git a/gui/pom.xml b/gui/pom.xml index c24c66e2f3..f7e85f5f76 100644 --- a/gui/pom.xml +++ b/gui/pom.xml @@ -22,7 +22,7 @@ parent io.bitsquare - 0.3.2.2-SNAPSHOT + 0.3.2.2 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 306e6f7a78..acede6a422 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 = true; + public static final boolean DEV_MODE = false; public static final boolean IS_RELEASE_VERSION = !DEV_MODE && true; private static Environment env; @@ -155,14 +155,14 @@ public class BitsquareApp extends Application { primaryStage.setOnCloseRequest(e -> { e.consume(); if (BitsquareApp.IS_RELEASE_VERSION) - systemTray.hideStage(); + stop(); // systemTray.hideStage(); TODO issues with some linux systems (https://github.com/bitsquare/bitsquare/issues/350) else stop(); }); scene.setOnKeyReleased(keyEvent -> { if (new KeyCodeCombination(KeyCode.W, KeyCombination.SHORTCUT_DOWN).match(keyEvent)) { if (BitsquareApp.IS_RELEASE_VERSION) - systemTray.hideStage(); + stop(); //systemTray.hideStage(); TODO issues with some linux systems (https://github.com/bitsquare/bitsquare/issues/350) else stop(); } else if (new KeyCodeCombination(KeyCode.Q, KeyCombination.SHORTCUT_DOWN).match(keyEvent)) { diff --git a/jsocks/pom.xml b/jsocks/pom.xml index 609cfe156f..13ea017d25 100644 --- a/jsocks/pom.xml +++ b/jsocks/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.2.2-SNAPSHOT + 0.3.2.2 4.0.0 diff --git a/jtorctl/pom.xml b/jtorctl/pom.xml index c739117904..19d8e58b6e 100644 --- a/jtorctl/pom.xml +++ b/jtorctl/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.2.2-SNAPSHOT + 0.3.2.2 4.0.0 diff --git a/jtorproxy/pom.xml b/jtorproxy/pom.xml index 4110f9768c..ff3703acef 100644 --- a/jtorproxy/pom.xml +++ b/jtorproxy/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.2.2-SNAPSHOT + 0.3.2.2 4.0.0 diff --git a/network/pom.xml b/network/pom.xml index a2dc86ef0c..8cc39ed1d2 100644 --- a/network/pom.xml +++ b/network/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.2.2-SNAPSHOT + 0.3.2.2 4.0.0 diff --git a/package/linux/create_app.sh b/package/linux/create_app.sh index bf2994b553..ce22450d42 100644 --- a/package/linux/create_app.sh +++ b/package/linux/create_app.sh @@ -8,12 +8,15 @@ set -e # Edit versions fullVersion=0.3.2.2 +mvn clean package -DskipTests -Dmaven.javadoc.skip=true +cp gui/target/shaded.jar gui/deploy/Bitsquare.jar + # Copy jar file from mac build (1.jar from processed folder) to linux box # Note: fakeroot needs to be installed on linux $JAVA_HOME/bin/javapackager \ -deploy \ -BappVersion=$fullVersion \ - -Bcategory=Finance \ + -Bcategory=Office,Finance \ -Bemail=team@bitsquare.io \ -BlicenseType=GPLv3 \ -BlicenseFile=LICENSE \ diff --git a/package/mac/Info.plist b/package/mac/Info.plist index 3b9923133b..bab94feb1e 100644 --- a/package/mac/Info.plist +++ b/package/mac/Info.plist @@ -54,5 +54,9 @@ + + NSAppSleepDisabled + YES + diff --git a/package/windows/create_app.bat b/package/windows/create_app.bat index b0386ff503..03bf208fc7 100644 --- a/package/windows/create_app.bat +++ b/package/windows/create_app.bat @@ -1,6 +1,8 @@ cd ..\..\ mkdir gui\deploy +mvn clean package -DskipTests -Dmaven.javadoc.skip=true + :: edit iss file -> AppVersion=0.3.2.2 :: Copy gui/deploy.Bitsquare.jar file from mac build to windows @@ -8,10 +10,10 @@ mkdir gui\deploy :: 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.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" +:: Build with jdk1.8.0_25 fails but jdk1.8.0_3 works +call "C:\Program Files\Java\jdk1.8.0_25\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\target\shaded.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_25\jre" :: 32 bit build -:: 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" +:: call "C:\Program Files (x86)\Java\jdk1.8.0_25\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\target\shaded.jar" -outfile Bitsquare -Bruntime="C:\Program Files (x86)\Java\jdk1.8.0_25\jre" cd package\windows \ No newline at end of file diff --git a/pom.xml b/pom.xml index bfa4d6089b..724c9d2eb7 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.bitsquare parent pom - 0.3.2.2-SNAPSHOT + 0.3.2.2 Bitsquare - The decentralized bitcoin exchange https://bitsquare.io diff --git a/seednode/pom.xml b/seednode/pom.xml index b8aa746f30..1de58f4bda 100644 --- a/seednode/pom.xml +++ b/seednode/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.2.2-SNAPSHOT + 0.3.2.2 4.0.0