From 51439bbf33fa7fc66fcd452aa18716c543359a55 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Fri, 21 Apr 2017 12:03:54 +0200 Subject: [PATCH] upgrade libraries --- app/build.gradle | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 985ecf359c..0d9ffed984 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -36,13 +36,13 @@ def generateGitBuild = { -> } android { - compileSdkVersion 23 + compileSdkVersion 25 buildToolsVersion "25.0.2" defaultConfig { applicationId "info.nightscout.androidaps" minSdkVersion 21 - targetSdkVersion 23 + targetSdkVersion 25 versionCode 1400 version "1.4" buildConfigField "String", "VERSION", '"' + version + '"' @@ -147,13 +147,13 @@ dependencies { transitive = true; } - compile 'com.android.support:appcompat-v7:23.4.0' - compile 'com.android.support:support-v4:23.4.0' - compile 'com.android.support:cardview-v7:23.4.0' - compile 'com.android.support:recyclerview-v7:23.4.0' - compile 'com.android.support:gridlayout-v7:23.4.0' - compile "com.android.support:design:23.4.0" - compile "com.android.support:percent:23.4.0" + compile 'com.android.support:appcompat-v7:25.3.1' + compile 'com.android.support:support-v4:25.3.1' + compile 'com.android.support:cardview-v7:25.3.1' + compile 'com.android.support:recyclerview-v7:25.3.1' + compile 'com.android.support:gridlayout-v7:25.3.1' + compile "com.android.support:design:25.3.1" + compile "com.android.support:percent:25.3.1" compile 'com.wdullaer:materialdatetimepicker:2.3.0' compile 'com.squareup:otto:1.3.7' compile 'com.j256.ormlite:ormlite-core:4.46' @@ -168,8 +168,8 @@ dependencies { compile 'com.google.android.gms:play-services-wearable:7.5.0' compile 'junit:junit:4.12' testCompile 'org.json:json:20140107' - testCompile 'org.mockito:mockito-core:2.+' - androidTestCompile 'org.mockito:mockito-core:2.+' + testCompile 'org.mockito:mockito-core:2.7.22' + androidTestCompile 'org.mockito:mockito-core:2.7.22' androidTestCompile 'com.google.dexmaker:dexmaker:1.2' androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2' compile(name: 'android-edittext-validator-v1.3.4-mod', ext: 'aar') @@ -177,8 +177,8 @@ dependencies { // excluding org.json which is provided by Android exclude group: 'org.json', module: 'json' } - compile 'com.google.code.gson:gson:2.4' - compile 'com.google.guava:guava:18.0' + compile 'com.google.code.gson:gson:2.7' + compile 'com.google.guava:guava:20.0' compile ('com.jakewharton:butterknife:8.5.1') { exclude module: 'support-compat'