From d06941bf4e0d61273ae3b9635a8380b5a0be1b2e Mon Sep 17 00:00:00 2001 From: steve greensill Date: Thu, 30 May 2019 12:15:01 +0200 Subject: [PATCH 1/2] updated gradle to 5.4.1 / corrected project name to produce a iost-java-sdk.jar instead of java.jar / added google gson lib --- build.gradle | 6 +++++- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index b58f4ca..c89ddbf 100644 --- a/build.gradle +++ b/build.gradle @@ -11,11 +11,15 @@ repositories { dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' - implementation 'com.squareup.retrofit2:converter-gson:2.4.0' + compile 'com.squareup.retrofit2:converter-gson:2.4.0' // https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.60' // https://mvnrepository.com/artifact/org.web3j/crypto compile group: 'org.web3j', name: 'crypto', version: '3.0.1' + + // https://mvnrepository.com/artifact/com.google.code.gson/gson + compile group: 'com.google.code.gson', name: 'gson', version: '2.7' + } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 144f721..2b712ef 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/settings.gradle b/settings.gradle index 42bb475..cedfcad 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ -rootProject.name = 'java' +rootProject.name = 'iost-java-sdk' From 8764380a118c565774e4502d966e093dc947ea22 Mon Sep 17 00:00:00 2001 From: steve greensill Date: Thu, 30 May 2019 12:28:58 +0200 Subject: [PATCH 2/2] replaced compile with implementation for dependencies / updated bcprov lib with EC fixes -see http://www.bouncycastle.org/releasenotes.html --- build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index c89ddbf..39c49f3 100644 --- a/build.gradle +++ b/build.gradle @@ -11,15 +11,15 @@ repositories { dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' - compile 'com.squareup.retrofit2:converter-gson:2.4.0' + implementation 'com.squareup.retrofit2:converter-gson:2.4.0' // https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on - compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.60' + implementation group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.61' // https://mvnrepository.com/artifact/org.web3j/crypto - compile group: 'org.web3j', name: 'crypto', version: '3.0.1' + implementation group: 'org.web3j', name: 'crypto', version: '3.0.1' // https://mvnrepository.com/artifact/com.google.code.gson/gson - compile group: 'com.google.code.gson', name: 'gson', version: '2.7' + implementation group: 'com.google.code.gson', name: 'gson', version: '2.7' }