Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bumped dependencies, improved a bit build time

Browse source
This commit is contained in:
Sylvain Berfini 2023-04-20 10:05:50 +02:00
parent 22c7783c18
commit 91601cdd8c
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/build.gradle
View file

@ -199,9 +199,9 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.core:core-ktx:1.10.0' implementation 'androidx.core:core-ktx:1.10.0'
implementation 'androidx.core:core-splashscreen:1.0.0' implementation 'androidx.core:core-splashscreen:1.0.1'
implementation 'androidx.emoji2:emoji2:1.4.0-beta01' implementation 'androidx.emoji2:emoji2:1.4.0-beta02'
implementation 'androidx.emoji2:emoji2-emojipicker:1.4.0-beta01' implementation 'androidx.emoji2:emoji2-emojipicker:1.4.0-beta02'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
implementation 'androidx.media:media:1.6.0' implementation 'androidx.media:media:1.6.0'
implementation "androidx.security:security-crypto-ktx:1.1.0-alpha05" implementation "androidx.security:security-crypto-ktx:1.1.0-alpha05"

8
app/src/main/java/org/linphone/core/CoreContext.kt
View file

@ -99,8 +99,8 @@ class CoreContext(
} }
val sdkVersion: String by lazy { val sdkVersion: String by lazy {
val sdkVersion = context.getString(R.string.linphone_sdk_version) val sdkVersion = context.getString(org.linphone.core.R.string.linphone_sdk_version)
val sdkBranch = context.getString(R.string.linphone_sdk_branch) val sdkBranch = context.getString(org.linphone.core.R.string.linphone_sdk_branch)
val sdkBuildType = org.linphone.core.BuildConfig.BUILD_TYPE val sdkBuildType = org.linphone.core.BuildConfig.BUILD_TYPE
"$sdkVersion ($sdkBranch, $sdkBuildType)" "$sdkVersion ($sdkBranch, $sdkBuildType)"
} }
@ -587,8 +587,8 @@ class CoreContext(
val appName: String = context.resources.getString(R.string.user_agent_app_name) val appName: String = context.resources.getString(R.string.user_agent_app_name)
val androidVersion = BuildConfig.VERSION_NAME val androidVersion = BuildConfig.VERSION_NAME
val userAgent = "$appName/$androidVersion ($deviceName) LinphoneSDK" val userAgent = "$appName/$androidVersion ($deviceName) LinphoneSDK"
val sdkVersion = context.getString(R.string.linphone_sdk_version) val sdkVersion = context.getString(org.linphone.core.R.string.linphone_sdk_version)
val sdkBranch = context.getString(R.string.linphone_sdk_branch) val sdkBranch = context.getString(org.linphone.core.R.string.linphone_sdk_branch)
val sdkUserAgent = "$sdkVersion ($sdkBranch)" val sdkUserAgent = "$sdkVersion ($sdkBranch)"
core.setUserAgent(userAgent, sdkUserAgent) core.setUserAgent(userAgent, sdkUserAgent)
} }

4
gradle.properties
View file

@ -19,5 +19,5 @@ android.useAndroidX=true
kotlin.code.style=official kotlin.code.style=official
LinphoneSdkBuildDir= LinphoneSdkBuildDir=
android.defaults.buildfeatures.buildconfig=true android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false android.nonTransitiveRClass=true
android.nonFinalResIds=false android.nonFinalResIds=true