aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTad Fisher <tadfisher@gmail.com>2022-10-08 17:17:55 -0700
committerTad Fisher <tadfisher@gmail.com>2022-10-09 16:13:32 -0700
commit98b7197aa55e14eaf48c862d990d1d7c020501dc (patch)
tree3c202bac4a24bb76009b7e2e6fe64a00c7ebb51b
parenteb5e9bdffa5db7e74beab5b8148ea97a6d2dbf30 (diff)
Add hwsecurity dependency
-rw-r--r--gradle/libs.versions.toml3
-rw-r--r--settings.gradle.kts37
2 files changed, 39 insertions, 1 deletions
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 563e8ebc..e28206eb 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -7,6 +7,7 @@ composeUi = "1.3.0-rc01"
coroutines = "1.6.4"
flowbinding = "1.2.0"
hilt = "2.44"
+hwsecurity = "4.4.0"
kotlin = "1.7.20"
leakcanary = "2.9.1"
lifecycle = "2.6.0-alpha02"
@@ -34,6 +35,8 @@ androidx-recyclerview = "androidx.recyclerview:recyclerview:1.3.0-rc01"
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"
+aps-hwsecurity-openpgp = { module = "com.github.android-password-store.hwsecurity:hwsecurity-openpgp", version.ref = "hwsecurity" }
+aps-hwsecurity-ui = { module = "com.github.android-password-store.hwsecurity:hwsecurity-ui", version.ref = "hwsecurity" }
aps-sublimeFuzzy = "com.github.android-password-store:sublime-fuzzy:2.2.1"
aps-zxingAndroidEmbedded = "com.github.android-password-store:zxing-android-embedded:4.2.1"
build-agp = { module = "com.android.tools.build:gradle", version.ref = "agp" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index cadfe9d5..ddbbd976 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -4,6 +4,8 @@
*/
@file:Suppress("UnstableApiUsage")
+import me.champeau.gradle.igp.gitRepositories
+
rootProject.name = "APS"
// Plugin repositories
@@ -41,6 +43,8 @@ pluginManagement {
includeModule("com.github.ben-manes", "gradle-versions-plugin")
includeModule("com.gradle", "gradle-enterprise-gradle-plugin")
includeModule("com.gradle.enterprise", "com.gradle.enterprise.gradle.plugin")
+ includeModule("me.champeau.includegit", "me.champeau.includegit.gradle.plugin")
+ includeModule("me.champeau.gradle.includegit", "plugin")
}
}
exclusiveContent {
@@ -51,7 +55,10 @@ pluginManagement {
}
}
-plugins { id("com.gradle.enterprise") version "3.11.1" }
+plugins {
+ id("com.gradle.enterprise") version "3.11.1"
+ id("me.champeau.includegit") version "0.1.5"
+}
gradleEnterprise {
buildScan {
@@ -156,6 +163,34 @@ dependencyResolutionManagement {
}
}
+gitRepositories {
+ checkoutsDirectory.set(rootProject.projectDir.resolve("build/checkouts"))
+ include("hwsecurity") {
+ uri.set("https://github.com/tadfisher/hwsecurity.git")
+ branch.set("pendingintent-mutability")
+ includeBuild {
+ dependencySubstitution {
+ for (module in listOf(
+ "core",
+ "intent-usb",
+ "intent-nfc",
+ "provider",
+ "fido",
+ "fido2",
+ "openpgp",
+ "piv",
+ "sshj",
+ "ssh",
+ "ui",
+ )) {
+ substitute(module("com.github.android-password-store.hwsecurity:hwsecurity-$module"))
+ .using(project(":hwsecurity:$module"))
+ }
+ }
+ }
+ }
+}
+
// Experimental features
enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")