From 6297ec5b90c9662f989bd6868c39803179b3a282 Mon Sep 17 00:00:00 2001 From: Sergey Solovyev Date: Thu, 25 May 2017 15:16:37 +0200 Subject: [PATCH] Update project dependencies and drop old Android versions --- app/build.gradle | 3 +-- build.gradle | 6 +++--- dragbutton/build.gradle | 1 - jscl/build.gradle | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d73a9c1e..6034fc72 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -61,7 +61,6 @@ android { sourceCompatibility JavaVersion.VERSION_1_7 targetCompatibility JavaVersion.VERSION_1_7 } - buildToolsVersion '25.0.0' } dependencies { @@ -86,7 +85,7 @@ dependencies { compile "com.google.android.gms:play-services-base:${versions.gpsLib}" compile "com.google.android.gms:play-services-analytics:${versions.gpsLib}" compile(name: 'plotter', ext: 'aar') - compile 'com.google.guava:guava:19.0' + compile 'com.google.guava:guava:20.0' compile('org.simpleframework:simple-xml:2.6.1') { exclude(module: 'stax') exclude(module: 'stax-api') diff --git a/build.gradle b/build.gradle index e1c2c7ad..792cf1d1 100644 --- a/build.gradle +++ b/build.gradle @@ -8,9 +8,9 @@ buildscript { } ext { - versions = [supportLib: "24.2.0", - gpsLib : "9.4.0", - sdk : [compile: 25, buildTools: "25.0.3", min: 9, target: 25]] + versions = [supportLib: "25.3.1", + gpsLib : "10.2.6", + sdk : [compile: 25, buildTools: "25.0.3", min: 19, target: 25]] } } diff --git a/dragbutton/build.gradle b/dragbutton/build.gradle index e9e5d64d..6ca31d29 100644 --- a/dragbutton/build.gradle +++ b/dragbutton/build.gradle @@ -15,7 +15,6 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - buildToolsVersion '25.0.0' } dependencies { diff --git a/jscl/build.gradle b/jscl/build.gradle index a6643480..6728e968 100644 --- a/jscl/build.gradle +++ b/jscl/build.gradle @@ -26,7 +26,7 @@ dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') compile 'com.google.code.findbugs:annotations:2.0.1' compile 'xerces:xercesImpl:2.8.0' - compile 'com.google.guava:guava:19.0' + compile 'com.google.guava:guava:20.0' testCompile 'junit:junit:4.12' testCompile 'net.sf.opencsv:opencsv:2.0'