From 0fe01f16508dd3e722f233eb95f91acc4884f3bc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 6 Apr 2024 10:00:30 +0000
Subject: [PATCH] fix(deps): update dependency org.bouncycastle:bcprov-jdk18on
 to v1.78 (#2986)

* fix(deps): update dependency org.bouncycastle:bcprov-jdk18on to v1.78

* fix(deps): add missing bcutil dependency

* fix(build): drop multi-release JAR artifacts from APK

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Harsh Shandilya <me@msfjarvis.dev>
---
 app/build.gradle.kts      | 3 +++
 gradle/libs.versions.toml | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e56c5385..872c1eae 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -34,6 +34,8 @@ android {
     useLiveLiterals = false
     kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
   }
+
+  packaging { resources.excludes.add("META-INF/versions/**") }
 }
 
 dependencies {
@@ -87,6 +89,7 @@ dependencies {
   implementation(libs.thirdparty.leakcanary.plumber)
   implementation(libs.thirdparty.sshj)
   implementation(libs.thirdparty.bouncycastle.bcprov)
+  implementation(libs.thirdparty.bouncycastle.bcutil)
 
   implementation(libs.thirdparty.slf4j.api) {
     because("SSHJ now uses SLF4J 2.0 which we don't want")
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 79f0efd6..c4c1b98c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 agp = "8.3.1"
 androidxActivity = "1.9.0-rc01"
-bouncycastle = "1.77"
+bouncycastle = "1.78"
 # @keep used for kotlinCompilerExtensionVersion
 composeCompiler = "1.5.11-dev-k1.9.23-96ef9dc6af1"
 coroutines = "1.8.1-Beta"
@@ -72,6 +72,7 @@ testing-sharedPrefsMock = "com.github.android-password-store:shared-preferences-
 testing-testparameterinjector = "com.google.testparameterinjector:test-parameter-injector:1.15"
 testing-turbine = "app.cash.turbine:turbine:1.1.0"
 thirdparty-bouncycastle-bcprov = { module = "org.bouncycastle:bcprov-jdk18on", version.ref = "bouncycastle" }
+thirdparty-bouncycastle-bcutil = { module = "org.bouncycastle:bcutil-jdk18on", version.ref = "bouncycastle" }
 # We're fine with the current version.
 # noinspection GradleDependency
 thirdparty-commons_codec = "commons-codec:commons-codec:1.14"