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 diff --git a/app/build.gradle b/app/build.gradle index f9fdff800..20e337c69 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,30 +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.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:${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 23 - buildToolsVersion '25' + 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 23 - - ndk { - moduleName "libtranscode" - } + applicationId 'fr.free.nrw.commons' + minSdkVersion project.minSdkVersion + targetSdkVersion project.targetSdkVersion } buildTypes { @@ -50,4 +44,4 @@ android { disable 'ExtraTranslation' abortOnError false } -} +} \ No newline at end of file diff --git a/build.gradle b/build.gradle index 85084cc75..9f82985a4 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:${project.gradleVersion}" } } diff --git a/gradle.properties b/gradle.properties index d72861d28..8fc61a30f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,9 @@ -android.useDeprecatedNdk=true \ No newline at end of file +gradleVersion = 2.3.0 + +supportLibVersion = 25.2.0 + +compileSdkVersion = android-25 +buildToolsVersion = 25.0.1 + +minSdkVersion = 15 +targetSdkVersion = 25 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