aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--autofill-parser/src/main/java/com/github/androidpasswordstore/autofillparser/FormField.kt2
-rw-r--r--build.gradle.kts11
-rw-r--r--buildSrc/src/main/java/Dependencies.kt32
3 files changed, 29 insertions, 16 deletions
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 d3ce8408..562e5d86 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
@@ -49,11 +49,13 @@ internal class FormField(
HINTS_NEW_PASSWORD +
listOf(
HintConstants.AUTOFILL_HINT_PASSWORD,
+ HintConstants.AUTOFILL_HINT_WIFI_PASSWORD,
)
private val HINTS_OTP =
listOf(
HintConstants.AUTOFILL_HINT_SMS_OTP,
+ HintConstants.AUTOFILL_HINT_TFA_APP_OTP,
)
@Suppress("DEPRECATION")
diff --git a/build.gradle.kts b/build.gradle.kts
index 1ab2b205..300a1256 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -12,10 +12,21 @@ buildscript { dependencies { classpath(Plugins.ktfmtGradlePlugin) } }
allprojects { apply(plugin = "com.ncorti.ktfmt.gradle") }
subprojects {
+ // Gradle's automatic resolution fails to handle AndroidX annotation for
+ // some reason so here we simply hack it up to use the correct version manually.
+ val annotationParts = Dependencies.AndroidX.annotation.split(":")
+ val annotationGroup = annotationParts[0]
+ val annotationModule = annotationParts[1]
+ val annotationVersion = annotationParts[2]
configurations.all {
resolutionStrategy.dependencySubstitution {
substitute(module("org.jetbrains.trove4j:trove4j:20160824"))
.using(module("org.jetbrains.intellij.deps:trove4j:1.0.20200330"))
}
+ resolutionStrategy.eachDependency {
+ if (requested.group == annotationGroup && requested.name == annotationModule) {
+ useVersion(annotationVersion)
+ }
+ }
}
}
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index c3ebecf5..73d34126 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -11,7 +11,7 @@ object Plugins {
const val dokkaPlugin = "org.jetbrains.dokka:dokka-gradle-plugin:1.4.20"
const val downloadTaskPlugin = "de.undercouch:gradle-download-task:4.1.1"
const val kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
- const val ktfmtGradlePlugin = "com.ncorti.ktfmt.gradle:plugin:0.4.0"
+ const val ktfmtGradlePlugin = "com.ncorti.ktfmt.gradle:plugin:0.5.0"
const val mavenPublishPlugin = "com.vanniktech:gradle-maven-publish-plugin:0.13.0"
const val semver4j = "com.vdurmont:semver4j:3.1.0"
}
@@ -20,7 +20,7 @@ object Dependencies {
object Kotlin {
object Coroutines {
- private const val version = "1.4.2"
+ private const val version = "1.4.3"
const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"
const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version"
}
@@ -28,23 +28,23 @@ object Dependencies {
object AndroidX {
- private const val lifecycleVersion = "2.3.0-rc01"
+ private const val lifecycleVersion = "2.4.0-alpha01"
- const val activity_ktx = "androidx.activity:activity-ktx:1.3.0-alpha03"
- const val annotation = "androidx.annotation:annotation:1.1.0"
- const val autofill = "androidx.autofill:autofill:1.1.0"
- const val appcompat = "androidx.appcompat:appcompat:1.3.0-beta01"
+ const val activity_ktx = "androidx.activity:activity-ktx:1.3.0-alpha05"
+ const val annotation = "androidx.annotation:annotation:1.2.0"
+ const val autofill = "androidx.autofill:autofill:1.2.0-alpha01"
+ const val appcompat = "androidx.appcompat:appcompat:1.3.0-rc01"
const val biometric_ktx = "androidx.biometric:biometric-ktx:1.2.0-alpha03"
- const val constraint_layout = "androidx.constraintlayout:constraintlayout:2.1.0-alpha2"
- const val core_ktx = "androidx.core:core-ktx:1.5.0-beta02"
+ const val constraint_layout = "androidx.constraintlayout:constraintlayout:2.1.0-beta01"
+ const val core_ktx = "androidx.core:core-ktx:1.6.0-alpha01"
const val documentfile = "androidx.documentfile:documentfile:1.0.1"
- const val fragment_ktx = "androidx.fragment:fragment-ktx:1.3.0"
+ const val fragment_ktx = "androidx.fragment:fragment-ktx:1.3.2"
const val lifecycle_common = "androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion"
const val lifecycle_livedata_ktx = "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion"
const val lifecycle_viewmodel_ktx = "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion"
- const val material = "com.google.android.material:material:1.3.0"
+ const val material = "com.google.android.material:material:1.4.0-alpha01"
const val preference = "androidx.preference:preference:1.1.1"
- const val recycler_view = "androidx.recyclerview:recyclerview:1.2.0-beta02"
+ const val recycler_view = "androidx.recyclerview:recyclerview:1.2.0-rc01"
const val recycler_view_selection = "androidx.recyclerview:recyclerview-selection:1.1.0"
const val security = "androidx.security:security-crypto:1.1.0-alpha03"
const val swiperefreshlayout = "androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01"
@@ -57,12 +57,12 @@ object Dependencies {
object ThirdParty {
- const val bouncycastle = "org.bouncycastle:bcprov-jdk15on:1.67"
+ const val bouncycastle = "org.bouncycastle:bcprov-jdk15on:1.68"
const val commons_codec = "commons-codec:commons-codec:1.14"
const val eddsa = "net.i2p.crypto:eddsa:0.3.0"
const val fastscroll = "me.zhanghai.android.fastscroll:library:1.1.5"
const val jgit = "org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r"
- const val kotlin_result = "com.michael-bull.kotlin-result:kotlin-result:1.1.10"
+ const val kotlin_result = "com.michael-bull.kotlin-result:kotlin-result:1.1.11"
const val leakcanary = "com.squareup.leakcanary:leakcanary-android:2.6"
const val modern_android_prefs = "de.maxr1998:modernandroidpreferences:2.0"
const val plumber = "com.squareup.leakcanary:plumber-android:2.6"
@@ -80,12 +80,12 @@ object Dependencies {
object Testing {
- const val junit = "junit:junit:4.13.1"
+ const val junit = "junit:junit:4.13.2"
const val kotlin_test_junit = "org.jetbrains.kotlin:kotlin-test-junit:$KOTLIN_VERSION"
object AndroidX {
- private const val version = "1.3.1-alpha03"
+ private const val version = "1.4.0-alpha05"
const val runner = "androidx.test:runner:$version"
const val rules = "androidx.test:rules:$version"
}
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-22 21:25:09 +0000