diff options
| -rw-r--r-- | AGENTS.md | 3 | ||||
| -rw-r--r-- | build.gradle.kts | 9 |
2 files changed, 8 insertions, 4 deletions
@@ -38,7 +38,8 @@ Needs JDK 17 and the Android SDK. `local.properties` (gitignored) holds `sdk.dir Prefix with `CI=1` to match CI: it turns Kotlin warnings into errors, so a deprecation warning that passes locally fails CI. Before committing, run: - CI=1 ./gradlew spotlessCheck test -PslimTests assembleFreeDebug assembleFreeRelease lintFreeRelease + CI=1 ./gradlew spotlessCheck test -PslimTests assembleFreeDebug assembleFreeRelease \ + lintFreeRelease metalavaCheckCompatibilityRelease Flavors: `free` (no proprietary dependencies, Sentry replaced by `sentry-stub`) and `nonFree` (adds Sentry and Play Services SMS OTP). 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()) + } } } } |