diff options
| -rw-r--r-- | app/build.gradle.kts | 8 | ||||
| -rw-r--r-- | autofill-parser/src/main/java/com/github/androidpasswordstore/autofillparser/FormField.kt | 2 | ||||
| -rw-r--r-- | gradle/libs.versions.toml | 21 |
3 files changed, 16 insertions, 15 deletions
diff --git a/app/build.gradle.kts b/app/build.gradle.kts index ca591aef..a3a4554a 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -16,7 +16,7 @@ plugins { repositories { val composeSnapshot = libs.versions.composeSnapshot.get() - if (composeSnapshot.isNotEmpty()) { + if (composeSnapshot.length > 1) { maven("https://androidx.dev/snapshots/builds/$composeSnapshot/artifacts/repository/") { content { includeGroup("androidx.compose.animation") @@ -78,14 +78,14 @@ dependencies { implementation(projects.autofillParser) implementation(projects.formatCommon) implementation(projects.openpgpKtx) - implementation(libs.androidx.activityKtx) + implementation(libs.androidx.activity.ktx) implementation(libs.androidx.appcompat) implementation(libs.androidx.autofill) implementation(libs.androidx.biometricKtx) implementation(libs.androidx.constraintlayout) - implementation(libs.androidx.coreKtx) + implementation(libs.androidx.core.ktx) implementation(libs.androidx.documentfile) - implementation(libs.androidx.fragmentKtx) + implementation(libs.androidx.fragment.ktx) implementation(libs.bundles.androidxLifecycle) implementation(libs.androidx.material) implementation(libs.androidx.preference) diff --git a/autofill-parser/src/main/java/com/github/androidpasswordstore/autofillparser/FormField.kt b/autofill-parser/src/main/java/com/github/androidpasswordstore/autofillparser/FormField.kt index 719af425..5aef13a0 100644 --- a/autofill-parser/src/main/java/com/github/androidpasswordstore/autofillparser/FormField.kt +++ b/autofill-parser/src/main/java/com/github/androidpasswordstore/autofillparser/FormField.kt @@ -52,7 +52,7 @@ internal class FormField( private val HINTS_OTP = listOf( HintConstants.AUTOFILL_HINT_SMS_OTP, - HintConstants.AUTOFILL_HINT_TFA_APP_OTP, + HintConstants.AUTOFILL_HINT_2FA_APP_OTP, ) @Suppress("DEPRECATION") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2230f307..e5bcee22 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,9 @@ # Centralized versions for dependencies that share versions [versions] +androidx_activity = "1.3.0-beta01" androidx_test = "1.4.0-beta01" -compose = "1.0.0-SNAPSHOT" -composeSnapshot = "7395546" +compose = "1.0.0-beta08" +composeSnapshot = "-" coroutines = "1.5.0" hilt = "2.36" kotlin = "1.5.10" @@ -26,16 +27,16 @@ kotlin-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines kotlin-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" } # AndroidX dependencies -androidx-activityKtx = "androidx.activity:activity-ktx:1.3.0-alpha08" -androidx-activity-compose = "androidx.activity:activity-compose:1.3.0-alpha08" +androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx_activity" } +androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx_activity" } androidx-annotation = "androidx.annotation:annotation:1.2.0" -androidx-autofill = "androidx.autofill:autofill:1.2.0-alpha01" -androidx-appcompat = "androidx.appcompat:appcompat:1.3.0" +androidx-autofill = "androidx.autofill:autofill:1.2.0-alpha02" +androidx-appcompat = "androidx.appcompat:appcompat:1.4.0-alpha02" androidx-biometricKtx = "androidx.biometric:biometric-ktx:1.2.0-alpha03" androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.0-beta02" -androidx-coreKtx = "androidx.core:core-ktx:1.6.0-beta01" +androidx-core-ktx = "androidx.core:core-ktx:1.6.0-beta02" androidx-documentfile = "androidx.documentfile:documentfile:1.0.1" -androidx-fragmentKtx = "androidx.fragment:fragment-ktx:1.4.0-alpha01" +androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.4.0-alpha02" androidx-hilt-compose = "androidx.hilt:hilt-navigation-compose:1.0.0-alpha02" androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common-java8", version.ref="lifecycle" } androidx-lifecycle-livedataKtx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref="lifecycle" } @@ -43,7 +44,7 @@ androidx-lifecycle-viewmodelKtx = { module = "androidx.lifecycle:lifecycle-viewm androidx-lifecycle-viewmodel-compose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha05" androidx-material = "com.google.android.material:material:1.4.0-beta01" androidx-preference = "androidx.preference:preference:1.1.1" -androidx-recyclerview = "androidx.recyclerview:recyclerview:1.2.0" +androidx-recyclerview = "androidx.recyclerview:recyclerview:1.2.1" androidx-recyclerviewSelection = "androidx.recyclerview:recyclerview-selection:1.2.0-alpha01" androidx-security = "androidx.security:security-crypto:1.1.0-alpha03" androidx-swiperefreshlayout = "androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01" @@ -94,7 +95,7 @@ thirdparty-nonfree-googlePlayAuthApiPhone = "com.google.android.gms:play-service # Testing dependencies testing-junit = "junit:junit:4.13.2" testing-kotlintest-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" } -testing-robolectric = "org.robolectric:robolectric:4.6-alpha-1" +testing-robolectric = "org.robolectric:robolectric:4.6-alpha-2" testing-sharedPrefsMock = "com.github.IvanShafran:shared-preferences-mock:1.0" androidx-testing-rules = { module = "androidx.test:rules", version.ref="androidx_test" } androidx-testing-runner = { module = "androidx.test:runner", version.ref="androidx_test" } |