Skip to content

Commit

Permalink
Merge pull request #80 from hyperledger/55-updgade-to-bouncycastle
Browse files Browse the repository at this point in the history
55 - Upgrade to bouncycastle lib
  • Loading branch information
AntonKtrue authored Jul 22, 2021
2 parents 650e58d + 40d2f3e commit e3c21e1
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
8 changes: 5 additions & 3 deletions client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ repositories {
}

final def spockVersion = '1.2-groovy-2.4'
final def edSha3Version = '2.0.1'
final def edSha3Version = '2.1.0'
final def edDsaVersion = '0.3.0'
final def spockGenesisVersion = '0.6.0'
final def lombokVersion = '1.18.4'
Expand All @@ -23,7 +23,7 @@ final def objgenesisVersion = '3.0.1'

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

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

apply from: 'proto.gradle'

tasks.withType(JavaCompile) {
options.incremental = false
}
sonarqube {
properties {
property "sonar.projectKey", "${project.group}:${rootProject.name}.${project.name}"
Expand Down
2 changes: 1 addition & 1 deletion client/src/main/java/jp/co/soramitsu/iroha/java/Utils.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import java.util.stream.StreamSupport;
import javax.xml.bind.DatatypeConverter;
import lombok.val;
import org.spongycastle.jcajce.provider.digest.SHA3;
import org.bouncycastle.jcajce.provider.digest.SHA3;

public class Utils {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package jp.co.soramitsu.iroha.java.detail;

import com.google.protobuf.GeneratedMessageV3.Builder;
import org.spongycastle.jcajce.provider.digest.SHA3;
import org.bouncycastle.jcajce.provider.digest.SHA3;

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

Expand Down
4 changes: 3 additions & 1 deletion testcontainers/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ dependencies {

testCompile group: 'junit', name: 'junit', version: "${junitVersion}"
}

tasks.withType(JavaCompile) {
options.incremental = false
}
sonarqube {
properties {
property "sonar.projectKey", "${project.group}:${rootProject.name}.${project.name}"
Expand Down

0 comments on commit e3c21e1

Please sign in to comment.