From 88151f4bdd29a0d29b182b11b37e79bf347b6955 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Fri, 27 May 2022 13:00:10 +0530 Subject: Simplify BouncyCastle workaround and upgrade Fragment (#1926) * Simplify bouncycastle workaround * Upgrade fragment-ktx to 1.5.x --- gradle/libs.versions.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gradle/libs.versions.toml') 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" -- cgit v1.2.3