Skip to content

Commit c48c8d1

Browse files
authored
bump dependencies versions (#490)
1 parent 517ba38 commit c48c8d1

File tree

8 files changed

+17
-614
lines changed

8 files changed

+17
-614
lines changed

autobahn/build.gradle

+13-13
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,26 @@ def relVersion = System.getenv().containsKey('AUTOBAHN_BUILD_VERSION') ? System.
1616
def siteUrl = 'https://github.com/crossbario/autobahn-java'
1717

1818
dependencies {
19-
api 'com.fasterxml.jackson.core:jackson-core:2.9.8'
19+
api 'com.fasterxml.jackson.core:jackson-core:2.11.1'
2020
//api 'net.sourceforge.streamsupport:streamsupport-cfuture:1.6.2'
21-
implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.8'
22-
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.9.8'
23-
implementation 'org.msgpack:jackson-dataformat-msgpack:0.8.16'
21+
implementation 'com.fasterxml.jackson.core:jackson-databind:2.11.1'
22+
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.11.1'
23+
implementation 'org.msgpack:jackson-dataformat-msgpack:0.8.20'
2424
if (project.IS_ANDROID) {
2525
implementation 'com.github.joshjdevl.libsodiumjni:libsodium-jni-aar:2.0.2'
26-
implementation 'org.web3j:core:4.2.0-android'
27-
implementation 'org.web3j:abi:4.2.0-android'
28-
implementation 'org.web3j:utils:4.2.0-android'
26+
implementation 'org.web3j:core:4.6.0-android'
27+
implementation 'org.web3j:abi:4.6.0-android'
28+
implementation 'org.web3j:utils:4.6.0-android'
2929
} else {
3030
implementation 'com.github.joshjdevl.libsodiumjni:libsodium-jni:2.0.2'
31-
implementation 'org.web3j:core:4.2.0'
32-
implementation 'org.web3j:abi:4.2.0'
33-
implementation 'org.web3j:utils:4.2.0'
34-
implementation 'org.json:json:20190722'
31+
implementation 'org.web3j:core:4.6.0'
32+
implementation 'org.web3j:abi:4.6.0'
33+
implementation 'org.web3j:utils:4.6.0'
34+
implementation 'org.json:json:20200518'
3535
}
3636
if (project.IS_NETTY) {
37-
implementation 'io.netty:netty-codec-http:4.1.34.Final'
38-
implementation 'io.netty:netty-handler:4.1.34.Final'
37+
implementation 'io.netty:netty-codec-http:4.1.50.Final'
38+
implementation 'io.netty:netty-handler:4.1.50.Final'
3939
}
4040
}
4141

autobahn/src/main/java/io/crossbar/autobahn/wamp/interfaces/ISerializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public List<Object> unserialize(byte[] payload, boolean isBinary) {
5151
}
5252
}
5353

54-
public <T> T convertValue(Object fromValue, TypeReference toValueTypeRef) {
54+
public <T> T convertValue(Object fromValue, TypeReference<T> toValueTypeRef) {
5555
// https://github.com/FasterXML/jackson-databind#tutorial-fancier-stuff-conversions
5656
// ResultType result = mapper.convertValue(sourceObject, ResultType.class);
5757
return mapper.convertValue(fromValue, toValueTypeRef);

autobahn/src/main/java/xbr/network/KeySeries.java

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.web3j.utils.Numeric;
2121

2222
import java.math.BigInteger;
23-
import java.security.SecureRandom;
2423
import java.util.HashMap;
2524
import java.util.Map;
2625
import java.util.Timer;

autobahn/src/main/java/xbr/network/Util.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,13 @@
1818
import org.web3j.crypto.ECKeyPair;
1919
import org.web3j.crypto.Keys;
2020
import org.web3j.crypto.Sign;
21+
import org.web3j.crypto.StructuredDataEncoder;
2122
import org.web3j.utils.Numeric;
2223

2324
import java.io.IOException;
2425
import java.math.BigInteger;
2526
import java.util.Arrays;
2627

27-
import xbr.network.web3.StructuredDataEncoder;
28-
2928
public class Util {
3029

3130
private static final String VERIFYING_ADDR = "0x254dffcd3277C0b1660F6d42EFbB754edaBAbC2B";
@@ -102,7 +101,7 @@ static byte[] signEIP712Data(ECKeyPair keyPair, byte[] channelAddr, int channelS
102101
byte[] result = new byte[65];
103102
System.arraycopy(r, 0, result, 0, r.length);
104103
System.arraycopy(s, 0, result, r.length, s.length);
105-
result[64] = signed.getV();
104+
result[64] = signed.getV()[0];
106105

107106
return result;
108107
}

autobahn/src/main/java/xbr/network/web3/Pair.java

-32
This file was deleted.

autobahn/src/main/java/xbr/network/web3/StructuredData.java

-128
This file was deleted.

0 commit comments

Comments
 (0)