From 4ed589d12bfa869491fd05f7e70d1155d0af4469 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 16 Dec 2021 17:06:04 +0100
Subject: [PATCH] Updated dependencies

---
 app/build.gradle                                      |  8 ++++----
 .../java/org/linphone/activities/GenericActivity.kt   | 11 +++++++----
 build.gradle                                          |  6 +++---
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 180b843d0..e571fc982 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -220,14 +220,14 @@ dependencies {
     implementation 'androidx.fragment:fragment-ktx:1.4.0'
     implementation 'androidx.core:core-ktx:1.7.0'
 
-    def nav_version = "2.4.0-beta02"
+    def nav_version = "2.4.0-rc01"
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
 
-    implementation "androidx.slidingpanelayout:slidingpanelayout:1.2.0-beta01"
-    implementation "androidx.window:window:1.0.0-beta03"
+    implementation "androidx.slidingpanelayout:slidingpanelayout:1.2.0-rc01"
+    implementation "androidx.window:window:1.0.0-rc01"
 
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
diff --git a/app/src/main/java/org/linphone/activities/GenericActivity.kt b/app/src/main/java/org/linphone/activities/GenericActivity.kt
index 0eec20c2b..221dfaa2b 100644
--- a/app/src/main/java/org/linphone/activities/GenericActivity.kt
+++ b/app/src/main/java/org/linphone/activities/GenericActivity.kt
@@ -31,7 +31,7 @@ import androidx.appcompat.app.AppCompatDelegate
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.ActivityNavigator
 import androidx.window.layout.FoldingFeature
-import androidx.window.layout.WindowInfoRepository.Companion.windowInfoRepository
+import androidx.window.layout.WindowInfoTracker
 import androidx.window.layout.WindowLayoutInfo
 import java.util.*
 import kotlinx.coroutines.Dispatchers
@@ -58,9 +58,12 @@ abstract class GenericActivity : AppCompatActivity() {
         ensureCoreExists(applicationContext)
 
         lifecycleScope.launch(Dispatchers.Main) {
-            windowInfoRepository().windowLayoutInfo.collect { newLayoutInfo ->
-                updateCurrentLayout(newLayoutInfo)
-            }
+            WindowInfoTracker
+                .getOrCreate(this@GenericActivity)
+                .windowLayoutInfo(this@GenericActivity)
+                .collect { newLayoutInfo ->
+                    updateCurrentLayout(newLayoutInfo)
+                }
         }
 
         requestedOrientation = if (corePreferences.forcePortrait) {
diff --git a/build.gradle b/build.gradle
index 2e256b988..b06cb08b4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,11 +11,11 @@ buildscript {
         } // for com.github.chrisbanes:PhotoView
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.3'
+        classpath 'com.android.tools.build:gradle:7.0.4'
         classpath 'com.google.gms:google-services:4.3.10'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
         classpath "org.jlleitschuh.gradle:ktlint-gradle:10.1.0"
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.0'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
     }
 }