From 6004addf629239c95a03763b8122f7d855104999 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Thu, 5 Aug 2021 02:11:31 +0530 Subject: Upgrade Compose and other AndroidX libraries (#1477) * app: re-enable Compose * app: remove inapplicable lint suppression * gradle: bump AndroidX dependencies --- app/build.gradle.kts | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) (limited to 'app') diff --git a/app/build.gradle.kts b/app/build.gradle.kts index adb2fcbc..4ae3136e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -14,7 +14,6 @@ plugins { `crowdin-plugin` } -/* repositories { val composeSnapshot = libs.versions.composeSnapshot.get() if (composeSnapshot.length > 1) { @@ -30,7 +29,6 @@ repositories { } } } -*/ configure { projectName = "android-password-store" } @@ -49,21 +47,16 @@ android { testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } - // buildFeatures.compose = true + buildFeatures.compose = true lintOptions { isAbortOnError = true isCheckReleaseBuilds = false disable("MissingTranslation", "PluralsCandidate", "ImpliedQuantity") - // https://issuetracker.google.com/issues/187524311 - disable("DialogFragmentCallbacksDetector") disable("CoroutineCreationDuringComposition") } - // composeOptions { - // kotlinCompilerVersion = libs.versions.kotlin.get() - // kotlinCompilerExtensionVersion = libs.versions.compose.get() - // } + composeOptions { kotlinCompilerExtensionVersion = libs.versions.compose.get() } } dependencies { @@ -94,14 +87,14 @@ dependencies { implementation(libs.kotlin.coroutines.android) implementation(libs.kotlin.coroutines.core) - // implementation(libs.androidx.activity.compose) - // implementation(libs.androidx.hilt.compose) - // implementation(libs.compose.foundation.core) - // implementation(libs.compose.foundation.layout) - // implementation(libs.compose.material) - // implementation(libs.compose.ui.core) - // implementation(libs.compose.ui.viewbinding) - // compileOnly(libs.compose.ui.tooling) + implementation(libs.androidx.activity.compose) + implementation(libs.androidx.hilt.compose) + implementation(libs.compose.foundation.core) + implementation(libs.compose.foundation.layout) + implementation(libs.compose.material) + implementation(libs.compose.ui.core) + implementation(libs.compose.ui.viewbinding) + compileOnly(libs.compose.ui.tooling) implementation(libs.aps.sublimeFuzzy) implementation(libs.aps.zxingAndroidEmbedded) -- cgit v1.2.3