Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-06-22 13:54:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

version 0.3.3

Browse source
This commit is contained in:
Manfred Karrer 2016-01-27 19:02:01 +01:00
parent cc128ad508
commit 495616edea
16 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.3.2.3</version> <version>0.3.3</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

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

@ -24,7 +24,7 @@ public class Version {
private static final Logger log = LoggerFactory.getLogger(Version.class); private static final Logger log = LoggerFactory.getLogger(Version.class);
// The application versions // The application versions
public static final String VERSION = "0.3.2.3"; public static final String VERSION = "0.3.3";
// The version nr. for the objects sent over the network. A change will break the serialization of old objects. // 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. // If objects are used for both network and database the network version is applied.

2
core/pom.xml
View file

@ -6,7 +6,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.3.2.3</version> <version>0.3.3</version>
</parent> </parent>
<artifactId>core</artifactId> <artifactId>core</artifactId>

2
gui/pom.xml
View file

@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.3.2.3</version> <version>0.3.3</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
gui/src/main/java/io/bitsquare/app/BitsquareApp.java
View file

@ -75,7 +75,7 @@ import static io.bitsquare.app.BitsquareEnvironment.APP_NAME_KEY;
public class BitsquareApp extends Application { public class BitsquareApp extends Application {
private static final Logger log = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(BitsquareApp.class); 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; public static final boolean IS_RELEASE_VERSION = !DEV_MODE && true;
private static Environment env; private static Environment env;

4
gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java
View file

@ -397,7 +397,9 @@ class TakeOfferViewModel extends ActivatableWithDataModel<TakeOfferDataModel> im
public void onDisconnect(Reason reason, Connection connection) { public void onDisconnect(Reason reason, Connection connection) {
if (connection.getPeersNodeAddressOptional().isPresent() && if (connection.getPeersNodeAddressOptional().isPresent() &&
connection.getPeersNodeAddressOptional().get().equals(offer.getOffererNodeAddress())) connection.getPeersNodeAddressOptional().get().equals(offer.getOffererNodeAddress()))
offerWarning.set("You cannot take that offer because the offerer went offline."); offerWarning.set("You lost connection to the offerer.\n" +
"He might have gone offline or has closed the connection to you because of " +
"many other connections.");
} }
@Override @Override

2
jsocks/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.3.2.3</version> <version>0.3.3</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
jtorctl/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.3.2.3</version> <version>0.3.3</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
jtorproxy/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.3.2.3</version> <version>0.3.3</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
network/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.3.2.3</version> <version>0.3.3</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
package/linux/create_app.sh
View file

@ -6,7 +6,7 @@ mkdir -p gui/deploy
set -e set -e
# Edit versions # Edit versions
fullVersion=0.3.2.3 fullVersion=0.3.3
jarFile="/home/mk/Desktop/sf_vm_shared_ubuntu/Bitsquare-$fullVersion.jar" jarFile="/home/mk/Desktop/sf_vm_shared_ubuntu/Bitsquare-$fullVersion.jar"
# Note: fakeroot needs to be installed on linux # Note: fakeroot needs to be installed on linux

2
package/mac/create_app.sh
View file

@ -5,7 +5,7 @@ mkdir -p gui/deploy
set -e set -e
fullVersion="0.3.2.3" fullVersion="0.3.3"
mvn clean package -DskipTests -Dmaven.javadoc.skip=true mvn clean package -DskipTests -Dmaven.javadoc.skip=true

2
package/windows/Bitsquare.iss
View file

@ -3,7 +3,7 @@
[Setup] [Setup]
AppId={{bitsquare}} AppId={{bitsquare}}
AppName=Bitsquare AppName=Bitsquare
AppVersion=0.3.2.3 AppVersion=0.3.3
AppVerName=Bitsquare AppVerName=Bitsquare
AppPublisher=Bitsquare AppPublisher=Bitsquare
AppComments=Bitsquare AppComments=Bitsquare

6
package/windows/create_app.bat
View file

@ -1,13 +1,13 @@
cd ..\..\ cd ..\..\
mkdir gui\deploy mkdir gui\deploy
:: edit iss file -> AppVersion=0.3.2.3 :: edit iss file -> AppVersion=0.3.3
:: Copy gui/deploy.Bitsquare.jar file from mac build to windows :: Copy gui/deploy.Bitsquare.jar file from mac build to windows
:: edit -> -BappVersion=0.3.2.3 and -srcfiles :: edit -> -BappVersion=0.3.3 and -srcfiles
:: 64 bit build :: 64 bit build
:: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php) :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
call "C:\Program Files\Java\jdk1.8.0_66\bin\javapackager.exe" -deploy -BappVersion=0.3.2.3 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir "\\VBOXSVR\vm_shared_windows" -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "\\VBOXSVR\vm_shared_windows\Bitsquare-0.3.2.3.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_66\jre" -BjvmProperties=-Djava.net.preferIPv4Stack=true call "C:\Program Files\Java\jdk1.8.0_66\bin\javapackager.exe" -deploy -BappVersion=0.3.3 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir "\\VBOXSVR\vm_shared_windows" -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "\\VBOXSVR\vm_shared_windows\Bitsquare-0.3.3.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_66\jre" -BjvmProperties=-Djava.net.preferIPv4Stack=true
cd package\windows cd package\windows

2
pom.xml
View file

@ -6,7 +6,7 @@
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>0.3.2.3</version> <version>0.3.3</version>
<description>Bitsquare - The decentralized bitcoin exchange</description> <description>Bitsquare - The decentralized bitcoin exchange</description>
<url>https://bitsquare.io</url> <url>https://bitsquare.io</url>

2
seednode/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.3.2.3</version> <version>0.3.3</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>