V2.2.0 (Retry 2)

WallaceSit · WallaceSit · commit a1facab61465 · 2021-10-12T11:04:23.000+08:00
Release retry 2
diff --git 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
@@ -23,6 +23,7 @@ android {
     }
 }
 
+
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     androidTestImplementation('androidx.test.espresso:espresso-core:3.3.0', {

Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,7 @@ android {`
`6`	`6`	`applicationId "com.csl.cs108ademoapp"`
`7`	`7`	`minSdkVersion 19`
`8`	`8`	`targetSdkVersion 30`
`9`		`-<<<<<<< HEAD`
`10`	`9`	`versionCode 32`
`11`		`-=======`
`12`		`- versionCode 31`
`13`		`->>>>>>> cef18819032d4ed422d5ace1b1c2071a33aedab8`
`14`	`10`	`versionName "2.2.0"`
`15`	`11`	`}`
`16`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ android {`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
	`26`	`+`
`26`	`27`	`dependencies {`
`27`	`28`	`implementation fileTree(include: ['*.jar'], dir: 'libs')`
`28`	`29`	`androidTestImplementation('androidx.test.espresso:espresso-core:3.3.0', {`