diff --git a/app/build.gradle b/app/build.gradle
index c6f34cc68..8db20b2be 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -58,8 +58,8 @@ dependencies {
     implementation "com.squareup.okhttp3:okhttp-ws:$OKHTTP_VERSION"
 
     // Logging
-    implementation 'ch.acra:acra-dialog:5.8.1-beta11'
-    implementation 'ch.acra:acra-mail:5.8.1-beta11'
+    implementation 'ch.acra:acra-dialog:5.8.4'
+    implementation 'ch.acra:acra-mail:5.8.4'
     implementation 'org.slf4j:slf4j-api:1.7.25'
     api('com.github.tony19:logback-android-classic:1.1.1-6') {
         exclude group: 'com.google.android', module: 'android'
@@ -221,7 +221,7 @@ android {
     }
 
     configurations.all {
-        resolutionStrategy.force 'androidx.annotation:annotation:1.0.2'
+        resolutionStrategy.force 'androidx.annotation:annotation:1.1.0'
         exclude module: 'okhttp-ws'
     }
     flavorDimensions 'tier'
diff --git a/app/src/main/java/fr/free/nrw/commons/Media.kt b/app/src/main/java/fr/free/nrw/commons/Media.kt
index 3987acb37..1a5531e85 100644
--- a/app/src/main/java/fr/free/nrw/commons/Media.kt
+++ b/app/src/main/java/fr/free/nrw/commons/Media.kt
@@ -12,19 +12,19 @@ class Media constructor(
      * @return pageId for the current media object
      * Wikibase Identifier associated with media files
      */
-    val pageId: String = UUID.randomUUID().toString(),
-    val thumbUrl: String? = null,
+    var pageId: String = UUID.randomUUID().toString(),
+    var thumbUrl: String? = null,
 
     /**
      * Gets image URL
      * @return Image URL
      */
-    val imageUrl: String? = null,
+    var imageUrl: String? = null,
     /**
      * Gets the name of the file.
      * @return file name as a string
      */
-    val filename: String? = null,
+    var filename: String? = null,
     /**
      * Gets the file description.
      * @return file description as a string
@@ -41,7 +41,7 @@ class Media constructor(
      * Can be null.
      * @return upload date as a Date
      */
-    val dateUploaded: Date? = null,
+    var dateUploaded: Date? = null,
     /**
      * Gets the license name of the file.
      * @return license as a String
@@ -52,7 +52,7 @@ class Media constructor(
      * @param license license name as a String
      */
     var license: String? = null,
-    val licenseUrl: String? = null,
+    var licenseUrl: String? = null,
     /**
      * Gets the name of the creator of the file.
      * @return author name as a String
@@ -69,15 +69,15 @@ class Media constructor(
      * Gets the categories the file falls under.
      * @return file categories as an ArrayList of Strings
      */
-    val categories: List<String>? = null,
+    var categories: List<String>? = null,
     /**
      * Gets the coordinates of where the file was created.
      * @return file coordinates as a LatLng
      */
     var coordinates: LatLng? = null,
-    val captions: Map<String, String> = emptyMap(),
-    val descriptions: Map<String, String> = emptyMap(),
-    val depictionIds: List<String> = emptyList()
+    var captions: Map<String, String> = emptyMap(),
+    var descriptions: Map<String, String> = emptyMap(),
+    var depictionIds: List<String> = emptyList()
 ) : Parcelable {
 
     constructor(
diff --git a/data-client/build.gradle b/data-client/build.gradle
index 6ec984498..382c1a651 100644
--- a/data-client/build.gradle
+++ b/data-client/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.31'
+    ext.kotlin_version = '1.5.10'
     repositories {
         jcenter()
         google()
diff --git a/gradle.properties b/gradle.properties
index 3a2d71a08..eeac9bd46 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,11 +16,11 @@
 org.gradle.jvmargs=-Xmx1536M
 android.enableBuildCache=true
 
-KOTLIN_VERSION=1.3.72
+KOTLIN_VERSION=1.5.10
 BUTTERKNIFE_VERSION=10.1.0
 LEAK_CANARY_VERSION=1.6.2
 DAGGER_VERSION=2.23
-ROOM_VERSION=2.2.3
+ROOM_VERSION=2.3.0
 PREFERENCE_VERSION=1.1.0
 CORE_KTX_VERSION=1.2.0
 ADAPTER_DELEGATES_VERSION=4.3.0
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cdd4b5409..0a47110a4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-6.9-all.zip