Build files simplified
This commit is contained in:
parent
e7b2e584bb
commit
4551564e63
@ -25,13 +25,13 @@ apply plugin: 'maven'
|
||||
apply plugin: 'signing'
|
||||
|
||||
android {
|
||||
compileSdkVersion android_sdk_version()
|
||||
buildToolsVersion android_build_tools_version()
|
||||
compileSdkVersion 23
|
||||
buildToolsVersion '23.0.2'
|
||||
defaultConfig {
|
||||
minSdkVersion android_min_sdk_version()
|
||||
targetSdkVersion android_sdk_version()
|
||||
versionCode version_code()
|
||||
versionName version_name()
|
||||
minSdkVersion 15
|
||||
targetSdkVersion 23
|
||||
versionCode 143
|
||||
versionName '2.1.4'
|
||||
}
|
||||
buildTypes {
|
||||
release {
|
||||
@ -54,12 +54,6 @@ android {
|
||||
}
|
||||
}
|
||||
|
||||
repositories {
|
||||
flatDir {
|
||||
dirs 'misc/libs'
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile fileTree(include: ['*.jar'], dir: 'libs')
|
||||
compile 'org.solovyev:common-core:1.0.7'
|
||||
@ -103,7 +97,7 @@ dependencies {
|
||||
exclude(module: 'xpp3')
|
||||
}
|
||||
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 'org.mockito:mockito-core:1.9.0'
|
||||
testCompile 'org.robolectric:robolectric:3.0'
|
||||
@ -173,7 +167,7 @@ private void cleanGoogleServicesResources(buildType) {
|
||||
}
|
||||
|
||||
group = "org.solovyev.android"
|
||||
version = version_name()
|
||||
version = android.defaultConfig.versionName
|
||||
|
||||
uploadArchives {
|
||||
repositories {
|
||||
@ -220,7 +214,3 @@ uploadArchives {
|
||||
}
|
||||
}
|
||||
}
|
||||
dependencies {
|
||||
testCompile 'junit:junit:4.12'
|
||||
testCompile 'junit:junit:4.12'
|
||||
}
|
24
build.gradle
24
build.gradle
@ -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 {
|
||||
repositories {
|
||||
jcenter()
|
||||
@ -42,5 +22,9 @@ allprojects {
|
||||
maven {
|
||||
url "$userHome/.m2/repository/"
|
||||
}
|
||||
|
||||
flatDir {
|
||||
dirs 'misc/libs'
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user