Merge pull request #27 from cslrfid/develop

ksclam · web-flow · commit 96b2b8aa4957 · 2021-10-11T23:19:49.000-04:00
Develop
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,7 +6,7 @@ android {
         applicationId "com.csl.cs108ademoapp"
         minSdkVersion 19
         targetSdkVersion 30
-        versionCode 31
+        versionCode 32
         versionName "2.2.0"
     }
 }
diff --git 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'
     }
@@ -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,7 +6,7 @@ android {`
`6`	`6`	`applicationId "com.csl.cs108ademoapp"`
`7`	`7`	`minSdkVersion 19`
`8`	`8`	`targetSdkVersion 30`
`9`		`- versionCode 31`
	`9`	`+ versionCode 32`
`10`	`10`	`versionName "2.2.0"`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@ android {`
`5`	`5`	`defaultConfig {`
`6`	`6`	`minSdkVersion 19`
`7`	`7`	`targetSdkVersion 30`
`8`		`- versionCode 31`
`9`		`- versionName "2.1.22"`
`10`		`- buildConfigField 'String', 'VERSION_NAME', "\"2.1.22\""`
	`8`	`+ versionCode 32`
	`9`	`+ versionName "2.2.0"`
	`10`	`+ buildConfigField 'String', 'VERSION_NAME', "\"2.2.0\""`
`11`	`11`
`12`	`12`	`testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'`
`13`	`13`	`}`
`@@ -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', {`