sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "disable predexing on travis" 

This reverts commit ad063d00cc.
This commit is contained in:
Daniel Gultsch 2016-02-23 14:33:03 +01:00
parent ad063d00cc
commit 20eebe638b
2 changed files with 86 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -16,4 +16,4 @@ android:
licenses: licenses:
- '.+' - '.+'
script: script:
- ./gradlew assembleFreeRelease -PdisablePreDex - ./gradlew assembleFreeRelease

178
build.gradle
View File

@ -1,123 +1,115 @@
// Top-level build file where you can add configuration options common to all // Top-level build file where you can add configuration options common to all
// sub-projects/modules. // sub-projects/modules.
buildscript { buildscript {
repositories { repositories {
jcenter() jcenter()
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:1.5.0' classpath 'com.android.tools.build:gradle:1.5.0'
} }
} }
allprojects { allprojects {
repositories { repositories {
jcenter() jcenter()
mavenCentral() mavenCentral()
maven { maven {
url 'http://lorenzo.villani.me/android-cropimage/' url 'http://lorenzo.villani.me/android-cropimage/'
} }
} }
} }
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
repositories { repositories {
jcenter() jcenter()
mavenCentral() mavenCentral()
} }
configurations { configurations {
playstoreCompile playstoreCompile
} }
dependencies { dependencies {
compile project(':libs:MemorizingTrustManager') compile project(':libs:MemorizingTrustManager')
compile 'org.sufficientlysecure:openpgp-api:10.0' compile 'org.sufficientlysecure:openpgp-api:10.0'
compile 'com.soundcloud.android:android-crop:1.0.1@aar' compile 'com.soundcloud.android:android-crop:1.0.1@aar'
compile 'com.android.support:support-v13:23.1.1' compile 'com.android.support:support-v13:23.1.1'
compile 'org.bouncycastle:bcprov-jdk15on:1.52' compile 'org.bouncycastle:bcprov-jdk15on:1.52'
compile 'org.bouncycastle:bcmail-jdk15on:1.52' compile 'org.bouncycastle:bcmail-jdk15on:1.52'
compile 'org.jitsi:org.otr4j:0.22' compile 'org.jitsi:org.otr4j:0.22'
compile 'org.gnu.inet:libidn:1.15' compile 'org.gnu.inet:libidn:1.15'
compile 'com.google.zxing:core:3.2.1' compile 'com.google.zxing:core:3.2.1'
compile 'com.google.zxing:android-integration:3.2.1' compile 'com.google.zxing:android-integration:3.2.1'
compile 'de.measite.minidns:minidns:0.1.7' compile 'de.measite.minidns:minidns:0.1.7'
compile 'de.timroes.android:EnhancedListView:0.3.4' compile 'de.timroes.android:EnhancedListView:0.3.4'
compile 'me.leolin:ShortcutBadger:1.1.3@aar' compile 'me.leolin:ShortcutBadger:1.1.3@aar'
compile 'com.kyleduo.switchbutton:library:1.2.8' compile 'com.kyleduo.switchbutton:library:1.2.8'
compile 'org.whispersystems:axolotl-android:1.3.4' compile 'org.whispersystems:axolotl-android:1.3.4'
compile 'com.makeramen:roundedimageview:2.2.0' compile 'com.makeramen:roundedimageview:2.2.0'
playstoreCompile 'com.google.android.gms:play-services-gcm:8.3.0' playstoreCompile 'com.google.android.gms:play-services-gcm:8.3.0'
} }
android { android {
compileSdkVersion 23 compileSdkVersion 23
buildToolsVersion "23.0.2" buildToolsVersion "23.0.2"
defaultConfig { defaultConfig {
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 23 targetSdkVersion 23
versionCode 127 versionCode 127
versionName "1.10.0" versionName "1.10.0"
archivesBaseName += "-$versionName" archivesBaseName += "-$versionName"
applicationId "eu.siacs.conversations" applicationId "eu.siacs.conversations"
} }
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7 sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7 targetCompatibility JavaVersion.VERSION_1_7
} }
productFlavors { productFlavors {
playstore playstore
free free
} }
if (project.hasProperty('mStoreFile') && if (project.hasProperty('mStoreFile') &&
project.hasProperty('mStorePassword') && project.hasProperty('mStorePassword') &&
project.hasProperty('mKeyAlias') && project.hasProperty('mKeyAlias') &&
project.hasProperty('mKeyPassword')) { project.hasProperty('mKeyPassword')) {
signingConfigs { signingConfigs {
release { release {
storeFile file(mStoreFile) storeFile file(mStoreFile)
storePassword mStorePassword storePassword mStorePassword
keyAlias mKeyAlias keyAlias mKeyAlias
keyPassword mKeyPassword keyPassword mKeyPassword
} }
} }
buildTypes.release.signingConfig = signingConfigs.release buildTypes.release.signingConfig = signingConfigs.release
} else { } else {
buildTypes.release.signingConfig = null buildTypes.release.signingConfig = null
} }
lintOptions { lintOptions {
disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage', 'MissingQuantity', 'AppCompatResource' disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage', 'MissingQuantity', 'AppCompatResource'
} }
subprojects { subprojects {
afterEvaluate { afterEvaluate {
if (getPlugins().hasPlugin('android') || if (getPlugins().hasPlugin('android') ||
getPlugins().hasPlugin('android-library')) { getPlugins().hasPlugin('android-library')) {
configure(android.lintOptions) { configure(android.lintOptions) {
disable 'AndroidGradlePluginVersion', 'MissingTranslation' disable 'AndroidGradlePluginVersion', 'MissingTranslation'
} }
} }
} }
}
project.plugins.whenPluginAdded { plugin -> packagingOptions {
if ("com.android.build.gradle.AppPlugin".equals(plugin.class.name)) { exclude 'META-INF/BCKEY.DSA'
project.android.dexOptions.preDexLibraries = !project.hasProperty('disablePreDex') exclude 'META-INF/BCKEY.SF'
} else if ("com.android.build.gradle.LibraryPlugin".equals(plugin.class.name)) { }
project.android.dexOptions.preDexLibraries = !project.hasProperty('disablePreDex')
}
}
}
packagingOptions {
exclude 'META-INF/BCKEY.DSA'
exclude 'META-INF/BCKEY.SF'
}
} }