mobile/home-assistant-android
mobile/home-assistant-android
1
0
Fork 0
mirror of https://github.com/home-assistant/android synced 2024-07-05 17:18:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump Google dependencies (#2910)

Browse Source
This commit is contained in:
Joris Pelgröm 2022-09-24 22:04:58 +02:00 committed by GitHub
parent 603e411823
commit 0222d6b673
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/build.gradle.kts
View File

@ -146,13 +146,13 @@ dependencies {
implementation("com.google.dagger:hilt-android:2.43.2")
kapt("com.google.dagger:hilt-android-compiler:2.43.2")
implementation("androidx.appcompat:appcompat:1.5.0")
implementation("androidx.appcompat:appcompat:1.5.1")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.5.1")
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
implementation("androidx.recyclerview:recyclerview:1.2.1")
implementation("androidx.preference:preference-ktx:1.2.0")
implementation("com.google.android.material:material:1.6.1")
implementation("androidx.fragment:fragment-ktx:1.5.2")
implementation("androidx.fragment:fragment-ktx:1.5.3")
implementation("com.squareup.retrofit2:retrofit:2.9.0")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.13.4")
@ -160,28 +160,28 @@ dependencies {
implementation("com.squareup.picasso:picasso:2.8")
"fullImplementation"("com.google.android.gms:play-services-location:20.0.0")
"fullImplementation"("com.google.firebase:firebase-core:21.1.0")
"fullImplementation"("com.google.firebase:firebase-iid:21.1.0")
"fullImplementation"("com.google.firebase:firebase-messaging:23.0.7")
"fullImplementation"(platform("com.google.firebase:firebase-bom:30.4.1"))
"fullImplementation"("com.google.firebase:firebase-analytics")
"fullImplementation"("com.google.firebase:firebase-messaging")
"fullImplementation"("io.sentry:sentry-android:6.4.1")
"fullImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.4")
"fullImplementation"("com.google.android.gms:play-services-wearable:17.1.0")
"fullImplementation"("com.google.android.gms:play-services-wearable:18.0.0")
"fullImplementation"("androidx.wear:wear-remote-interactions:1.0.0")
implementation("androidx.biometric:biometric:1.1.0")
implementation("androidx.webkit:webkit:1.4.0")
implementation("androidx.webkit:webkit:1.5.0")
implementation("com.google.android.exoplayer:exoplayer-core:2.17.1")
implementation("com.google.android.exoplayer:exoplayer-hls:2.17.1")
implementation("com.google.android.exoplayer:exoplayer-ui:2.17.1")
"fullImplementation"("com.google.android.exoplayer:extension-cronet:2.17.1")
"minimalImplementation"("com.google.android.exoplayer:extension-cronet:2.15.1") {
implementation("com.google.android.exoplayer:exoplayer-core:2.18.1")
implementation("com.google.android.exoplayer:exoplayer-hls:2.18.1")
implementation("com.google.android.exoplayer:exoplayer-ui:2.18.1")
"fullImplementation"("com.google.android.exoplayer:extension-cronet:2.18.1")
"minimalImplementation"("com.google.android.exoplayer:extension-cronet:2.18.1") {
exclude(group = "com.google.android.gms", module = "play-services-cronet")
}
"minimalImplementation"("org.chromium.net:cronet-embedded:101.4951.41")
"minimalImplementation"("org.chromium.net:cronet-embedded:105.5195.68")
implementation("androidx.compose.animation:animation:1.2.1")
implementation("androidx.compose.compiler:compiler:1.3.0")
implementation("androidx.compose.compiler:compiler:1.3.1")
implementation("androidx.compose.foundation:foundation:1.2.1")
implementation("androidx.compose.material:material:1.2.1")
implementation("androidx.compose.material:material-icons-core:1.2.1")
@ -189,9 +189,9 @@ dependencies {
implementation("androidx.compose.runtime:runtime:1.2.1")
implementation("androidx.compose.ui:ui:1.2.1")
implementation("androidx.compose.ui:ui-tooling:1.2.1")
implementation("androidx.activity:activity-compose:1.5.1")
implementation("androidx.navigation:navigation-compose:2.5.1")
implementation("com.google.android.material:compose-theme-adapter:1.1.15")
implementation("androidx.activity:activity-compose:1.6.0")
implementation("androidx.navigation:navigation-compose:2.5.2")
implementation("com.google.android.material:compose-theme-adapter:1.1.19")
implementation("com.google.accompanist:accompanist-appcompat-theme:0.25.1")
implementation("com.mikepenz:iconics-core:5.3.4")

19
wear/build.gradle.kts
View File

@ -95,11 +95,10 @@ dependencies {
implementation("com.google.android.material:material:1.6.1")
implementation("androidx.wear:wear:1.2.0")
implementation("com.google.android.gms:play-services-wearable:17.1.0")
implementation("com.google.android.gms:play-services-wearable:18.0.0")
implementation("androidx.wear:wear-input:1.2.0-alpha02")
implementation("androidx.wear:wear-remote-interactions:1.0.0")
implementation("androidx.wear:wear-phone-interactions:1.0.1")
compileOnly("com.google.android.wearable:wearable:2.9.0")
implementation("com.google.dagger:hilt-android:2.43.2")
kapt("com.google.dagger:hilt-android-compiler:2.43.2")
@ -108,21 +107,21 @@ dependencies {
implementation("com.squareup.okhttp3:okhttp:4.10.0")
implementation("com.mikepenz:iconics-core:5.3.4")
implementation("androidx.appcompat:appcompat:1.5.0")
implementation("androidx.appcompat:appcompat:1.5.1")
implementation("com.mikepenz:community-material-typeface:6.4.95.0-kotlin@aar")
implementation("com.mikepenz:iconics-compose:5.3.4")
implementation("androidx.activity:activity-ktx:1.5.1")
implementation("androidx.activity:activity-compose:1.5.1")
implementation("androidx.compose.compiler:compiler:1.3.0")
implementation("androidx.activity:activity-ktx:1.6.0")
implementation("androidx.activity:activity-compose:1.6.0")
implementation("androidx.compose.compiler:compiler:1.3.1")
implementation("androidx.compose.foundation:foundation:1.2.1")
implementation("androidx.compose.ui:ui-tooling:1.2.1")
implementation("androidx.wear.compose:compose-foundation:1.0.0")
implementation("androidx.wear.compose:compose-material:1.0.0")
implementation("androidx.wear.compose:compose-navigation:1.0.0")
implementation("androidx.wear.compose:compose-foundation:1.0.2")
implementation("androidx.wear.compose:compose-material:1.0.2")
implementation("androidx.wear.compose:compose-navigation:1.0.2")
implementation("com.google.guava:guava:31.1-android")
implementation("androidx.wear.tiles:tiles:1.0.1")
implementation("androidx.wear.tiles:tiles:1.1.0")
implementation("androidx.wear.watchface:watchface-complications-data-source-ktx:1.1.1")
}

4
wear/src/main/java/io/homeassistant/companion/android/phone/PhoneSettingsListener.kt
View File

@ -110,8 +110,8 @@ class PhoneSettingsListener : WearableListenerService(), DataClient.OnDataChange
private fun login(dataMap: DataMap) = mainScope.launch {
try {
val url = dataMap.getString("URL")
val authCode = dataMap.getString("AuthCode")
val url = dataMap.getString("URL", "")
val authCode = dataMap.getString("AuthCode", "")
val deviceName = dataMap.getString("DeviceName")
val deviceTrackingEnabled = dataMap.getBoolean("LocationTracking")