agorise/graphenej
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Gradle update

Browse source
This commit is contained in:
Nelson R. Perez 2018-05-03 12:27:12 -05:00
parent 87421e210c
commit 636de75fb8
4 changed files with 43 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build.gradle
View file

@ -19,8 +19,9 @@ buildscript {
url 'https://maven.google.com/' url 'https://maven.google.com/'
name 'Google' name 'Google'
} }
google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.0' classpath 'com.android.tools.build:gradle:3.1.2'
} }
} }

58
graphenej/build.gradle
View file

@ -7,7 +7,7 @@ apply from: 'maven-push.gradle'
android { android {
compileSdkVersion 24 compileSdkVersion 24
buildToolsVersion "25.0.0" buildToolsVersion '27.0.3'
defaultConfig { defaultConfig {
minSdkVersion 14 minSdkVersion 14
@ -25,35 +25,35 @@ android {
} }
dependencies { dependencies {
testCompile group: 'junit', name: 'junit', version: '4.12' testImplementation group: 'junit', name: 'junit', version: '4.12'
compile 'com.neovisionaries:nv-websocket-client:1.30' implementation 'com.neovisionaries:nv-websocket-client:1.30'
compile 'org.bitcoinj:bitcoinj-core:0.14.3' implementation 'org.bitcoinj:bitcoinj-core:0.14.3'
compile group: 'com.google.code.gson', name: 'gson', version: '2.8.0' implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.0'
compile group: "org.tukaani", name: "xz", version: "1.6" implementation group: "org.tukaani", name: "xz", version: "1.6"
// Rx dependencies // Rx dependencies
compile 'io.reactivex.rxjava2:rxandroid:2.0.2' implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
compile 'io.reactivex.rxjava2:rxjava:2.1.9' implementation 'io.reactivex.rxjava2:rxjava:2.1.9'
compile 'com.jakewharton.rxrelay2:rxrelay:2.0.0' implementation 'com.jakewharton.rxrelay2:rxrelay:2.0.0'
compile 'com.squareup.okhttp3:okhttp:3.5.0' implementation 'com.squareup.okhttp3:okhttp:3.5.0'
} }
task sourcesJar(type: Jar) { //task sourcesJar(type: Jar) {
from android.sourceSets.main.java.srcDirs // from android.sourceSets.main.java.srcDirs
classifier = 'sources' // classifier = 'sources'
} //}
//
task javadoc(type: Javadoc) { //task javadoc(type: Javadoc) {
source = android.sourceSets.main.java.srcDirs // source = android.sourceSets.main.java.srcDirs
classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) // classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
} //}
//
task javadocJar(type: Jar, dependsOn: javadoc) { //task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc' // classifier = 'javadoc'
from javadoc.destinationDir // from javadoc.destinationDir
} //}
//
artifacts { //artifacts {
archives javadocJar // archives javadocJar
archives sourcesJar // archives sourcesJar
} //}

2
graphenej/src/main/java/cy/agorise/graphenej/models/ApiCall.java
View file

@ -19,6 +19,7 @@ import cy.agorise.graphenej.interfaces.JsonSerializable;
* @see <a href="http://docs.bitshares.org/api/websocket.html">Websocket Calls & Notifications</a> * @see <a href="http://docs.bitshares.org/api/websocket.html">Websocket Calls & Notifications</a>
*/ */
public class ApiCall implements JsonSerializable { public class ApiCall implements JsonSerializable {
public static final String KEY_SEQUENCE_ID = "id"; public static final String KEY_SEQUENCE_ID = "id";
public static final String KEY_METHOD = "method"; public static final String KEY_METHOD = "method";
public static final String KEY_PARAMS = "params"; public static final String KEY_PARAMS = "params";
@ -65,7 +66,6 @@ public class ApiCall implements JsonSerializable {
paramsArray.add(this.apiId); paramsArray.add(this.apiId);
paramsArray.add(this.methodToCall); paramsArray.add(this.methodToCall);
JsonArray methodParams = new JsonArray(); JsonArray methodParams = new JsonArray();
if(this.params != null){ if(this.params != null){
for(int i = 0; i < this.params.size(); i++){ for(int i = 0; i < this.params.size(); i++){
if(this.params.get(i) instanceof JsonSerializable) { if(this.params.get(i) instanceof JsonSerializable) {

21
sample/build.gradle
View file

@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
android { android {
compileSdkVersion 26 compileSdkVersion 26
buildToolsVersion "27.0.0"
defaultConfig { defaultConfig {
@ -25,16 +24,18 @@ android {
} }
dependencies { dependencies {
compile fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
compile project(':graphenej') api project(':graphenej')
compile 'com.android.support:appcompat-v7:26.1.0' implementation 'com.android.support:appcompat-v7:26.1.0'
compile 'com.android.support.constraint:constraint-layout:1.0.2' implementation 'com.android.support.constraint:constraint-layout:1.0.2'
compile 'com.jakewharton.rxbinding2:rxbinding:2.1.1' implementation 'com.jakewharton.rxbinding2:rxbinding:2.1.1'
compile 'com.jakewharton:butterknife:8.8.1' implementation 'com.jakewharton:butterknife:8.8.1'
implementation 'com.google.code.gson:gson:2.8.4'
implementation 'com.google.guava:guava:25.0-jre'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1' annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
testCompile 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
androidTestCompile('com.android.support.test.espresso:espresso-core:3.0.1', { androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.1', {
exclude group: 'com.android.support', module: 'support-annotations' exclude group: 'com.android.support', module: 'support-annotations'
}) })
compile 'com.android.support:multidex:1.0.1' implementation 'com.android.support:multidex:1.0.1'
} }