sforkowany z mirror/meshtastic-android
chore: update Compose to 1.3.2
rodzic
f3356db1c9
commit
61489b4956
|
@ -84,7 +84,7 @@ android {
|
||||||
compose true
|
compose true
|
||||||
}
|
}
|
||||||
composeOptions {
|
composeOptions {
|
||||||
kotlinCompilerExtensionVersion compose_version
|
kotlinCompilerExtensionVersion = "1.3.2"
|
||||||
}
|
}
|
||||||
// Set both the Java and Kotlin compilers to target Java 8.
|
// Set both the Java and Kotlin compilers to target Java 8.
|
||||||
compileOptions {
|
compileOptions {
|
||||||
|
@ -152,14 +152,21 @@ dependencies {
|
||||||
implementation "androidx.datastore:datastore:$datastore_version"
|
implementation "androidx.datastore:datastore:$datastore_version"
|
||||||
|
|
||||||
// Compose
|
// Compose
|
||||||
implementation "androidx.compose.runtime:runtime:$compose_version"
|
def composeBom = platform('androidx.compose:compose-bom:2022.12.00')
|
||||||
implementation "androidx.compose.ui:ui:$compose_version"
|
implementation composeBom
|
||||||
implementation "androidx.compose.foundation:foundation:$compose_version"
|
androidTestImplementation composeBom
|
||||||
implementation "androidx.compose.foundation:foundation-layout:$compose_version"
|
|
||||||
implementation "androidx.compose.material:material:$compose_version"
|
implementation 'androidx.compose.material:material'
|
||||||
implementation "androidx.compose.runtime:runtime-livedata:$compose_version"
|
implementation 'androidx.compose.runtime:runtime-livedata'
|
||||||
implementation "androidx.compose.ui:ui-tooling:$compose_version"
|
implementation "com.google.accompanist:accompanist-themeadapter-material:0.28.0"
|
||||||
implementation "com.google.android.material:compose-theme-adapter:1.1.14"
|
|
||||||
|
// Android Studio Preview support
|
||||||
|
implementation 'androidx.compose.ui:ui-tooling-preview'
|
||||||
|
debugImplementation 'androidx.compose.ui:ui-tooling'
|
||||||
|
|
||||||
|
// UI Tests
|
||||||
|
androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
|
||||||
|
debugImplementation 'androidx.compose.ui:ui-test-manifest'
|
||||||
|
|
||||||
// Osmdroid & Maps
|
// Osmdroid & Maps
|
||||||
def osmdroid_version = '6.1.14'
|
def osmdroid_version = '6.1.14'
|
||||||
|
|
|
@ -9,7 +9,7 @@ import androidx.fragment.app.activityViewModels
|
||||||
import com.geeksville.mesh.android.Logging
|
import com.geeksville.mesh.android.Logging
|
||||||
import com.geeksville.mesh.databinding.ComposeViewBinding
|
import com.geeksville.mesh.databinding.ComposeViewBinding
|
||||||
import com.geeksville.mesh.model.UIViewModel
|
import com.geeksville.mesh.model.UIViewModel
|
||||||
import com.google.android.material.composethemeadapter.MdcTheme
|
import com.google.accompanist.themeadapter.material.MdcTheme
|
||||||
import dagger.hilt.android.AndroidEntryPoint
|
import dagger.hilt.android.AndroidEntryPoint
|
||||||
|
|
||||||
@AndroidEntryPoint
|
@AndroidEntryPoint
|
||||||
|
|
|
@ -9,7 +9,7 @@ import androidx.fragment.app.activityViewModels
|
||||||
import com.geeksville.mesh.android.Logging
|
import com.geeksville.mesh.android.Logging
|
||||||
import com.geeksville.mesh.databinding.ComposeViewBinding
|
import com.geeksville.mesh.databinding.ComposeViewBinding
|
||||||
import com.geeksville.mesh.model.UIViewModel
|
import com.geeksville.mesh.model.UIViewModel
|
||||||
import com.google.android.material.composethemeadapter.MdcTheme
|
import com.google.accompanist.themeadapter.material.MdcTheme
|
||||||
import dagger.hilt.android.AndroidEntryPoint
|
import dagger.hilt.android.AndroidEntryPoint
|
||||||
|
|
||||||
@AndroidEntryPoint
|
@AndroidEntryPoint
|
||||||
|
|
|
@ -3,13 +3,12 @@
|
||||||
buildscript {
|
buildscript {
|
||||||
ext {
|
ext {
|
||||||
useCrashlytics = false
|
useCrashlytics = false
|
||||||
kotlin_version = '1.6.21'
|
kotlin_version = '1.7.20'
|
||||||
coroutines_version = '1.6.4'
|
coroutines_version = '1.6.4'
|
||||||
lifecycle_version = "2.5.1"
|
lifecycle_version = "2.5.1"
|
||||||
room_version = '2.4.3'
|
room_version = '2.4.3'
|
||||||
hilt_version = '2.44.2'
|
hilt_version = '2.44.2'
|
||||||
datastore_version = '1.0.0'
|
datastore_version = '1.0.0'
|
||||||
compose_version = '1.2.0-rc02'
|
|
||||||
protobuf_version = '3.21.12'
|
protobuf_version = '3.21.12'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue