aboutsummaryrefslogtreecommitdiffstats
path: root/build.gradle
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2016-02-16 11:41:54 +0100
committerlookshe <github@lookshe.org>2016-02-16 11:41:54 +0100
commit1e40764b20a08170f8e4bfe1f1ae1559111f2961 (patch)
tree1791a3870361f37c3c34c299d075f56ed4a6e2c2 /build.gradle
parenta049aff638f27b68f08c753d42ef0fc2847b96cb (diff)
parentd58d822215708cc0d9c841872abab448bf290e4c (diff)
Merge tag '1.9.4' into trz/merge_1.9.4trz/merge_1.9.4
Conflicts: build.gradle src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java src/main/java/eu/siacs/conversations/parser/PresenceParser.java src/main/java/eu/siacs/conversations/services/MessageArchiveService.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/res/values/arrays.xml
Diffstat (limited to '')
-rw-r--r--build.gradle6
1 files changed, 2 insertions, 4 deletions
diff --git a/build.gradle b/build.gradle
index a45cccda..a37901ba 100644
--- a/build.gradle
+++ b/build.gradle
@@ -64,8 +64,8 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 23
- versionCode 122
- versionName "1.9.3.1"
+ versionCode 123
+ versionName "1.9.4.1"
project.ext.set(archivesBaseName, archivesBaseName + "-" + versionName);
}
@@ -106,8 +106,6 @@ android {
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"))
}
}
}