From 4551564e6309bee615b0a3ce492f0c16f8dee6ba Mon Sep 17 00:00:00 2001 From: serso Date: Wed, 6 Jan 2016 12:38:39 +0100 Subject: [PATCH] Build files simplified --- app/build.gradle | 26 ++++++++------------------ build.gradle | 24 ++++-------------------- 2 files changed, 12 insertions(+), 38 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0fdd2653..79d42ea8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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 { @@ -219,8 +213,4 @@ uploadArchives { } } } -} -dependencies { - testCompile 'junit:junit:4.12' - testCompile 'junit:junit:4.12' } \ No newline at end of file diff --git a/build.gradle b/build.gradle index 022b3dd6..2d950b68 100644 --- a/build.gradle +++ b/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' + } } } \ No newline at end of file