mobile/home-assistant-android
mobile/home-assistant-android
1
0
Fork 0
mirror of https://github.com/home-assistant/android synced 2024-10-02 22:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump and switch to compose BOM dependency (#3028)

Browse source 
* Bump and switch to compose BOM dependency

* Bump kotlin and compose extensions
This commit is contained in:
Daniel Shokouhi 2022-11-03 09:31:35 -07:00 committed by GitHub
parent 150f919a1b
commit c89184bf31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 32 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
app/build.gradle.kts
View file

@ -37,7 +37,7 @@ android {
}
composeOptions {
kotlinCompilerExtensionVersion = "1.1.1"
kotlinCompilerExtensionVersion = "1.3.2"
}
kotlinOptions {
@ -140,8 +140,8 @@ dependencies {
exclude(group = "org.json", module = "json")
}
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21")
implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.21")
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20")
implementation("org.jetbrains.kotlin:kotlin-reflect:1.7.20")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
"fullImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.4")
@ -154,8 +154,8 @@ dependencies {
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.3")
implementation("com.google.android.material:material:1.7.0")
implementation("androidx.fragment:fragment-ktx:1.5.4")
implementation("com.squareup.retrofit2:retrofit:2.9.0")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.13.4")
@ -182,18 +182,19 @@ dependencies {
}
"minimalImplementation"("org.chromium.net:cronet-embedded:105.5195.68")
implementation("androidx.compose.animation:animation:1.2.1")
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")
implementation("androidx.compose.material:material-icons-extended:1.2.1")
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.6.0")
implementation("androidx.navigation:navigation-compose:2.5.2")
implementation("com.google.android.material:compose-theme-adapter:1.1.19")
implementation(platform("androidx.compose:compose-bom:2022.10.00"))
implementation("androidx.compose.animation:animation")
implementation("androidx.compose.compiler:compiler:1.3.2")
implementation("androidx.compose.foundation:foundation")
implementation("androidx.compose.material:material")
implementation("androidx.compose.material:material-icons-core")
implementation("androidx.compose.material:material-icons-extended")
implementation("androidx.compose.runtime:runtime")
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-tooling")
implementation("androidx.activity:activity-compose:1.6.1")
implementation("androidx.navigation:navigation-compose:2.5.3")
implementation("com.google.android.material:compose-theme-adapter:1.1.21")
implementation("com.google.accompanist:accompanist-appcompat-theme:0.25.1")
implementation("com.mikepenz:iconics-core:5.4.0")

2
build.gradle.kts
View file

@ -12,7 +12,7 @@ buildscript {
}
dependencies {
classpath("com.android.tools.build:gradle:7.3.1")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20")
classpath("com.google.gms:google-services:4.3.14")
classpath("com.google.firebase:firebase-appdistribution-gradle:3.1.0")
classpath("de.mannodermaus.gradle.plugins:android-junit5:1.8.2.1")

4
common/build.gradle.kts
View file

@ -55,8 +55,8 @@ android {
}
dependencies {
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21")
implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.21")
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20")
implementation("org.jetbrains.kotlin:kotlin-reflect:1.7.20")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
implementation("com.google.dagger:hilt-android:2.44")

17
wear/build.gradle.kts
View file

@ -34,7 +34,7 @@ android {
}
composeOptions {
kotlinCompilerExtensionVersion = "1.1.1"
kotlinCompilerExtensionVersion = "1.3.2"
}
compileOptions {
@ -90,12 +90,12 @@ play {
dependencies {
implementation(project(":common"))
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21")
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.6.4")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.4")
implementation("com.google.android.material:material:1.6.1")
implementation("com.google.android.material:material:1.7.0")
implementation("androidx.wear:wear:1.2.0")
implementation("com.google.android.gms:play-services-wearable:18.0.0")
@ -114,11 +114,12 @@ dependencies {
implementation("com.mikepenz:community-material-typeface:7.0.96.0-kotlin@aar")
implementation("com.mikepenz:iconics-compose:5.4.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.activity:activity-ktx:1.6.1")
implementation("androidx.activity:activity-compose:1.6.1")
implementation("androidx.compose.compiler:compiler:1.3.2")
implementation(platform("androidx.compose:compose-bom:2022.10.00"))
implementation("androidx.compose.foundation:foundation")
implementation("androidx.compose.ui:ui-tooling")
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")

3
wear/src/main/java/io/homeassistant/companion/android/home/views/SensorsView.kt
View file

@ -67,7 +67,8 @@ fun SensorsView(
@Composable
fun getSensorManagers(): List<SensorManager> {
return SensorReceiver.MANAGERS.sortedBy { stringResource(it.name) }.filter { it.hasSensor(LocalContext.current) }
val context = LocalContext.current
return SensorReceiver.MANAGERS.sortedBy { context.getString(it.name) }.filter { it.hasSensor(context) }
}
@Preview(device = Devices.WEAR_OS_LARGE_ROUND)