Build files simplified

This commit is contained in:
serso 2016-01-06 12:38:39 +01:00
parent e7b2e584bb
commit 4551564e63
2 changed files with 12 additions and 38 deletions

View File

@ -25,13 +25,13 @@ apply plugin: 'maven'
apply plugin: 'signing' apply plugin: 'signing'
android { android {
compileSdkVersion android_sdk_version() compileSdkVersion 23
buildToolsVersion android_build_tools_version() buildToolsVersion '23.0.2'
defaultConfig { defaultConfig {
minSdkVersion android_min_sdk_version() minSdkVersion 15
targetSdkVersion android_sdk_version() targetSdkVersion 23
versionCode version_code() versionCode 143
versionName version_name() versionName '2.1.4'
} }
buildTypes { buildTypes {
release { release {
@ -54,12 +54,6 @@ android {
} }
} }
repositories {
flatDir {
dirs 'misc/libs'
}
}
dependencies { dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs') compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'org.solovyev:common-core:1.0.7' compile 'org.solovyev:common-core:1.0.7'
@ -103,7 +97,7 @@ dependencies {
exclude(module: 'xpp3') exclude(module: 'xpp3')
} }
compile 'commons-cli:commons-cli:1.2' compile 'commons-cli:commons-cli:1.2'
testCompile 'junit:junit:4.11' testCompile 'junit:junit:4.12'
testCompile 'net.sf.opencsv:opencsv:2.0' testCompile 'net.sf.opencsv:opencsv:2.0'
testCompile 'org.mockito:mockito-core:1.9.0' testCompile 'org.mockito:mockito-core:1.9.0'
testCompile 'org.robolectric:robolectric:3.0' testCompile 'org.robolectric:robolectric:3.0'
@ -173,7 +167,7 @@ private void cleanGoogleServicesResources(buildType) {
} }
group = "org.solovyev.android" group = "org.solovyev.android"
version = version_name() version = android.defaultConfig.versionName
uploadArchives { uploadArchives {
repositories { repositories {
@ -219,8 +213,4 @@ uploadArchives {
} }
} }
} }
}
dependencies {
testCompile 'junit:junit:4.12'
testCompile 'junit:junit:4.12'
} }

View File

@ -1,23 +1,3 @@
public int version_code() {
return 143
}
public String version_name() {
return '2.1.4'
}
public int android_sdk_version() {
return 23
}
public String android_build_tools_version() {
return '23.0.2'
}
public String android_min_sdk_version() {
return 9
}
buildscript { buildscript {
repositories { repositories {
jcenter() jcenter()
@ -42,5 +22,9 @@ allprojects {
maven { maven {
url "$userHome/.m2/repository/" url "$userHome/.m2/repository/"
} }
flatDir {
dirs 'misc/libs'
}
} }
} }