diff --git a/app/build.gradle b/app/build.gradle
index dc1841de2..5995f3dcc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -197,7 +197,7 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.9.0'
     implementation 'androidx.core:core-splashscreen:1.0.0'
     implementation 'androidx.emoji2:emoji2:1.2.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.0'
     implementation 'androidx.media:media:1.6.0'
     implementation "androidx.security:security-crypto-ktx:1.1.0-alpha05"
     implementation "androidx.window:window:1.0.0"
@@ -210,7 +210,7 @@ dependencies {
     implementation "androidx.slidingpanelayout:slidingpanelayout:1.2.0"
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation "androidx.gridlayout:gridlayout:1.0.0"
-    implementation 'androidx.recyclerview:recyclerview:1.3.0-rc01'
+    implementation 'androidx.recyclerview:recyclerview:1.3.0'
 
     // https://github.com/material-components/material-components-android/blob/master/LICENSE Apache v2.0
     implementation 'com.google.android.material:material:1.8.0'
diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt
index 6530d1197..df1ede8b1 100644
--- a/app/src/main/java/org/linphone/core/CoreContext.kt
+++ b/app/src/main/java/org/linphone/core/CoreContext.kt
@@ -71,15 +71,14 @@ class CoreContext(
     useAutoStartDescription: Boolean = false
 ) :
     LifecycleOwner, ViewModelStoreOwner {
+
     private val _lifecycleRegistry = LifecycleRegistry(this)
-    override fun getLifecycle(): Lifecycle {
-        return _lifecycleRegistry
-    }
+    override val lifecycle: Lifecycle
+        get() = _lifecycleRegistry
 
     private val _viewModelStore = ViewModelStore()
-    override fun getViewModelStore(): ViewModelStore {
-        return _viewModelStore
-    }
+    override val viewModelStore: ViewModelStore
+        get() = _viewModelStore
 
     private val contactLoader = ContactLoader()