Use gradle constants and update GSON

This commit is contained in:
Adam Jones 2017-03-12 11:03:52 +00:00 committed by veyndan
parent cd5d2122da
commit 6c703184aa
3 changed files with 21 additions and 14 deletions

View file

@ -12,26 +12,24 @@ dependencies {
compile 'ch.acra:acra:4.7.0' compile 'ch.acra:acra:4.7.0'
compile 'org.mediawiki:api:1.3' compile 'org.mediawiki:api:1.3'
compile 'commons-codec:commons-codec:1.10' compile 'commons-codec:commons-codec:1.10'
compile 'com.android.support:support-v4:25.2.0' compile "com.android.support:support-v4:${project.supportLibVersion}"
compile 'com.android.support:appcompat-v7:25.2.0' compile "com.android.support:appcompat-v7:${project.supportLibVersion}"
compile 'com.android.support:design:25.2.0' compile "com.android.support:design:${project.supportLibVersion}"
compile 'com.google.code.gson:gson:2.7'
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
//noinspection GradleDependency - old version has required feature
compile 'com.google.code.gson:gson:1.4'
} }
android { android {
compileSdkVersion 25 compileSdkVersion project.compileSdkVersion
buildToolsVersion '25.0.1' buildToolsVersion project.buildToolsVersion
useLibrary 'org.apache.http.legacy' useLibrary 'org.apache.http.legacy'
defaultConfig { defaultConfig {
applicationId "fr.free.nrw.commons" applicationId 'fr.free.nrw.commons'
minSdkVersion 15 minSdkVersion project.minSdkVersion
targetSdkVersion 25 targetSdkVersion project.targetSdkVersion
} }
buildTypes { buildTypes {
@ -46,4 +44,4 @@ android {
disable 'ExtraTranslation' disable 'ExtraTranslation'
abortOnError false abortOnError false
} }
} }

View file

@ -5,7 +5,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.0' classpath "com.android.tools.build:gradle:${project.gradleVersion}"
} }
} }

View file

@ -0,0 +1,9 @@
gradleVersion = 2.3.0
supportLibVersion = 25.2.0
compileSdkVersion = android-25
buildToolsVersion = 25.0.1
minSdkVersion = 15
targetSdkVersion = 25