bump dependencies versions (#490)

crossbario · Jun 26, 2020 · c48c8d1 · c48c8d1
1 parent 517ba38
commit c48c8d1
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 614 deletions.
diff --git a/autobahn/build.gradle b/autobahn/build.gradle
@@ -16,26 +16,26 @@ def relVersion = System.getenv().containsKey('AUTOBAHN_BUILD_VERSION') ? System.
 def siteUrl = 'https://github.com/crossbario/autobahn-java'
 
 dependencies {
-    api 'com.fasterxml.jackson.core:jackson-core:2.9.8'
+    api 'com.fasterxml.jackson.core:jackson-core:2.11.1'
     //api 'net.sourceforge.streamsupport:streamsupport-cfuture:1.6.2'
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.8'
-    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.9.8'
-    implementation 'org.msgpack:jackson-dataformat-msgpack:0.8.16'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.11.1'
+    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.11.1'
+    implementation 'org.msgpack:jackson-dataformat-msgpack:0.8.20'
     if (project.IS_ANDROID) {
         implementation 'com.github.joshjdevl.libsodiumjni:libsodium-jni-aar:2.0.2'
-        implementation 'org.web3j:core:4.2.0-android'
-        implementation 'org.web3j:abi:4.2.0-android'
-        implementation 'org.web3j:utils:4.2.0-android'
+        implementation 'org.web3j:core:4.6.0-android'
+        implementation 'org.web3j:abi:4.6.0-android'
+        implementation 'org.web3j:utils:4.6.0-android'
     } else {
         implementation 'com.github.joshjdevl.libsodiumjni:libsodium-jni:2.0.2'
-        implementation 'org.web3j:core:4.2.0'
-        implementation 'org.web3j:abi:4.2.0'
-        implementation 'org.web3j:utils:4.2.0'
-        implementation 'org.json:json:20190722'
+        implementation 'org.web3j:core:4.6.0'
+        implementation 'org.web3j:abi:4.6.0'
+        implementation 'org.web3j:utils:4.6.0'
+        implementation 'org.json:json:20200518'
     }
     if (project.IS_NETTY) {
-        implementation 'io.netty:netty-codec-http:4.1.34.Final'
-        implementation 'io.netty:netty-handler:4.1.34.Final'
+        implementation 'io.netty:netty-codec-http:4.1.50.Final'
+        implementation 'io.netty:netty-handler:4.1.50.Final'
     }
 }
 

diff --git a/autobahn/src/main/java/io/crossbar/autobahn/wamp/interfaces/ISerializer.java b/autobahn/src/main/java/io/crossbar/autobahn/wamp/interfaces/ISerializer.java
@@ -51,7 +51,7 @@ public List<Object> unserialize(byte[] payload, boolean isBinary) {
         }
     }
 
-    public <T> T convertValue(Object fromValue, TypeReference toValueTypeRef) {
+    public <T> T convertValue(Object fromValue, TypeReference<T> toValueTypeRef) {
         // https://github.com/FasterXML/jackson-databind#tutorial-fancier-stuff-conversions
         // ResultType result = mapper.convertValue(sourceObject, ResultType.class);
         return mapper.convertValue(fromValue, toValueTypeRef);

diff --git a/autobahn/src/main/java/xbr/network/KeySeries.java b/autobahn/src/main/java/xbr/network/KeySeries.java
@@ -20,7 +20,6 @@
 import org.web3j.utils.Numeric;
 
 import java.math.BigInteger;
-import java.security.SecureRandom;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Timer;

diff --git a/autobahn/src/main/java/xbr/network/Util.java b/autobahn/src/main/java/xbr/network/Util.java
@@ -18,14 +18,13 @@
 import org.web3j.crypto.ECKeyPair;
 import org.web3j.crypto.Keys;
 import org.web3j.crypto.Sign;
+import org.web3j.crypto.StructuredDataEncoder;
 import org.web3j.utils.Numeric;
 
 import java.io.IOException;
 import java.math.BigInteger;
 import java.util.Arrays;
 
-import xbr.network.web3.StructuredDataEncoder;
-
 public class Util {
 
     private static final String VERIFYING_ADDR = "0x254dffcd3277C0b1660F6d42EFbB754edaBAbC2B";
@@ -102,7 +101,7 @@ static byte[] signEIP712Data(ECKeyPair keyPair, byte[] channelAddr, int channelS
         byte[] result = new byte[65];
         System.arraycopy(r, 0, result, 0, r.length);
         System.arraycopy(s, 0, result, r.length, s.length);
-        result[64] = signed.getV();
+        result[64] = signed.getV()[0];
 
         return result;
     }

diff --git a/autobahn/src/main/java/xbr/network/web3/Pair.java b/autobahn/src/main/java/xbr/network/web3/Pair.java
diff --git a/autobahn/src/main/java/xbr/network/web3/StructuredData.java b/autobahn/src/main/java/xbr/network/web3/StructuredData.java