From f56d942f7322b26be217882a6382b3a215b46734 Mon Sep 17 00:00:00 2001 From: Severiano Jaramillo Date: Thu, 7 Jun 2018 10:22:25 -0500 Subject: [PATCH] Update Gradle version to 3.1.2 and minor changes to app Gradle module --- app/build.gradle | 59 ++++++++++++------------ build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 3 files changed, 32 insertions(+), 33 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9e9c461..820f407 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,10 +2,9 @@ apply plugin: 'com.android.application' android { compileSdkVersion 26 - buildToolsVersion '26.0.2' defaultConfig { applicationId "cy.agorise.crystalwallet" - minSdkVersion 19 + minSdkVersion 21 targetSdkVersion 26 versionCode 1 versionName "0.1t.alpha" @@ -29,44 +28,44 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) + implementation fileTree(dir: 'libs', include: ['*.jar']) //androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { - 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' }) //testCompile 'com.android.support.test:runner:1.0.1' - compile 'com.android.support:appcompat-v7:26.0.2' - compile 'com.android.support:support-v4:26.0.2' - compile 'com.android.support:design:26.0.2' - compile 'com.android.support.constraint:constraint-layout:1.0.2' - compile 'android.arch.lifecycle:runtime:1.0.3' - compile 'android.arch.lifecycle:extensions:1.0.0' - compile 'android.arch.persistence.room:runtime:1.0.0' - compile 'android.arch.paging:runtime:1.0.0-alpha3' - compile 'com.idescout.sql:sqlscout-server:2.0' - compile 'com.google.code.gson:gson:2.8.0' - compile 'com.squareup.retrofit2:retrofit:2.2.0' - compile 'com.squareup.retrofit2:converter-gson:2.1.0' - compile 'org.bitcoinj:bitcoinj-core:0.14.3' - compile 'com.neovisionaries:nv-websocket-client:1.30' - compile 'org.tukaani:xz:1.6' - compile 'com.jakewharton:butterknife:8.8.1' - compile 'com.github.bilthon:graphenej:0.4.6' - compile 'com.google.zxing:core:3.3.1' - compile 'me.dm7.barcodescanner:zxing:1.9.8' + implementation 'com.android.support:appcompat-v7:26.1.0' + implementation 'com.android.support:support-v4:26.1.0' + implementation 'com.android.support:design:26.1.0' + implementation 'com.android.support.constraint:constraint-layout:1.0.2' + implementation 'android.arch.lifecycle:runtime:1.0.3' + implementation 'android.arch.lifecycle:extensions:1.0.0' + implementation 'android.arch.persistence.room:runtime:1.0.0' + implementation 'android.arch.paging:runtime:1.0.0-alpha3' + implementation 'com.idescout.sql:sqlscout-server:2.0' + implementation 'com.google.code.gson:gson:2.8.0' + implementation 'com.squareup.retrofit2:retrofit:2.2.0' + implementation 'com.squareup.retrofit2:converter-gson:2.1.0' + implementation 'org.bitcoinj:bitcoinj-core:0.14.3' + implementation 'com.neovisionaries:nv-websocket-client:1.30' + implementation 'org.tukaani:xz:1.6' + implementation 'com.jakewharton:butterknife:8.8.1' + implementation 'com.github.bilthon:graphenej:0.4.6' + implementation 'com.google.zxing:core:3.3.1' + implementation 'me.dm7.barcodescanner:zxing:1.9.8' - compile 'com.squareup.okhttp3:logging-interceptor:3.5.0' - compile 'de.hdodenhof:circleimageview:2.2.0' + implementation 'com.squareup.okhttp3:logging-interceptor:3.5.0' + implementation 'de.hdodenhof:circleimageview:2.2.0' // TODO check x86_64 //testCompile 'junit:junit: 4.12' - testCompile 'org.mockito:mockito-core:1.10.19' + testImplementation 'org.mockito:mockito-core:1.10.19' annotationProcessor 'android.arch.lifecycle:compiler:1.0.0' annotationProcessor 'android.arch.persistence.room:compiler:1.0.0' annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1' - compile 'com.squareup.picasso:picasso:2.5.2' + implementation 'com.squareup.picasso:picasso:2.5.2' implementation 'com.github.esafirm.android-image-picker:imagepicker:1.11.1' - compile 'id.zelory:compressor:2.1.0' - compile 'com.vincent.filepicker:MultiTypeFilePicker:1.0.7' - compile 'com.andrognito.patternlockview:patternlockview:1.0.0' + implementation 'id.zelory:compressor:2.1.0' + implementation 'com.vincent.filepicker:MultiTypeFilePicker:1.0.7' + implementation 'com.andrognito.patternlockview:patternlockview:1.0.0' } diff --git a/build.gradle b/build.gradle index 1062dac..6581a80 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.2' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index aa80552..8163bd9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Nov 13 18:37:27 VET 2017 +#Thu Jun 07 09:09:01 CDT 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip