diff options
| author | lookshe <github@lookshe.org> | 2016-04-17 17:37:43 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-04-17 17:37:43 +0200 |
| commit | ad6208e53095e3a9870cdc0eae9b7c068a42829a (patch) | |
| tree | d5216f567722d4d6a959ab262c6cbef22f1931e7 /build.gradle | |
| parent | 1f81683d26eba69d7e4373bbda6295d5d7843777 (diff) | |
| parent | de7631e300eb9e578336d642dd279faecdb09391 (diff) | |
Merge branch 'trz/rebase' into trz/rename
Conflicts:
build.gradle
src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java
src/main/res/values-bg/strings.xml
src/main/res/values-cs/strings.xml
src/main/res/values-fr/strings.xml
src/main/res/values-ja/strings.xml
src/main/res/values-nl/strings.xml
src/main/res/values-pt/strings.xml
src/main/res/values-ro-rRO/strings.xml
src/main/res/values-sv/strings.xml
src/main/res/values-zh-rCN/strings.xml
src/main/res/values/strings.xml
Diffstat (limited to 'build.gradle')
| -rw-r--r-- | build.gradle | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/build.gradle b/build.gradle index 61162aba..b83cf66c 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 8 - versionName "0.0.7" + versionCode 9 + versionName "0.0.8" 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 |