diff --git a/app/build.gradle b/app/build.gradle index eeea88ed8..7660534cc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,7 +63,6 @@ android { pseudoLocalesEnabled true } } - defaultConfig { // 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) @@ -73,26 +72,27 @@ android { // abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64" } } - buildFeatures { viewBinding true } - + buildFeatures { + compose true + } // Set both the Java and Kotlin compilers to target Java 8. - compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - kotlinOptions { jvmTarget = "1.8" freeCompilerArgs += ['-opt-in=kotlin.RequiresOptIn'] } + composeOptions { + kotlinCompilerExtensionVersion compose_version + } lint { abortOnError false } - } play { @@ -148,6 +148,16 @@ dependencies { kapt "com.google.dagger:hilt-compiler:$hilt_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 implementation 'org.osmdroid:osmdroid-android:6.1.14' implementation 'com.github.MKergall:osmbonuspack:6.9.0' diff --git a/build.gradle b/build.gradle index 5e2dbbaff..c76a2ce58 100644 --- a/build.gradle +++ b/build.gradle @@ -8,6 +8,7 @@ buildscript { room_version = '2.4.3' hilt_version = '2.40.5' datastore_version = '1.0.0' + compose_version = '1.2.0-rc02' } repositories {