From 34a1858a76b8d81ad257252f2110b8303c87dc03 Mon Sep 17 00:00:00 2001
From: WallaceSit <42763691+WallaceSit@users.noreply.github.com>
Date: Thu, 7 Oct 2021 10:30:16 +0800
Subject: [PATCH 1/2] V2.2.0 Release

Modify version number for the google play release
---
 app/build.gradle            | 4 ++--
 cs108library4a/build.gradle | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ba16b9b..0be2013 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "com.csl.cs108ademoapp"
         minSdkVersion 19
         targetSdkVersion 30
-        versionCode 31
-        versionName "2.1.29"
+        versionCode 32
+        versionName "2.2.0"
     }
 }
 
diff --git a/cs108library4a/build.gradle b/cs108library4a/build.gradle
index 9976bfc..03537aa 100644
--- a/cs108library4a/build.gradle
+++ b/cs108library4a/build.gradle
@@ -5,9 +5,9 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 30
-        versionCode 31
-        versionName "2.1.22"
-        buildConfigField 'String', 'VERSION_NAME', "\"2.1.22\""
+        versionCode 32
+        versionName "2.2.0"
+        buildConfigField 'String', 'VERSION_NAME', "\"2.2.0\""
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }

From a1facab6146537e2c0c1abceed177a244664a21b Mon Sep 17 00:00:00 2001
From: WallaceSit <42763691+WallaceSit@users.noreply.github.com>
Date: Tue, 12 Oct 2021 11:04:23 +0800
Subject: [PATCH 2/2] V2.2.0 (Retry 2)

Release retry 2
---
 app/build.gradle            | 4 ----
 cs108library4a/build.gradle | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5ce613c..0be2013 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,11 +6,7 @@ android {
         applicationId "com.csl.cs108ademoapp"
         minSdkVersion 19
         targetSdkVersion 30
-<<<<<<< HEAD
         versionCode 32
-=======
-        versionCode 31
->>>>>>> cef18819032d4ed422d5ace1b1c2071a33aedab8
         versionName "2.2.0"
     }
 }
diff --git a/cs108library4a/build.gradle b/cs108library4a/build.gradle
index 03537aa..41776bb 100644
--- a/cs108library4a/build.gradle
+++ b/cs108library4a/build.gradle
@@ -23,6 +23,7 @@ android {
     }
 }
 
+
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     androidTestImplementation('androidx.test.espresso:espresso-core:3.3.0', {