Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
Linhome-Android
Commits
313d1e4e
Commit
313d1e4e
authored
Jan 20, 2022
by
Christophe Deschamps
Browse files
Bulk dependencies upgrade
parent
cdf240ec
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
41 additions
and
36 deletions
+41
-36
app/build.gradle
app/build.gradle
+24
-24
app/src/main/AndroidManifest.xml
app/src/main/AndroidManifest.xml
+7
-4
app/src/main/java/org/linhome/linphonecore/CoreContext.kt
app/src/main/java/org/linhome/linphonecore/CoreContext.kt
+0
-1
app/src/main/java/org/linhome/store/DeviceStore.kt
app/src/main/java/org/linhome/store/DeviceStore.kt
+4
-0
build.gradle
build.gradle
+5
-6
gradle/wrapper/gradle-wrapper.properties
gradle/wrapper/gradle-wrapper.properties
+1
-1
No files found.
app/build.gradle
View file @
313d1e4e
...
...
@@ -76,12 +76,12 @@ project.tasks['preBuild'].dependsOn 'getGitVersion'
android
{
compileSdkVersion
29
compileSdkVersion
31
defaultConfig
{
applicationId
"org.linhome"
minSdkVersion
23
targetSdkVersion
29
targetSdkVersion
31
versionCode
26
versionName
"${project.version}"
...
...
@@ -146,35 +146,35 @@ android {
dependencies
{
implementation
platform
(
'com.google.firebase:firebase-bom:25.12.0'
)
implementation
fileTree
(
dir:
'libs'
,
include:
[
'*.jar'
])
implementation
"org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.
4
.10"
implementation
'androidx.appcompat:appcompat:1.
2.0
'
implementation
'androidx.core:core-ktx:1.
3.2
'
implementation
'com.google.android.material:material:1.
2.1
'
implementation
'androidx.constraintlayout:constraintlayout:2.
0.4
'
implementation
"org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.
6
.10"
implementation
'androidx.appcompat:appcompat:1.
4.1
'
implementation
'androidx.core:core-ktx:1.
7.0
'
implementation
'com.google.android.material:material:1.
5.0
'
implementation
'androidx.constraintlayout:constraintlayout:2.
1.3
'
implementation
'androidx.vectordrawable:vectordrawable:1.1.0'
implementation
'androidx.navigation:navigation-fragment:2.3.
1
'
implementation
'androidx.navigation:navigation-ui:2.3.
1
'
implementation
'androidx.navigation:navigation-fragment:2.3.
5
'
implementation
'androidx.navigation:navigation-ui:2.3.
5
'
implementation
'androidx.lifecycle:lifecycle-extensions:2.2.0'
implementation
'androidx.navigation:navigation-fragment-ktx:2.3.
1
'
implementation
'androidx.navigation:navigation-ui-ktx:2.3.
1
'
implementation
'androidx.navigation:navigation-fragment-ktx:2.3.
5
'
implementation
'androidx.navigation:navigation-ui-ktx:2.3.
5
'
testImplementation
'junit:junit:4.12'
androidTestImplementation
'androidx.test.ext:junit:1.1.
2
'
androidTestImplementation
'androidx.test.espresso:espresso-core:3.
3
.0'
implementation
"org.linphone:linphone-sdk-android:5.
0
+"
implementation
"org.permissionsdispatcher:permissionsdispatcher:4.
7
.0"
kapt
"org.permissionsdispatcher:permissionsdispatcher-processor:4.
7
.0"
implementation
"com.google.android.material:material:1.
2.1
"
androidTestImplementation
'androidx.test.ext:junit:1.1.
3
'
androidTestImplementation
'androidx.test.espresso:espresso-core:3.
4
.0'
implementation
"org.linphone:linphone-sdk-android:5.
2
+"
implementation
"org.permissionsdispatcher:permissionsdispatcher:4.
8
.0"
kapt
"org.permissionsdispatcher:permissionsdispatcher-processor:4.
8
.0"
implementation
"com.google.android.material:material:1.
5.0
"
implementation
'commons-codec:commons-codec:1.10'
implementation
"org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7"
implementation
'com.github.bumptech.glide:glide:4.1
1
.0'
kapt
'com.github.bumptech.glide:compiler:4.1
1
.0'
implementation
'com.github.bumptech.glide:glide:4.1
2
.0'
kapt
'com.github.bumptech.glide:compiler:4.1
2
.0'
implementation
'com.caverock:androidsvg-aar:1.4'
implementation
'com.google.firebase:firebase-messaging:2
1
.0.0'
implementation
'com.google.firebase:firebase-analytics:
18
.0.
0
'
implementation
'com.google.firebase:firebase-crashlytics:1
7.3.0
'
implementation
'com.google.firebase:firebase-messaging:2
3
.0.0'
implementation
'com.google.firebase:firebase-analytics:
20
.0.
2
'
implementation
'com.google.firebase:firebase-crashlytics:1
8.2.6
'
implementation
'com.github.ybq:Android-SpinKit:1.4.0'
implementation
"androidx.media:media:1.
2.0
"
implementation
'com.google.firebase:firebase-crashlytics-ndk:1
7.3.0
'
implementation
"androidx.media:media:1.
4.3
"
implementation
'com.google.firebase:firebase-crashlytics-ndk:1
8.2.6
'
}
...
...
app/src/main/AndroidManifest.xml
View file @
313d1e4e
...
...
@@ -43,7 +43,8 @@
android:label=
"@string/app_name"
android:screenOrientation=
"sensor"
android:windowSoftInputMode=
"adjustResize"
android:theme=
"@style/LinhomeTheme"
>
android:theme=
"@style/LinhomeTheme"
android:exported=
"false"
>
<nav-graph
android:value=
"@navigation/fragments_graph"
/>
</activity>
<activity
...
...
@@ -51,7 +52,7 @@
android:label=
"@string/app_name"
android:screenOrientation=
"sensor"
android:theme=
"@style/LinhomeTheme"
>
android:exported=
"true"
>
<intent-filter>
<action
android:name=
"android.intent.action.MAIN"
/>
<category
android:name=
"android.intent.category.LAUNCHER"
/>
...
...
@@ -88,7 +89,8 @@
</activity>
<!-- Receivers -->
<receiver
android:name=
"org.linhome.linphonecore.CorePushReceiver"
>
<receiver
android:name=
"org.linhome.linphonecore.CorePushReceiver"
android:exported=
"false"
>
<intent-filter>
<action
android:name=
"org.linhome.core.action.PUSH_RECEIVED"
/>
</intent-filter>
...
...
@@ -99,7 +101,8 @@
android:enabled=
"true"
android:exported=
"false"
/>
<receiver
android:name=
"org.linhome.linphonecore.BootReceiver"
>
<receiver
android:name=
"org.linhome.linphonecore.BootReceiver"
android:exported=
"false"
>
<intent-filter>
<action
android:name=
"android.intent.action.BOOT_COMPLETED"
/>
<action
android:name=
"android.intent.action.ACTION_SHUTDOWN"
/>
...
...
app/src/main/java/org/linhome/linphonecore/CoreContext.kt
View file @
313d1e4e
...
...
@@ -245,7 +245,6 @@ class CoreContext(val context: Context, coreConfig: Config) {
Log
.
i
(
"[Context] Configuring Core"
)
core
.
zrtpSecretsFile
=
context
.
filesDir
.
absolutePath
+
"/zrtp_secrets"
core
.
callLogsDatabasePath
=
context
.
filesDir
.
absolutePath
+
"/linphone-log-history.db"
initUserCertificates
()
...
...
app/src/main/java/org/linhome/store/DeviceStore.kt
View file @
313d1e4e
...
...
@@ -33,6 +33,10 @@ object DeviceStore {
private
var
devicesConfig
:
Config
val
vcard_device_type_header
=
"X-LINPHONE-ACCOUNT-TYPE"
val
vcard_actions_list_header
=
"X-LINPHONE-ACCOUNT-ACTION"
val
vcard_action_method_type_header
=
"X-LINPHONE-ACCOUNT-DTMF-PROTOCOL"
var
devices
:
ArrayList
<
Device
>
init
{
...
...
build.gradle
View file @
313d1e4e
...
...
@@ -3,14 +3,13 @@ buildscript {
repositories
{
google
()
jcenter
()
}
dependencies
{
classpath
'com.android.tools.build:gradle:
4.1.3
'
classpath
"org.jetbrains.kotlin:kotlin-gradle-plugin:1.
4
.10"
classpath
'com.google.gms:google-services:4.3.
4
'
classpath
"androidx.navigation:navigation-safe-args-gradle-plugin:2.3.
1
"
classpath
'com.google.firebase:firebase-crashlytics-gradle:2.
4
.1'
classpath
'com.android.tools.build:gradle:
7.0.4
'
classpath
"org.jetbrains.kotlin:kotlin-gradle-plugin:1.
6
.10"
classpath
'com.google.gms:google-services:4.3.
10
'
classpath
"androidx.navigation:navigation-safe-args-gradle-plugin:2.3.
5
"
classpath
'com.google.firebase:firebase-crashlytics-gradle:2.
8
.1'
}
}
...
...
gradle/wrapper/gradle-wrapper.properties
View file @
313d1e4e
...
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
6.5
-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
7.0.2
-all.zip
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment