Skip to content

Develop #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 12, 2021
Merged

Develop #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
34a1858
V2.2.0 Release
Oct 7, 2021
66fb98c
Merge branch 'develop-eng' of https://github.com/cslrfid/CS108-Androi…
Oct 7, 2021
8170dbe
V2.2.0 Release (Retry)
Oct 12, 2021
a1facab
V2.2.0 (Retry 2)
Oct 12, 2021
6c91e2c
Merge pull request #26 from cslrfid/develop-eng
ksclam Oct 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ android {
applicationId "com.csl.cs108ademoapp"
minSdkVersion 19
targetSdkVersion 30
versionCode 31
versionCode 32
versionName "2.2.0"
}
}
Expand Down
7 changes: 4 additions & 3 deletions cs108library4a/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand All @@ -23,6 +23,7 @@ android {
}
}


dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
androidTestImplementation('androidx.test.espresso:espresso-core:3.3.0', {
Expand Down