aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-07-02 17:45:58 +0200
committerChristian Schneppe <christian@pix-art.de>2016-07-02 17:45:58 +0200
commit42b91f8d8618e17413e80294b879d280647b61f3 (patch)
tree14a77a0fda825383e4bd5cc354828074993ea954
parent9705c3625185bed4a86072229fbcb3348c88e007 (diff)
version 1.13.6
-rw-r--r--CHANGELOG.md7
-rw-r--r--build.gradle11
2 files changed, 9 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 938eb6f8a..206b7776e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
###Changelog
+###Version 1.13.6
+* share image/video directly from fullscreen view
+* show online status in foreground service
+* support jingle ft:4
+* show contact as DND if one resource is
+* bug fixes
+
###Version 1.13.5
* add image preview before sending single images directly
* add vibrate notification when app is open
diff --git a/build.gradle b/build.gradle
index 6c703f5ef..d52fba6e8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -68,13 +68,12 @@ ext {
android {
compileSdkVersion 23
buildToolsVersion "23.0.3"
-
defaultConfig {
minSdkVersion 14
targetSdkVersion 23
- versionCode 156
- versionName "1.13.5"
+ versionCode 157
+ versionName "1.13.6"
archivesBaseName += "-$versionName"
applicationId "de.pixart.messenger"
@@ -82,18 +81,15 @@ android {
// Enabling multidex support.
multiDexEnabled true
}
-
dexOptions {
// Skip pre-dexing when running on Travis CI or when disabled via -Dpre-dex=false.
preDexLibraries = preDexEnabled && !travisBuild
javaMaxHeapSize "4g"
}
-
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
}
-
productFlavors {
playstore
free
@@ -114,11 +110,9 @@ android {
} else {
buildTypes.release.signingConfig = null
}
-
lintOptions {
disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage', 'MissingQuantity', 'AppCompatResource'
}
-
subprojects {
afterEvaluate {
@@ -132,7 +126,6 @@ android {
}
}
-
packagingOptions {
exclude 'META-INF/BCKEY.DSA'
exclude 'META-INF/BCKEY.SF'