Simplify BouncyCastle workaround and upgrade Fragment (#1926)

* Simplify bouncycastle workaround

* Upgrade fragment-ktx to 1.5.x

3 files changed, 7 insertions, 20 deletions

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e5d0c5d2..efd8541a 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -11,7 +11,6 @@ plugins {
   id("com.github.android-password-store.versioning-plugin")
   id("com.github.android-password-store.sentry")
   id("com.github.android-password-store.rename-artifacts")
-  id("com.github.android-password-store.bouncycastle-dependency")
   id("dagger.hilt.android.plugin")
 }
 
@@ -74,7 +73,6 @@ dependencies {
   implementation(libs.aps.sublimeFuzzy)
   implementation(libs.aps.zxingAndroidEmbedded)
 
-  implementation(libs.thirdparty.bouncycastle)
   implementation(libs.thirdparty.eddsa)
   implementation(libs.thirdparty.fastscroll)
   implementation(libs.thirdparty.flowbinding.android)
@@ -86,7 +84,9 @@ dependencies {
   implementation(libs.thirdparty.modernAndroidPrefs)
   implementation(libs.thirdparty.plumber)
   implementation(libs.thirdparty.sshauth)
-  implementation(libs.thirdparty.sshj)
+  implementation(libs.thirdparty.sshj) { exclude(group = "org.bouncycastle") }
+  implementation(libs.thirdparty.bouncycastle.bcprov)
+  implementation(libs.thirdparty.bouncycastle.bcpkix)
 
   if (snapshot.snapshot) {
     implementation(libs.thirdparty.whatthestack)
diff --git a/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.bouncycastle-dependency.gradle.kts b/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.bouncycastle-dependency.gradle.kts
deleted file mode 100644
index d0f54e59..00000000
--- a/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.bouncycastle-dependency.gradle.kts
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * Bouncy Castle 1.71 changed their packaging to stop shipping jdk15on artifacts, and instead use
- * multi-release JARs with the jdk15to18 suffix. This plugin replaces older dependencies to use the
- * new version and artifact.
- */
-configurations.all {
-  resolutionStrategy.eachDependency {
-    if (requested.group == "org.bouncycastle" && requested.name.contains("jdk15on")) {
-      val replacement = "${requested.group}:${requested.name.replace("jdk15on", "jdk15to18")}:1.71"
-      useTarget(replacement)
-    }
-  }
-}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e1143fd1..464b3623 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -24,7 +24,7 @@ androidx-biometricKtx = "androidx.biometric:biometric-ktx:1.2.0-alpha04"
 androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.2.0-alpha01"
 androidx-core-ktx = "androidx.core:core-ktx:1.8.0-rc01"
 androidx-documentfile = "androidx.documentfile:documentfile:1.1.0-alpha01"
-androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.4.1"
+androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.5.0-rc01"
 androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "lifecycle" }
 androidx-lifecycle-livedataKtx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycle" }
 androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" }
@@ -71,8 +71,8 @@ kotlin-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines
 kotlin-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
 kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
 
-# Keep in sync with the bouncycastle-dependency plugin
-thirdparty-bouncycastle = "org.bouncycastle:bcprov-jdk15to18:1.71"
+thirdparty-bouncycastle-bcprov = "org.bouncycastle:bcprov-jdk15to18:1.71"
+thirdparty-bouncycastle-bcpkix = "org.bouncycastle:bcpkix-jdk15to18:1.71"
 thirdparty-commons_codec = "commons-codec:commons-codec:1.14"
 thirdparty-eddsa = "net.i2p.crypto:eddsa:0.3.0"
 thirdparty-fastscroll = "me.zhanghai.android.fastscroll:library:1.1.8"
@@ -87,7 +87,7 @@ thirdparty-nonfree-googlePlayAuthApiPhone = "com.google.android.gms:play-service
 thirdparty-nonfree-sentry = "io.sentry:sentry-android:6.0.0-beta.4"
 thirdparty-pgpainless = "org.pgpainless:pgpainless-core:1.2.2"
 thirdparty-sshauth = "com.github.open-keychain.open-keychain:sshauthentication-api:5.7.5"
-# TODO: Remove bouncycastle-dependency plugin when upgrading this to a BC 1.71 compatible version
+# TODO: Remove the explicit bcpkix dependency when upgrading this to a BC 1.71 compatible version
 thirdparty-sshj = "com.hierynomus:sshj:0.33.0"
 thirdparty-whatthestack = "com.github.haroldadmin:WhatTheStack:0.3.1"