From 75ae740eba39e708bd848ab0fe9ecdfbfa803069 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sun, 6 May 2018 22:25:16 -0500 Subject: [PATCH 1/5] Set version 0.7.0 --- src/main/java/bisq/common/app/Version.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/bisq/common/app/Version.java b/src/main/java/bisq/common/app/Version.java index 1712b79..c55a40c 100644 --- a/src/main/java/bisq/common/app/Version.java +++ b/src/main/java/bisq/common/app/Version.java @@ -27,7 +27,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.7"; + public static final String VERSION = "0.7.0"; public static int getMajorVersion(String version) { return getSubVersion(version, 0); From f01f6ab9200a95f19b8526d6129872f5775edaeb Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Thu, 10 May 2018 12:27:42 +0200 Subject: [PATCH 2/5] Use version 0.7.0 instead of -SNAPSHOT --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f97a7c6..e5e9f6b 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { } group = 'network.bisq' -version = '-SNAPSHOT' +version = '0.7.0' ext { protobufVersion = '3.5.1' From d4d4a22f2cdd39777890e5e4ea84b02fac6a87ec Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Thu, 10 May 2018 21:29:50 +0200 Subject: [PATCH 3/5] Remove STRESS_TEST_MODE flag --- src/main/java/bisq/common/app/DevEnv.java | 3 --- src/main/java/bisq/common/app/Log.java | 13 ------------- src/main/java/bisq/common/app/Version.java | 2 +- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/src/main/java/bisq/common/app/DevEnv.java b/src/main/java/bisq/common/app/DevEnv.java index 8a949cb..48f33c5 100644 --- a/src/main/java/bisq/common/app/DevEnv.java +++ b/src/main/java/bisq/common/app/DevEnv.java @@ -31,9 +31,6 @@ public static void setup(Injector injector) { DevEnv.setDevMode(injector.getInstance(Key.get(Boolean.class, Names.named(CommonOptionKeys.USE_DEV_MODE)))); } - // Was used for P2P network stress test to adjust several setting for the tests (e.g. use lower btc fees for offers,..) - public static final boolean STRESS_TEST_MODE = false; - // The UI got set the private dev key so the developer does not need to do anything and can test those features. // Features: Arbitration registration (alt+R at account), Alert/Update (alt+m), private message to a // peer (click user icon and alt+r), filter/block offers by various data like offer ID (cmd + f). diff --git a/src/main/java/bisq/common/app/Log.java b/src/main/java/bisq/common/app/Log.java index 8e74ff5..0d80862 100644 --- a/src/main/java/bisq/common/app/Log.java +++ b/src/main/java/bisq/common/app/Log.java @@ -17,12 +17,6 @@ package bisq.common.app; -import bisq.common.util.Profiler; - -import java.text.SimpleDateFormat; - -import java.util.Date; - import org.slf4j.LoggerFactory; import ch.qos.logback.classic.Level; @@ -115,11 +109,4 @@ public static void traceCall(String message) { LoggerFactory.getLogger(className).trace("Called: {} [{}]", methodName, message); } } - - public static void logIfStressTests(String msg) { - if (DevEnv.STRESS_TEST_MODE) - System.err.println(new SimpleDateFormat("HH:mm:ss.SSS").format(new Date()) + - " - " + msg + - " / Memory(MB): " + Profiler.getUsedMemoryInMB()); - } } diff --git a/src/main/java/bisq/common/app/Version.java b/src/main/java/bisq/common/app/Version.java index c55a40c..755d684 100644 --- a/src/main/java/bisq/common/app/Version.java +++ b/src/main/java/bisq/common/app/Version.java @@ -74,7 +74,7 @@ private static int getSubVersion(String version, int index) { // If objects are used for both network and database the network version is applied. // VERSION = 0.5.0 -> P2P_NETWORK_VERSION = 1 @SuppressWarnings("ConstantConditions") - public static final int P2P_NETWORK_VERSION = DevEnv.STRESS_TEST_MODE ? 100 : 1; + public static final int P2P_NETWORK_VERSION = 1; // The version no. of the serialized data stored to disc. A change will break the serialization of old objects. // VERSION = 0.5.0 -> LOCAL_DB_VERSION = 1 From 482a6cdd784d6e00eca269451e98912fddf1a0a8 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Thu, 10 May 2018 23:13:40 +0200 Subject: [PATCH 4/5] Add mavenLocal to repositories in gradle file --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index e5e9f6b..02df6ee 100644 --- a/build.gradle +++ b/build.gradle @@ -18,6 +18,7 @@ tasks.withType(JavaCompile) { } repositories { + mavenLocal() jcenter() maven { url 'https://jitpack.io' } } From 20c66e0f6851c13f0770b3b6f3e46f330826a6ba Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Fri, 11 May 2018 10:16:04 +0200 Subject: [PATCH 5/5] Revert version to -SNAPSHOT --- build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 02df6ee..f97a7c6 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { } group = 'network.bisq' -version = '0.7.0' +version = '-SNAPSHOT' ext { protobufVersion = '3.5.1' @@ -18,7 +18,6 @@ tasks.withType(JavaCompile) { } repositories { - mavenLocal() jcenter() maven { url 'https://jitpack.io' } }