aboutsummaryrefslogtreecommitdiffstats
path: root/build.gradle
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2016-04-18 19:58:40 +0200
committersteckbrief <steckbrief@chefmail.de>2016-04-18 19:58:40 +0200
commitee0264d98c9a348ea29d12796bed25f9ba1494fb (patch)
treecc559348547e504d37a6efa7826ea0120070babe /build.gradle
parentd94eb9309b4ab3ee1dfd3cee637b47a52223e15b (diff)
parent7df96caedbbb96a28d4f7e07fa2d159c8ca1373f (diff)
Merge branch 'master' into introduce_cplus_database_version
Conflicts: gradle/wrapper/gradle-wrapper.properties src/main/res/values/strings.xml
Diffstat (limited to 'build.gradle')
-rw-r--r--build.gradle16
1 files changed, 14 insertions, 2 deletions
diff --git a/build.gradle b/build.gradle
index 65e0a600..de4d418e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -57,6 +57,12 @@ dependencies {
compile 'com.android.support:support-v13:23.2.0'
}
+ext {
+ travisBuild = System.getenv("TRAVIS") == "true"
+ // allows for -Dpre-dex=false to be set
+ preDexEnabled = "true".equals(System.getProperty("pre-dex", "true"))
+}
+
android {
compileSdkVersion 23
buildToolsVersion "23.0.2"
@@ -64,9 +70,15 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 23
- versionCode 8
- versionName "0.0.7"
+ versionCode 9
+ versionName "0.0.8"
archivesBaseName += "-$versionName"
+ apply from: 'configuration.gradle'
+ }
+
+ dexOptions {
+ // Skip pre-dexing when running on Travis CI or when disabled via -Dpre-dex=false.
+ preDexLibraries = preDexEnabled && !travisBuild
}
compileOptions {