kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
add compose libs
rodzic
0eb3486eb9
commit
3e1416f7ce
|
@ -63,7 +63,6 @@ android {
|
||||||
pseudoLocalesEnabled true
|
pseudoLocalesEnabled true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
// We have to list all translated languages here, because some of our libs have bogus languages that google play
|
// We have to list all translated languages here, because some of our libs have bogus languages that google play
|
||||||
// doesn't like and we need to strip them (gr)
|
// doesn't like and we need to strip them (gr)
|
||||||
|
@ -73,26 +72,27 @@ android {
|
||||||
// abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
|
// abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
buildFeatures {
|
buildFeatures {
|
||||||
viewBinding true
|
viewBinding true
|
||||||
}
|
}
|
||||||
|
buildFeatures {
|
||||||
|
compose true
|
||||||
|
}
|
||||||
// Set both the Java and Kotlin compilers to target Java 8.
|
// Set both the Java and Kotlin compilers to target Java 8.
|
||||||
|
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility JavaVersion.VERSION_1_8
|
sourceCompatibility JavaVersion.VERSION_1_8
|
||||||
targetCompatibility JavaVersion.VERSION_1_8
|
targetCompatibility JavaVersion.VERSION_1_8
|
||||||
}
|
}
|
||||||
|
|
||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
jvmTarget = "1.8"
|
jvmTarget = "1.8"
|
||||||
freeCompilerArgs += ['-opt-in=kotlin.RequiresOptIn']
|
freeCompilerArgs += ['-opt-in=kotlin.RequiresOptIn']
|
||||||
}
|
}
|
||||||
|
composeOptions {
|
||||||
|
kotlinCompilerExtensionVersion compose_version
|
||||||
|
}
|
||||||
lint {
|
lint {
|
||||||
abortOnError false
|
abortOnError false
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
play {
|
play {
|
||||||
|
@ -148,6 +148,16 @@ dependencies {
|
||||||
kapt "com.google.dagger:hilt-compiler:$hilt_version"
|
kapt "com.google.dagger:hilt-compiler:$hilt_version"
|
||||||
implementation "androidx.datastore:datastore:$datastore_version"
|
implementation "androidx.datastore:datastore:$datastore_version"
|
||||||
|
|
||||||
|
// Compose
|
||||||
|
implementation "androidx.compose.runtime:runtime:$compose_version"
|
||||||
|
implementation "androidx.compose.ui:ui:$compose_version"
|
||||||
|
implementation "androidx.compose.foundation:foundation:$compose_version"
|
||||||
|
implementation "androidx.compose.foundation:foundation-layout:$compose_version"
|
||||||
|
implementation "androidx.compose.material:material:$compose_version"
|
||||||
|
implementation "androidx.compose.runtime:runtime-livedata:$compose_version"
|
||||||
|
implementation "androidx.compose.ui:ui-tooling:$compose_version"
|
||||||
|
implementation "com.google.android.material:compose-theme-adapter:1.1.14"
|
||||||
|
|
||||||
// Osmdroid & Maps
|
// Osmdroid & Maps
|
||||||
implementation 'org.osmdroid:osmdroid-android:6.1.14'
|
implementation 'org.osmdroid:osmdroid-android:6.1.14'
|
||||||
implementation 'com.github.MKergall:osmbonuspack:6.9.0'
|
implementation 'com.github.MKergall:osmbonuspack:6.9.0'
|
||||||
|
|
|
@ -8,6 +8,7 @@ buildscript {
|
||||||
room_version = '2.4.3'
|
room_version = '2.4.3'
|
||||||
hilt_version = '2.40.5'
|
hilt_version = '2.40.5'
|
||||||
datastore_version = '1.0.0'
|
datastore_version = '1.0.0'
|
||||||
|
compose_version = '1.2.0-rc02'
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
|
|
Ładowanie…
Reference in New Issue