From 3e5485210f89b55d51ff77d312bef9bb2e2bb5c3 Mon Sep 17 00:00:00 2001 From: Adam Jones Date: Wed, 8 Mar 2017 22:11:01 +0000 Subject: [PATCH 1/5] 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 From ffcbe65ab26e3d39cf9e2946e3a7f4603a55fc64 Mon Sep 17 00:00:00 2001 From: Adam Jones Date: Wed, 8 Mar 2017 22:19:27 +0000 Subject: [PATCH 2/5] Remove NDK refrence in gradle.properties --- gradle.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d72861d28..e69de29bb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +0,0 @@ -android.useDeprecatedNdk=true \ No newline at end of file From 87927ea018536b5a55a123ed6b3ed5a305fcd9b4 Mon Sep 17 00:00:00 2001 From: Adam Jones Date: Thu, 9 Mar 2017 01:00:15 +0000 Subject: [PATCH 3/5] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0f3376e76..8c0af5731 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,10 @@ android: components: - platform-tools - tools - - build-tools-25.0.0 + - build-tools-25.0.1 - extra-google-m2repository - extra-android-m2repository - - android-23 + - android-25 - sys-img-x86-android-18 jdk: # - openjdk8 # not yet available From cd5d2122dae096498a4e91ebedc1e37079fe8d15 Mon Sep 17 00:00:00 2001 From: Adam Jones Date: Thu, 9 Mar 2017 01:00:41 +0000 Subject: [PATCH 4/5] Update build.gradle --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 1fcc17924..0d0605409 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,7 +24,7 @@ dependencies { android { compileSdkVersion 25 - buildToolsVersion '25' + buildToolsVersion '25.0.1' useLibrary 'org.apache.http.legacy' From 6c703184aa1136181600b124bd56954f804bc485 Mon Sep 17 00:00:00 2001 From: Adam Jones Date: Sun, 12 Mar 2017 11:03:52 +0000 Subject: [PATCH 5/5] Use gradle constants and update GSON --- app/build.gradle | 24 +++++++++++------------- build.gradle | 2 +- gradle.properties | 9 +++++++++ 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0d0605409..20e337c69 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,26 +12,24 @@ 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.2.0' - compile 'com.android.support:appcompat-v7:25.2.0' - compile 'com.android.support:design:25.2.0' + compile "com.android.support:support-v4:${project.supportLibVersion}" + compile "com.android.support:appcompat-v7:${project.supportLibVersion}" + compile "com.android.support:design:${project.supportLibVersion}" + compile 'com.google.code.gson:gson:2.7' testCompile 'junit:junit:4.12' - - //noinspection GradleDependency - old version has required feature - compile 'com.google.code.gson:gson:1.4' } android { - compileSdkVersion 25 - buildToolsVersion '25.0.1' + compileSdkVersion project.compileSdkVersion + buildToolsVersion project.buildToolsVersion - useLibrary 'org.apache.http.legacy' + useLibrary 'org.apache.http.legacy' defaultConfig { - applicationId "fr.free.nrw.commons" - minSdkVersion 15 - targetSdkVersion 25 + applicationId 'fr.free.nrw.commons' + minSdkVersion project.minSdkVersion + targetSdkVersion project.targetSdkVersion } buildTypes { @@ -46,4 +44,4 @@ android { disable 'ExtraTranslation' abortOnError false } -} +} \ No newline at end of file diff --git a/build.gradle b/build.gradle index 120b5e3e3..9f82985a4 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.0' + classpath "com.android.tools.build:gradle:${project.gradleVersion}" } } diff --git a/gradle.properties b/gradle.properties index e69de29bb..8fc61a30f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -0,0 +1,9 @@ +gradleVersion = 2.3.0 + +supportLibVersion = 25.2.0 + +compileSdkVersion = android-25 +buildToolsVersion = 25.0.1 + +minSdkVersion = 15 +targetSdkVersion = 25