From 3e5485210f89b55d51ff77d312bef9bb2e2bb5c3 Mon Sep 17 00:00:00 2001 From: Adam Jones Date: Wed, 8 Mar 2017 22:11:01 +0000 Subject: [PATCH] Update gradle and dependencies Updated gradle build tools to 2.3.0, updated android support libs to v25, updated targetSdkVersion to 25. Removed unused ndk libs, code that required it was removed several months ago. --- app/build.gradle | 14 +++++--------- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f9fdff800..1fcc17924 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,9 +12,9 @@ dependencies { compile 'ch.acra:acra:4.7.0' compile 'org.mediawiki:api:1.3' compile 'commons-codec:commons-codec:1.10' - compile 'com.android.support:support-v4:25.0.0' - compile 'com.android.support:appcompat-v7:25.0.0' - compile 'com.android.support:design:25.0.0' + compile 'com.android.support:support-v4:25.2.0' + compile 'com.android.support:appcompat-v7:25.2.0' + compile 'com.android.support:design:25.2.0' testCompile 'junit:junit:4.12' @@ -23,7 +23,7 @@ dependencies { } android { - compileSdkVersion 23 + compileSdkVersion 25 buildToolsVersion '25' useLibrary 'org.apache.http.legacy' @@ -31,11 +31,7 @@ android { defaultConfig { applicationId "fr.free.nrw.commons" minSdkVersion 15 - targetSdkVersion 23 - - ndk { - moduleName "libtranscode" - } + targetSdkVersion 25 } buildTypes { diff --git a/build.gradle b/build.gradle index 85084cc75..120b5e3e3 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:2.3.0' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6f96a4519..c9e341e9f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Aug 17 16:02:52 NZST 2016 +#Wed Mar 08 18:04:14 GMT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip