kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Upgrade Compose and other AndroidX libraries (#1477)

Browse source 
* app: re-enable Compose

* app: remove inapplicable lint suppression

* gradle: bump AndroidX dependencies
This commit is contained in:
Harsh Shandilya 2021-08-05 02:11:31 +05:30 committed by GitHub
parent 1071e0e749
commit 6004addf62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
app/build.gradle.kts
View file

@ -14,7 +14,6 @@ plugins {
`crowdin-plugin` `crowdin-plugin`
} }
/*
repositories { repositories {
val composeSnapshot = libs.versions.composeSnapshot.get() val composeSnapshot = libs.versions.composeSnapshot.get()
if (composeSnapshot.length > 1) { if (composeSnapshot.length > 1) {
@ -30,7 +29,6 @@ repositories {
} }
} }
} }
*/
configure<CrowdinExtension> { projectName = "android-password-store" } configure<CrowdinExtension> { projectName = "android-password-store" }
@ -49,21 +47,16 @@ android {
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
} }
// buildFeatures.compose = true buildFeatures.compose = true
lintOptions { lintOptions {
isAbortOnError = true isAbortOnError = true
isCheckReleaseBuilds = false isCheckReleaseBuilds = false
disable("MissingTranslation", "PluralsCandidate", "ImpliedQuantity") disable("MissingTranslation", "PluralsCandidate", "ImpliedQuantity")
// https://issuetracker.google.com/issues/187524311
disable("DialogFragmentCallbacksDetector")
disable("CoroutineCreationDuringComposition") disable("CoroutineCreationDuringComposition")
} }
// composeOptions { composeOptions { kotlinCompilerExtensionVersion = libs.versions.compose.get() }
// kotlinCompilerVersion = libs.versions.kotlin.get()
// kotlinCompilerExtensionVersion = libs.versions.compose.get()
// }
} }
dependencies { dependencies {
@ -94,14 +87,14 @@ dependencies {
implementation(libs.kotlin.coroutines.android) implementation(libs.kotlin.coroutines.android)
implementation(libs.kotlin.coroutines.core) implementation(libs.kotlin.coroutines.core)
// implementation(libs.androidx.activity.compose) implementation(libs.androidx.activity.compose)
// implementation(libs.androidx.hilt.compose) implementation(libs.androidx.hilt.compose)
// implementation(libs.compose.foundation.core) implementation(libs.compose.foundation.core)
// implementation(libs.compose.foundation.layout) implementation(libs.compose.foundation.layout)
// implementation(libs.compose.material) implementation(libs.compose.material)
// implementation(libs.compose.ui.core) implementation(libs.compose.ui.core)
// implementation(libs.compose.ui.viewbinding) implementation(libs.compose.ui.viewbinding)
// compileOnly(libs.compose.ui.tooling) compileOnly(libs.compose.ui.tooling)
implementation(libs.aps.sublimeFuzzy) implementation(libs.aps.sublimeFuzzy)
implementation(libs.aps.zxingAndroidEmbedded) implementation(libs.aps.zxingAndroidEmbedded)

8
gradle/libs.versions.toml
View file

@ -1,13 +1,13 @@
# Centralized versions for dependencies that share versions # Centralized versions for dependencies that share versions
[versions] [versions]
androidx_activity = "1.3.0-rc02" androidx_activity = "1.3.1"
androidx_test = "1.4.0" androidx_test = "1.4.0"
compose = "1.0.0-rc02" compose = "1.1.0-alpha01"
composeSnapshot = "-" composeSnapshot = "-"
coroutines = "1.5.1" coroutines = "1.5.1"
hilt = "2.38.1" hilt = "2.38.1"
kotlin = "1.5.21" kotlin = "1.5.21"
lifecycle = "2.4.0-alpha02" lifecycle = "2.4.0-alpha03"
[libraries] [libraries]
# Kotlin dependencies # Kotlin dependencies
@ -24,7 +24,7 @@ androidx-biometricKtx = "androidx.biometric:biometric-ktx:1.2.0-alpha03"
androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.0-rc01" androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.0-rc01"
androidx-core-ktx = "androidx.core:core-ktx:1.7.0-alpha01" androidx-core-ktx = "androidx.core:core-ktx:1.7.0-alpha01"
androidx-documentfile = "androidx.documentfile:documentfile:1.0.1" androidx-documentfile = "androidx.documentfile:documentfile:1.0.1"
androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.4.0-alpha05" androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.4.0-alpha06"
androidx-hilt-compose = "androidx.hilt:hilt-navigation-compose:1.0.0-alpha03" androidx-hilt-compose = "androidx.hilt:hilt-navigation-compose:1.0.0-alpha03"
androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common-java8", version.ref="lifecycle" } androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common-java8", version.ref="lifecycle" }
androidx-lifecycle-livedataKtx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref="lifecycle" } androidx-lifecycle-livedataKtx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref="lifecycle" }