From 2157a135d1ee9045e968303790427b0915a8e8c3 Mon Sep 17 00:00:00 2001 From: henry Date: Mon, 13 Nov 2017 20:18:40 -0400 Subject: [PATCH] updated app to use in studio 3.0 --- app/build.gradle | 27 +++++++++--------------- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 13 insertions(+), 20 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0186326..dcf9839 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,9 +1,8 @@ apply plugin: 'com.android.application' -apply plugin: 'com.neenbedankt.android-apt' android { compileSdkVersion 26 - buildToolsVersion "26.0.1" + buildToolsVersion '26.0.2' defaultConfig { applicationId "cy.agorise.crystalwallet" minSdkVersion 19 @@ -33,23 +32,17 @@ dependencies { exclude group: 'com.android.support', module: 'support-annotations' }) //testCompile 'com.android.support.test:runner:1.0.1' - - - - - - compile 'com.android.support:appcompat-v7:26.1.0' compile 'com.android.support:support-v4:26.1.0' compile 'com.android.support:design:26.1.0' compile 'com.android.support.constraint:constraint-layout:1.0.2' - compile 'android.arch.lifecycle:runtime:1.0.0-alpha9-1' - compile 'android.arch.lifecycle:extensions:1.0.0-alpha9-1' - compile 'android.arch.persistence.room:runtime:1.0.0-alpha9-1' - compile 'android.arch.paging:runtime:1.0.0-alpha1' + 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.2.4' - compile 'com.squareup.retrofit2:retrofit:2.1.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' @@ -58,7 +51,7 @@ dependencies { compile 'com.github.bilthon:graphenej:0.4.6-alpha1' testCompile 'junit:junit:4.12' testCompile 'org.mockito:mockito-core:1.10.19' - annotationProcessor 'android.arch.lifecycle:compiler:1.0.0-alpha9-1' - apt 'android.arch.persistence.room:compiler:1.0.0-alpha9-1' - apt 'com.jakewharton:butterknife-compiler:8.8.1' + 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' } diff --git a/build.gradle b/build.gradle index e25ab03..aad8aaa 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.0' 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 1b3af03..aa80552 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Aug 21 21:58:40 BRT 2017 +#Mon Nov 13 18:37:27 VET 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip