aboutsummaryrefslogtreecommitdiffstats
path: root/build.gradle
diff options
context:
space:
mode:
Diffstat (limited to 'build.gradle')
-rw-r--r--build.gradle17
1 files changed, 14 insertions, 3 deletions
diff --git a/build.gradle b/build.gradle
index b7f8f9c9..7f2ecaf8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.5.0'
+ classpath 'com.android.tools.build:gradle:2.0.0'
}
}
@@ -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,11 +70,16 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 23
- versionCode 136
- versionName "beta-2"
+ versionCode 140
+ versionName "1.11.7"
archivesBaseName += "-$versionName"
}
+ dexOptions {
+ // Skip pre-dexing when running on Travis CI or when disabled via -Dpre-dex=false.
+ preDexLibraries = preDexEnabled && !travisBuild
+ }
+
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7