From 91601cdd8ce9cab0cda67c4e259f6659e71a4a69 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 20 Apr 2023 10:05:50 +0200
Subject: [PATCH] Bumped dependencies, improved a bit build time

---
 app/build.gradle                                   | 6 +++---
 app/src/main/java/org/linphone/core/CoreContext.kt | 8 ++++----
 gradle.properties                                  | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7ad1008fa..ad15c980e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -199,9 +199,9 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.10.0'
-    implementation 'androidx.core:core-splashscreen:1.0.0'
-    implementation 'androidx.emoji2:emoji2:1.4.0-beta01'
-    implementation 'androidx.emoji2:emoji2-emojipicker:1.4.0-beta01'
+    implementation 'androidx.core:core-splashscreen:1.0.1'
+    implementation 'androidx.emoji2:emoji2:1.4.0-beta02'
+    implementation 'androidx.emoji2:emoji2-emojipicker:1.4.0-beta02'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
     implementation 'androidx.media:media:1.6.0'
     implementation "androidx.security:security-crypto-ktx:1.1.0-alpha05"
diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt
index d9eaab658..f8c7e42d3 100644
--- a/app/src/main/java/org/linphone/core/CoreContext.kt
+++ b/app/src/main/java/org/linphone/core/CoreContext.kt
@@ -99,8 +99,8 @@ class CoreContext(
     }
 
     val sdkVersion: String by lazy {
-        val sdkVersion = context.getString(R.string.linphone_sdk_version)
-        val sdkBranch = context.getString(R.string.linphone_sdk_branch)
+        val sdkVersion = context.getString(org.linphone.core.R.string.linphone_sdk_version)
+        val sdkBranch = context.getString(org.linphone.core.R.string.linphone_sdk_branch)
         val sdkBuildType = org.linphone.core.BuildConfig.BUILD_TYPE
         "$sdkVersion ($sdkBranch, $sdkBuildType)"
     }
@@ -587,8 +587,8 @@ class CoreContext(
         val appName: String = context.resources.getString(R.string.user_agent_app_name)
         val androidVersion = BuildConfig.VERSION_NAME
         val userAgent = "$appName/$androidVersion ($deviceName) LinphoneSDK"
-        val sdkVersion = context.getString(R.string.linphone_sdk_version)
-        val sdkBranch = context.getString(R.string.linphone_sdk_branch)
+        val sdkVersion = context.getString(org.linphone.core.R.string.linphone_sdk_version)
+        val sdkBranch = context.getString(org.linphone.core.R.string.linphone_sdk_branch)
         val sdkUserAgent = "$sdkVersion ($sdkBranch)"
         core.setUserAgent(userAgent, sdkUserAgent)
     }
diff --git a/gradle.properties b/gradle.properties
index 1b8b6e1e6..6d3fe9034 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,5 +19,5 @@ android.useAndroidX=true
 kotlin.code.style=official
 LinphoneSdkBuildDir=
 android.defaults.buildfeatures.buildconfig=true
-android.nonTransitiveRClass=false
-android.nonFinalResIds=false
+android.nonTransitiveRClass=true
+android.nonFinalResIds=true