diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 74e8abcad8..52fb01f067 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -48,9 +48,9 @@ android {
         } else {
             "io.element.android.x"
         }
-        targetSdk = Versions.targetSdk
-        versionCode = Versions.versionCode
-        versionName = Versions.versionName
+        targetSdk = Versions.TARGET_SDK
+        versionCode = Versions.VERSION_CODE
+        versionName = Versions.VERSION_NAME
 
         // Keep abiFilter for the universalApk
         ndk {
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenView.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenView.kt
index ce9319d0cf..711b203f99 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenView.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenView.kt
@@ -183,6 +183,7 @@ private fun WebView.setup(
         allowFileAccess = true
         domStorageEnabled = true
         mediaPlaybackRequiresUserGesture = false
+        @Suppress("DEPRECATION")
         databaseEnabled = true
         loadsImagesAutomatically = true
         userAgentString = userAgent
diff --git a/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/DefaultShareService.kt b/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/DefaultShareService.kt
index de53096076..f4ed61dba8 100644
--- a/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/DefaultShareService.kt
+++ b/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/DefaultShareService.kt
@@ -46,7 +46,7 @@ class DefaultShareService @Inject constructor(
                 PackageManager.GET_ACTIVITIES or PackageManager.MATCH_DISABLED_COMPONENTS
             )
             .activities
-            .firstOrNull { it.name.endsWith(".ShareActivity") }
+            ?.firstOrNull { it.name.endsWith(".ShareActivity") }
             ?.let { shareActivityInfo ->
                 ComponentName(
                     shareActivityInfo.packageName,
diff --git a/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcView.kt b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcView.kt
index 055d516f97..d58eebf8ae 100644
--- a/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcView.kt
+++ b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcView.kt
@@ -86,6 +86,7 @@ fun OidcView(
                             javaScriptEnabled = true
                             allowContentAccess = true
                             allowFileAccess = true
+                            @Suppress("DEPRECATION")
                             databaseEnabled = true
                             domStorageEnabled = true
                         }
diff --git a/plugins/src/main/kotlin/Versions.kt b/plugins/src/main/kotlin/Versions.kt
index c71a77ac47..8a14ce5161 100644
--- a/plugins/src/main/kotlin/Versions.kt
+++ b/plugins/src/main/kotlin/Versions.kt
@@ -50,10 +50,10 @@ private const val versionMinor = 7
 private const val versionPatch = 3
 
 object Versions {
-    val versionCode = 4_000_000 + versionMajor * 1_00_00 + versionMinor * 1_00 + versionPatch
-    val versionName = "$versionMajor.$versionMinor.$versionPatch"
-    const val compileSdk = 34
-    const val targetSdk = 34
+    const val VERSION_CODE = 4_000_000 + versionMajor * 1_00_00 + versionMinor * 1_00 + versionPatch
+    const val VERSION_NAME = "$versionMajor.$versionMinor.$versionPatch"
+    const val COMPILE_SDK = 35
+    const val TARGET_SDK = 35
 
     // When updating the `minSdk`, make sure to update the value of `minSdkVersion` in the file `tools/release/release.sh`
     val minSdk = if (isEnterpriseBuild) 26 else 24
diff --git a/plugins/src/main/kotlin/extension/CommonExtension.kt b/plugins/src/main/kotlin/extension/CommonExtension.kt
index 4f3f23d707..7c96386a6b 100644
--- a/plugins/src/main/kotlin/extension/CommonExtension.kt
+++ b/plugins/src/main/kotlin/extension/CommonExtension.kt
@@ -15,7 +15,7 @@ import java.io.File
 
 fun CommonExtension<*, *, *, *, *, *>.androidConfig(project: Project) {
     defaultConfig {
-        compileSdk = Versions.compileSdk
+        compileSdk = Versions.COMPILE_SDK
         minSdk = Versions.minSdk
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/samples/minimal/build.gradle.kts b/samples/minimal/build.gradle.kts
index e32054a272..48713af442 100644
--- a/samples/minimal/build.gradle.kts
+++ b/samples/minimal/build.gradle.kts
@@ -14,9 +14,9 @@ android {
 
     defaultConfig {
         applicationId = "io.element.android.samples.minimal"
-        targetSdk = Versions.targetSdk
-        versionCode = Versions.versionCode
-        versionName = Versions.versionName
+        targetSdk = Versions.TARGET_SDK
+        versionCode = Versions.VERSION_CODE
+        versionName = Versions.VERSION_NAME
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }