Skip to content

Commit e3c21e1

Browse files
authored
Merge pull request #80 from hyperledger/55-updgade-to-bouncycastle
55 - Upgrade to bouncycastle lib
2 parents 650e58d + 40d2f3e commit e3c21e1

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

client/build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repositories {
1010
}
1111

1212
final def spockVersion = '1.2-groovy-2.4'
13-
final def edSha3Version = '2.0.1'
13+
final def edSha3Version = '2.1.0'
1414
final def edDsaVersion = '0.3.0'
1515
final def spockGenesisVersion = '0.6.0'
1616
final def lombokVersion = '1.18.4'
@@ -23,7 +23,7 @@ final def objgenesisVersion = '3.0.1'
2323

2424
dependencies {
2525
compile "io.reactivex.rxjava2:rxjava:${rxjavaVersion}"
26-
compile "com.github.warchant:ed25519-sha3-java:${edSha3Version}"
26+
compile "com.github.soramitsu:ed25519-sha3-java:${edSha3Version}"
2727
compile "net.i2p.crypto:eddsa:${edDsaVersion}"
2828

2929
compileOnly("org.projectlombok:lombok:$lombokVersion")
@@ -46,7 +46,9 @@ dependencies {
4646
}
4747

4848
apply from: 'proto.gradle'
49-
49+
tasks.withType(JavaCompile) {
50+
options.incremental = false
51+
}
5052
sonarqube {
5153
properties {
5254
property "sonar.projectKey", "${project.group}:${rootProject.name}.${project.name}"

client/src/main/java/jp/co/soramitsu/iroha/java/Utils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import java.util.stream.StreamSupport;
1717
import javax.xml.bind.DatatypeConverter;
1818
import lombok.val;
19-
import org.spongycastle.jcajce.provider.digest.SHA3;
19+
import org.bouncycastle.jcajce.provider.digest.SHA3;
2020

2121
public class Utils {
2222

client/src/main/java/jp/co/soramitsu/iroha/java/detail/Hashable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package jp.co.soramitsu.iroha.java.detail;
22

33
import com.google.protobuf.GeneratedMessageV3.Builder;
4-
import org.spongycastle.jcajce.provider.digest.SHA3;
4+
import org.bouncycastle.jcajce.provider.digest.SHA3;
55

66
public abstract class Hashable<T extends Builder<T>> {
77

testcontainers/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ dependencies {
4949

5050
testCompile group: 'junit', name: 'junit', version: "${junitVersion}"
5151
}
52-
52+
tasks.withType(JavaCompile) {
53+
options.incremental = false
54+
}
5355
sonarqube {
5456
properties {
5557
property "sonar.projectKey", "${project.group}:${rootProject.name}.${project.name}"

0 commit comments

Comments
 (0)