Merge branch 'main' into feat/room-sqlcipher
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
# Conflicts: # SWADroid/build.gradle
This commit is contained in:
commit
520b2a044a
|
@ -115,7 +115,7 @@ dependencies {
|
||||||
implementation 'com.journeyapps:zxing-android-embedded:4.3.0@aar'
|
implementation 'com.journeyapps:zxing-android-embedded:4.3.0@aar'
|
||||||
implementation 'com.google.zxing:core:3.5.2'
|
implementation 'com.google.zxing:core:3.5.2'
|
||||||
implementation 'com.google.code.gson:gson:2.10.1'
|
implementation 'com.google.code.gson:gson:2.10.1'
|
||||||
implementation 'com.google.android.material:material:1.10.0'
|
implementation 'com.google.android.material:material:1.11.0'
|
||||||
|
|
||||||
//Lombok
|
//Lombok
|
||||||
def lombok_version = "1.18.24"
|
def lombok_version = "1.18.24"
|
||||||
|
|
|
@ -5,7 +5,7 @@ buildscript {
|
||||||
google()
|
google()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:8.2.0'
|
classpath 'com.android.tools.build:gradle:8.2.1'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user