Merge remote-tracking branch 'origin/dev' into ns15

This commit is contained in:
Milos Kozak 2023-02-09 17:14:51 +01:00
commit 40e14ba0e3
3 changed files with 4 additions and 4 deletions

View file

@ -16,7 +16,7 @@ buildscript {
ormLite_version = '4.46' ormLite_version = '4.46'
gson_version = '2.10.1' gson_version = '2.10.1'
nav_version = '2.5.3' nav_version = '2.5.3'
appcompat_version = '1.6.0' appcompat_version = '1.6.1'
material_version = '1.8.0' material_version = '1.8.0'
gridlayout_version = '1.0.0' gridlayout_version = '1.0.0'
constraintlayout_version = '2.1.4' constraintlayout_version = '2.1.4'
@ -24,7 +24,7 @@ buildscript {
commonslang3_version = '3.12.0' commonslang3_version = '3.12.0'
commonscodec_version = '1.15' commonscodec_version = '1.15'
jodatime_version = '2.10.14' jodatime_version = '2.10.14'
work_version = '2.7.1' work_version = '2.8.0'
tink_version = '1.7.0' tink_version = '1.7.0'
json_version = '20220320' json_version = '20220320'
serialization_version = '1.4.1' serialization_version = '1.4.1'

View file

@ -2,7 +2,7 @@ android {
compileSdk 33 compileSdk 33
defaultConfig { defaultConfig {
minSdkVersion 28 minSdkVersion 28
targetSdkVersion 33 targetSdkVersion 28
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }

View file

@ -25,7 +25,7 @@ dependencies {
api "com.squareup.okhttp3:okhttp:$okhttp3_version" api "com.squareup.okhttp3:okhttp:$okhttp3_version"
api "com.squareup.retrofit2:retrofit:$retrofit2_version" api "com.squareup.retrofit2:retrofit:$retrofit2_version"
api "androidx.browser:browser:1.4.0" api "androidx.browser:browser:1.5.0"
//WorkManager //WorkManager
api "androidx.work:work-runtime-ktx:$work_version" api "androidx.work:work-runtime-ktx:$work_version"