Merge branch 'main' into Serializable_extensions

# Conflicts:
#	app/src/main/java/org/wikipedia/watchlist/WatchlistExpiryDialog.kt

Author: Isira-Seneviratne

.github/workflows/android.yml

@@ -31,6 +31,9 @@ jobs:
         alias: ${{ secrets.KEY_STORE_ALIAS }}
         keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
         keyPassword: ${{ secrets.KEY_PASSWORD }}
+      env:
+        # override default build-tools version (29.0.3) -- optional
+        BUILD_TOOLS_VERSION: "34.0.0"
     - name: Create hash
       run: git rev-parse HEAD > app/build/outputs/apk/alpha/release/rev-hash.txt
     - name: Rename APK to universal

.github/workflows/android_branch.yml

@@ -30,6 +30,9 @@ jobs:
         alias: ${{ secrets.KEY_STORE_ALIAS }}
         keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
         keyPassword: ${{ secrets.KEY_PASSWORD }}
+      env:
+        # override default build-tools version (29.0.3) -- optional
+        BUILD_TOOLS_VERSION: "34.0.0"
     - uses: actions/upload-artifact@v3
       name: Upload APK artifact
       with:

COPYING

@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2013-2023 Wikimedia Foundation et al.
+   Copyright 2013-2024 Wikimedia Foundation et al.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

app/build.gradle

@@ -37,7 +37,7 @@ android {
         applicationId 'org.wikipedia'
         minSdk 21
         targetSdk 34
-        versionCode 50464
+        versionCode 50466
         testApplicationId 'org.wikipedia.test'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments clearPackageData: 'true'
@@ -150,6 +150,10 @@ android {
     namespace 'org.wikipedia'
 }
 
+ksp {
+    arg("room.schemaLocation", "$projectDir/schemas")
+}
+
 configurations {
     compileClasspath.extendsFrom(implementation)
 }
@@ -170,7 +174,7 @@ dependencies {
     String mockitoVersion = '5.2.0'
     String leakCanaryVersion = '2.12'
     String kotlinCoroutinesVersion = '1.7.3'
-    String firebaseMessagingVersion = '23.3.1'
+    String firebaseMessagingVersion = '23.4.0'
     String mlKitVersion = '17.0.4'
     String roomVersion = "2.6.1"
     String espressoVersion = '3.5.1'
@@ -184,7 +188,7 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinCoroutinesVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization_version"
 
-    implementation "com.google.android.material:material:1.10.0"
+    implementation "com.google.android.material:material:1.11.0"
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation "androidx.core:core-ktx:1.12.0"
     implementation "androidx.browser:browser:1.7.0"