Conflicts: CHANGELOG.md README.md art/render.rb build.gradle src/main/java/eu/siacs/conversations/Config.java src/main/java/eu/siacs/conversations/crypto/OtrService.java src/main/java/eu/siacs/conversations/crypto/PgpEngine.java src/main/java/eu/siacs/conversations/entities/Account.java src/main/java/eu/siacs/conversations/entities/Contact.java src/main/java/eu/siacs/conversations/entities/DownloadableFile.java src/main/java/eu/siacs/conversations/entities/Message.java src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/generator/IqGenerator.java src/main/java/eu/siacs/conversations/generator/MessageGenerator.java src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java src/main/java/eu/siacs/conversations/parser/AbstractParser.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java src/main/java/eu/siacs/conversations/persistance/FileBackend.java src/main/java/eu/siacs/conversations/services/NotificationService.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ConversationActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/CryptoHelper.java src/main/java/eu/siacs/conversations/utils/DNSHelper.java src/main/java/eu/siacs/conversations/utils/MimeUtils.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java src/main/res/layout/account_row.xml src/main/res/layout/activity_edit_account.xml src/main/res/layout/activity_muc_details.xml src/main/res/layout/contact.xml src/main/res/layout/contact_key.xml src/main/res/layout/conversation_list_row.xml src/main/res/layout/fragment_conversation.xml src/main/res/layout/message_received.xml src/main/res/layout/message_sent.xml src/main/res/values-bg/strings.xml src/main/res/values-ca/strings.xml src/main/res/values-cs/strings.xml src/main/res/values-de/strings.xml src/main/res/values-el/strings.xml src/main/res/values-es/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-id/strings.xml src/main/res/values-it/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-ko/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-pt/strings.xml src/main/res/values-ru/strings.xml src/main/res/values-sk/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-v21/themes.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/arrays.xml src/main/res/values/colors.xml src/main/res/values/dimens.xml src/main/res/values/strings.xml src/main/res/xml/preferences.xml
117 lines
2.9 KiB
Groovy
117 lines
2.9 KiB
Groovy
// Top-level build file where you can add configuration options common to all
|
|
// sub-projects/modules.
|
|
buildscript {
|
|
repositories {
|
|
jcenter()
|
|
mavenCentral()
|
|
}
|
|
dependencies {
|
|
classpath 'com.android.tools.build:gradle:1.2.3'
|
|
}
|
|
}
|
|
|
|
allprojects {
|
|
repositories {
|
|
jcenter()
|
|
mavenCentral()
|
|
}
|
|
}
|
|
|
|
apply plugin: 'com.android.application'
|
|
|
|
repositories {
|
|
jcenter()
|
|
mavenCentral()
|
|
}
|
|
|
|
dependencies {
|
|
compile project(':libs:openpgp-api-lib')
|
|
compile project(':libs:MemorizingTrustManager')
|
|
compile 'com.android.support:support-v13:21.0.3'
|
|
compile 'org.bouncycastle:bcprov-jdk15on:1.51'
|
|
compile 'org.jitsi:org.otr4j:0.22'
|
|
compile 'org.gnu.inet:libidn:1.15'
|
|
compile 'com.google.zxing:core:3.1.0'
|
|
compile 'com.google.zxing:android-integration:3.1.0'
|
|
compile 'de.measite.minidns:minidns:0.1.3'
|
|
compile 'de.timroes.android:EnhancedListView:0.3.4'
|
|
compile 'me.leolin:ShortcutBadger:1.1.3@aar'
|
|
compile 'com.kyleduo.switchbutton:library:1.2.8'
|
|
compile 'org.whispersystems:axolotl-android:1.3.4'
|
|
compile 'com.makeramen:roundedimageview:2.1.1'
|
|
compile project(':libs:emojicon')
|
|
compile project(':libs:colorpicker')
|
|
}
|
|
|
|
android {
|
|
compileSdkVersion 22
|
|
buildToolsVersion "22.0.1"
|
|
|
|
defaultConfig {
|
|
minSdkVersion 14
|
|
targetSdkVersion 21
|
|
versionCode 65
|
|
versionName "1.6.3.1"
|
|
}
|
|
|
|
compileOptions {
|
|
sourceCompatibility JavaVersion.VERSION_1_7
|
|
targetCompatibility JavaVersion.VERSION_1_7
|
|
}
|
|
|
|
//
|
|
// To sign release builds, create the file `gradle.properties` in
|
|
// $HOME/.gradle or in your project directory with this content:
|
|
//
|
|
// mStoreFile=/path/to/key.store
|
|
// mStorePassword=xxx
|
|
// mKeyAlias=alias
|
|
// mKeyPassword=xxx
|
|
//
|
|
if (project.hasProperty('mStoreFile') &&
|
|
project.hasProperty('mStorePassword') &&
|
|
project.hasProperty('mKeyAlias') &&
|
|
project.hasProperty('mKeyPassword')) {
|
|
signingConfigs {
|
|
release {
|
|
storeFile file(mStoreFile)
|
|
storePassword mStorePassword
|
|
keyAlias mKeyAlias
|
|
keyPassword mKeyPassword
|
|
}
|
|
}
|
|
buildTypes.release.signingConfig = signingConfigs.release
|
|
} else {
|
|
buildTypes.release.signingConfig = null
|
|
}
|
|
|
|
applicationVariants.all { variant ->
|
|
if (variant.name.equals('release')) {
|
|
variant.outputs.each { output ->
|
|
if (output.zipAlign != null) {
|
|
output.zipAlign.outputFile = new File(output.outputFile.parent, rootProject.name + "-${variant.versionName}.apk")
|
|
}
|
|
output.packageApplication.outputFile = new File(output.outputFile.parent, output.packageApplication.outputFile.name
|
|
.replace(".apk", "-${variant.versionName}.apk"))
|
|
}
|
|
}
|
|
}
|
|
|
|
lintOptions {
|
|
disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage', 'MissingQuantity', 'AppCompatResource'
|
|
}
|
|
|
|
subprojects {
|
|
|
|
afterEvaluate {
|
|
if (getPlugins().hasPlugin('android') ||
|
|
getPlugins().hasPlugin('android-library')) {
|
|
|
|
configure(android.lintOptions) {
|
|
disable 'AndroidGradlePluginVersion', 'MissingTranslation'
|
|
}
|
|
}
|
|
|
|
}
|
|
}
|
|
}
|