aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2015-01-29 23:56:04 +0100
committeriNPUTmice <daniel@gultsch.de>2015-01-29 23:56:04 +0100
commit3216813e4939941611e0226d2f56b9180fad173b (patch)
tree9d7e4dc324d328fb60df7512a221011c78dc3b0f
parent3a52f318248134a49dda7d6704ba43bc91784318 (diff)
made version codes ready for release candidate in beta channel
-rw-r--r--build.gradle4
-rw-r--r--src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/build.gradle b/build.gradle
index b84dd146..41298a5b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,8 +46,8 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 21
- versionCode 43
- versionName "1.0-beta2"
+ versionCode 44
+ versionName "1.0"
}
compileOptions {
diff --git a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
index 04e114da..526e5b19 100644
--- a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
@@ -30,7 +30,7 @@ public abstract class AbstractGenerator {
"urn:xmpp:chat-markers:0",
"urn:xmpp:receipts"
};
- public final String IDENTITY_NAME = "Conversations 1.0-beta2";
+ public final String IDENTITY_NAME = "Conversations 1.0";
public final String IDENTITY_TYPE = "phone";
private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US);