From d4d155d98418bfc6780fc03f8dddabf363144a8f Mon Sep 17 00:00:00 2001 From: "Danilo M." Date: Mon, 2 Nov 2026 10:24:23 +0100 Subject: build: limit Bouncy Castle alignment to -jdk18on modules The resolution rule also rewrote the legacy -jdk15on artifacts that metalava's tooling depends on to 1.86, a version that line never had (it ended at 1.70), so metalavaCheckCompatibilityRelease failed to resolve in CI. Only align the -jdk18on modules the app ships. Add the metalava check to the pre-commit command in AGENTS.md so local runs cover the same tasks as CI. Co-Authored-By: Claude Opus 5.5 --- build.gradle.kts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'build.gradle.kts') diff --git a/build.gradle.kts b/build.gradle.kts index 150e3566..8820dcab 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,12 +9,15 @@ plugins { id("com.github.android-password-store.versions") } -// Keep every Bouncy Castle module (bcprov, bcpg, bcpkix, bcutil) on one version. They are -// pulled in by PGPainless and sshj at different versions, and mixing them is unsupported. +// Keep every Bouncy Castle -jdk18on module (bcprov, bcpg, bcpkix, bcutil) on one version. They +// are pulled in by PGPainless and sshj at different versions, and mixing them is unsupported. +// The legacy -jdk15on artifacts (build tooling only) stopped at 1.70 and must be left alone. subprojects { configurations.configureEach { resolutionStrategy.eachDependency { - if (requested.group == "org.bouncycastle") useVersion(libs.versions.bouncycastle.get()) + if (requested.group == "org.bouncycastle" && requested.name.endsWith("-jdk18on")) { + useVersion(libs.versions.bouncycastle.get()) + } } } } -- cgit v1.2.3