Merge branch 'develop' into feature/fga/presenter_tests

This commit is contained in:
ganfra 2023-01-18 20:47:15 +01:00
commit df723bfc44
300 changed files with 772 additions and 209 deletions

View file

@ -15,12 +15,8 @@
*/
import org.gradle.api.JavaVersion
import org.gradle.api.artifacts.VersionCatalog
import org.gradle.jvm.toolchain.JavaLanguageVersion
val VersionCatalog.composeVersion: String
get() = findVersion("compose_compiler").get().requiredVersion
object Versions {
const val versionCode = 100100
const val versionName = "0.1.0"

View file

@ -49,7 +49,7 @@ fun CommonExtension<*, *, *, *>.composeConfig() {
}
composeOptions {
kotlinCompilerExtensionVersion = "1.3.2"
kotlinCompilerExtensionVersion = "1.4.0"
}
packagingOptions {

View file

@ -32,7 +32,7 @@ fun DependencyHandlerScope.commonDependencies() {
* Dependencies used by all the modules with composable items
*/
fun DependencyHandlerScope.composeDependencies() {
val composeBom = platform("androidx.compose:compose-bom:2022.11.00")
val composeBom = platform("androidx.compose:compose-bom:2023.01.00")
implementation(composeBom)
androidTestImplementation(composeBom)
implementation("androidx.compose.ui:ui")