diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-10-26 22:49:57 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-10-26 22:52:05 +0200 |
| commit | 387a85d93af2b673cbb8ba00991cf7b061031403 (patch) | |
| tree | 423b6d1cc64dad1f81bb250ec4271059bc2b7cb7 | |
| parent | f749f0d5e7a713430c8bc245cbccdea6ff182ab8 (diff) | |
version 1.14.5 + changes
Diffstat (limited to '')
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | build.gradle | 31 |
2 files changed, 22 insertions, 14 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 9940dc0aa..53d123586 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ ###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 * make error notification dismissable * bug fixes diff --git a/build.gradle b/build.gradle index 632a7b25d..25c56d08d 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } 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" defaultConfig { - minSdkVersion 14 + minSdkVersion 18 targetSdkVersion 24 - versionCode 170 - versionName "1.14.4" + versionCode 172 + + versionName "1.14.5" + archivesBaseName += "-$versionName" applicationId "de.pixart.messenger" multiDexEnabled true - ndk { - moduleName = "Android" - } + buildConfigField("String", "XMPP_IP", '"185.26.156.37"') + 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 { @@ -101,6 +104,13 @@ android { productFlavors { playstore 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') && project.hasProperty('mStorePassword') && @@ -117,14 +127,12 @@ android { buildTypes { debug { debuggable true - jniDebuggable true buildTypes.release.signingConfig = null //applicationIdSuffix ".debug" } release { debuggable false - jniDebuggable false signingConfig = signingConfigs.release minifyEnabled true 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 { disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage', 'MissingQuantity', 'AppCompatResource' } |