version 1.14.5 + changes

This commit is contained in:
Christian Schneppe 2016-10-26 22:49:57 +02:00
parent f749f0d5e7
commit 387a85d93a
2 changed files with 22 additions and 14 deletions

View file

@ -1,5 +1,10 @@
###Changelog ###Changelog
###Version 1.14.5
* error message accessible via context menu for failed messages
* don't include pgp signature in anonymous mucs
* bug fixes
###Version 1.14.4 ###Version 1.14.4
* make error notification dismissable * make error notification dismissable
* bug fixes * bug fixes

View file

@ -6,7 +6,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.2.0' classpath 'com.android.tools.build:gradle:2.2.1'
} }
} }
@ -75,16 +75,19 @@ android {
buildToolsVersion "23.0.3" buildToolsVersion "23.0.3"
defaultConfig { defaultConfig {
minSdkVersion 14 minSdkVersion 18
targetSdkVersion 24 targetSdkVersion 24
versionCode 170 versionCode 172
versionName "1.14.4"
versionName "1.14.5"
archivesBaseName += "-$versionName" archivesBaseName += "-$versionName"
applicationId "de.pixart.messenger" applicationId "de.pixart.messenger"
multiDexEnabled true multiDexEnabled true
ndk { buildConfigField("String", "XMPP_IP", '"185.26.156.37"')
moduleName = "Android" buildConfigField("Integer[]", "XMPP_Ports", "{61000, 65000}")
} buildConfigField("String", "DOMAIN_LOCK", '"pix-art.de"')
buildConfigField("String", "UPDATE_URL", '"http://xmpp.pix-art.de/Pix-Art_Messenger/update/"')
} }
dexOptions { dexOptions {
@ -101,6 +104,13 @@ android {
productFlavors { productFlavors {
playstore playstore
free free
open {
buildConfigField("String", "XMPP_IP", "null")
buildConfigField("Integer[]", "XMPP_Ports", "null")
buildConfigField("String", "DOMAIN_LOCK", "null")
buildConfigField("String", "UPDATE_URL", '"http://xmpp.pix-art.de/Pix-Art_Messenger/update/open/"')
applicationId "de.pixart.openmessenger"
}
} }
if (project.hasProperty('mStoreFile') && if (project.hasProperty('mStoreFile') &&
project.hasProperty('mStorePassword') && project.hasProperty('mStorePassword') &&
@ -117,14 +127,12 @@ android {
buildTypes { buildTypes {
debug { debug {
debuggable true debuggable true
jniDebuggable true
buildTypes.release.signingConfig = null buildTypes.release.signingConfig = null
//applicationIdSuffix ".debug" //applicationIdSuffix ".debug"
} }
release { release {
debuggable false debuggable false
jniDebuggable false
signingConfig = signingConfigs.release signingConfig = signingConfigs.release
minifyEnabled true minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
@ -132,11 +140,6 @@ android {
} }
} }
sourceSets.main {
jniLibs.srcDir 'libs'
jni.srcDirs = [] //disable automatic ndk-build call
}
lintOptions { lintOptions {
disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage', 'MissingQuantity', 'AppCompatResource' disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage', 'MissingQuantity', 'AppCompatResource'
} }