Merge branch 'main' into feat/room-sqlcipher

# Conflicts:
#	SWADroid/build.gradle

SWADroid/build.gradle

@@ -1,5 +1,7 @@
+import io.github.reactivecircus.appversioning.SemVer
+
 plugins {
-    id 'com.gladed.androidgitversion' version '0.4.14'
+    id("io.github.reactivecircus.app-versioning") version "1.3.1"
 }
 apply plugin: 'com.android.application'
 
@@ -37,10 +39,20 @@ if (build_param != "prod") {
     }
 }
 
+appVersioning {
+    overrideVersionCode { gitTag, providers, variantInfo ->
+        //SemVer-based version code
+        def semVer = SemVer.fromGitTag(gitTag)
+        semVer.major * 1000000 + semVer.minor * 1000 + semVer.patch
+
+        //Timestamp-based version code
+        //Instant.now().epochSecond.toInt()
+    }
+}
+
 android {
     namespace 'es.ugr.swad.swadroid'
     compileSdk 34
-    buildToolsVersion "34.0.0"
 
     lint {
         abortOnError false
@@ -53,8 +65,6 @@ android {
 
     defaultConfig {
         applicationId "es.ugr.swad.swadroid"
-        versionName androidGitVersion.name()
-        versionCode androidGitVersion.code()
 
         minSdkVersion 24
         targetSdkVersion 34
@@ -98,7 +108,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.9.0'
+    implementation 'com.google.android.material:material:1.10.0'
 
     //Lombok
     def lombok_version = "1.18.24"
@@ -110,7 +120,7 @@ dependencies {
     //Database dependencies
     def room_version = "2.5.2"
     implementation 'net.zetetic:android-database-sqlcipher:4.5.1@aar'
-    implementation "androidx.sqlite:sqlite:2.3.1"
+    implementation "androidx.sqlite:sqlite:2.4.0"
     implementation "androidx.room:room-runtime:$room_version"
     annotationProcessor "androidx.room:room-compiler:$room_version"
     // optional - Test helpers

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.0'
+        classpath 'com.android.tools.build:gradle:8.1.2'
     }
 }
 

gradle.properties

@@ -17,7 +17,7 @@ android.nonFinalResIds=false
 android.nonTransitiveRClass=false
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx2560M
-org.gradle.unsafe.configuration-cache=true
+org.gradle.caching=true
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists