Merge branch 'main' into feat/room-sqlcipher

# Conflicts: # SWADroid/build.gradle
Update dependencies (#433 )
2024-01-19 15:30:17 +01:00 · 2024-01-19 15:28:50 +01:00
2 changed files with 2 additions and 2 deletions
--- a/SWADroid/build.gradle
+++ b/SWADroid/build.gradle
@ -115,7 +115,7 @@ dependencies {
    implementation 'com.journeyapps:zxing-android-embedded:4.3.0@aar'
    implementation 'com.google.zxing:core:3.5.2'
    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
    def lombok_version = "1.18.24"
--- a/build.gradle
+++ b/build.gradle
@ -5,7 +5,7 @@ buildscript {
        google()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.0'
+        classpath 'com.android.tools.build:gradle:8.2.1'
    }
 }
Author	SHA1	Message	Date
Amab	520b2a044a	Merge branch 'main' into feat/room-sqlcipher continuous-integration/drone/push Build is passing Details # Conflicts: # SWADroid/build.gradle	2024-01-19 15:30:17 +01:00
Amab	f6a224b49d	Update dependencies (#433 ) continuous-integration/drone/push Build is passing Details ## What changes were proposed in this pull request? Update dependencies. ## How was this patch tested? Manually. Reviewed-on: #433 Co-authored-by: Amab <juanmi1982@gmail.com> Co-committed-by: Amab <juanmi1982@gmail.com>	2024-01-19 15:28:50 +01:00