From 1bf023357b1b152caaced976794bc28ec812a778 Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@noreply.codeberg.org>
Date: Mon, 5 Oct 2020 18:29:19 +0200
Subject: [PATCH] Development of 3.3.0 (#722)

Development of 3.3.0

Co-authored-by: M M Arif <mmarif@swatian.com>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/722
---
 app/build.gradle                   | 10 +++++-----
 app/src/main/res/xml/changelog.xml | 15 ++-------------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 76a1495e..1fda9330 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "org.mian.gitnex"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 320
-        versionName "3.2.0"
+        versionCode 327
+        versionName "3.3.0-dev"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -52,14 +52,14 @@ configurations {
 }
 
 dependencies {
-    def lifecycle_version = '2.3.0-alpha07'
+    def lifecycle_version = '2.3.0-beta01'
     def markwon_version = '4.6.0'
     def work_version = "2.4.0"
     def acra = "5.5.0"
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.3.0-alpha02'
-    implementation "com.google.android.material:material:1.3.0-alpha02"
+    implementation 'com.google.android.material:material:1.3.0-alpha03'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
     implementation "androidx.legacy:legacy-support-v4:1.0.0"
     implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
@@ -75,7 +75,7 @@ dependencies {
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     implementation 'com.squareup.retrofit2:converter-scalars:2.9.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.9.0'
-    implementation 'org.ocpsoft.prettytime:prettytime:4.0.5.Final'
+    implementation 'org.ocpsoft.prettytime:prettytime:4.0.6.Final'
     implementation "com.vdurmont:emoji-java:5.1.1"
     implementation "com.pes.materialcolorpicker:library:1.2.5"
     implementation "io.noties.markwon:core:$markwon_version"
diff --git a/app/src/main/res/xml/changelog.xml b/app/src/main/res/xml/changelog.xml
index e9d6e7e9..fa837191 100644
--- a/app/src/main/res/xml/changelog.xml
+++ b/app/src/main/res/xml/changelog.xml
@@ -1,19 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
 
-    <release version="3.2.0" versioncode="320">
-        <change>New: Create pull request</change>
-        <change>New: Edit repository properties (Admins only)</change>
-        <change>New: Delete repository (Admins only)</change>
-        <change>New: Transfer repository ownership (Admins only)</change>
-        <change>New: Notification badge in navigation menu</change>
-        <change>New: Search issues across all repositories</change>
-        <change>New: Show issues/pr states in single view mode</change>
-        <change>New: Explore repositories filter</change>
-        <change>New: Android 11 support</change>
-        <change>New: Commits under Files branches</change>
-        <change>Bugfix: Fix crash when create issue with labels removed</change>
-        <change>Bugfix: Fix active account selector</change>
+    <release version="3.3.0-dev" versioncode="327">
+        <change>Under development</change>
     </release>
 
 </changelog>