From 87aac67b611f616aebfb722679b40e3f49576f01 Mon Sep 17 00:00:00 2001
From: conorsmith <conor.smith42@gmail.com>
Date: Sun, 3 Sep 2023 18:14:54 +0200
Subject: Add bouncycastle dependency to version catalog

---
 gradle/libs.versions.toml            |  6 ++++++
 tlsexternalcertprovider/build.gradle | 15 +++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 412276a0..e98a714f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -13,6 +13,7 @@ androidx-security-crypto = "1.1.0-alpha06"
 androidx-constraintlayout = "2.1.4"
 androidx-cardview = "1.0.0"
 androidx-recyclerview = "1.3.0"
+bouncycastle = "1.49"
 mpandroidchart = "v3.1.0"
 kotlin = "1.9.0"
 square-okhttp = "4.10.0"
@@ -38,6 +39,11 @@ androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecyc
 androidx-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "androidx-recyclerview" }
 androidx-security-crypto = { group = "androidx.security", name = "security-crypto", version.ref = "androidx-security-crypto" }
 mpandroidchart = { group = "com.github.PhilJay", name = "MPAndroidChart", version.ref = "mpandroidchart" }
+org-bouncycastle-bcprov-jdk15on = { group = "org.bouncycastle", name = "bcprov-jdk15on", version.ref = "bouncycastle" }
+org-bouncycastle-bcprov-ext-jdk15on = { group = "org.bouncycastle", name = "bcprov-ext-jdk15on", version.ref = "bouncycastle" }
+org-bouncycastle-bcpkix-jdk15on = { group = "org.bouncycastle", name = "bcpkix-jdk15on", version.ref = "bouncycastle" }
+org-bouncycastle-bcmail-jdk15on = { group = "org.bouncycastle", name = "bcmail-jdk15on", version.ref = "bouncycastle" }
+org-bouncycastle-bcpg-jdk15on = { group = "org.bouncycastle", name = "bcpg-jdk15on", version.ref = "bouncycastle" }
 kotlin = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }
 square-okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "square-okhttp" }
 
diff --git a/tlsexternalcertprovider/build.gradle b/tlsexternalcertprovider/build.gradle
index 608212f7..bb50eb03 100644
--- a/tlsexternalcertprovider/build.gradle
+++ b/tlsexternalcertprovider/build.gradle
@@ -7,14 +7,9 @@ plugins {
     alias libs.plugins.android.application
 }
 
-ext {
-    bouncycastleVersion = '1.49'
-}
-
 android {
     compileSdkVersion 34
 
-
     defaultConfig {
         applicationId "de.blinkt.externalcertprovider"
         minSdkVersion 21
@@ -51,11 +46,11 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation (
-    //'org.bouncycastle:bcprov-jdk15on:'  + bouncycastleVersion,
-    //'org.bouncycastle:bcprov-ext-jdk15on:' + bouncycastleVersion,
-    //'org.bouncycastle:bcpkix-jdk15on:' + bouncycastleVersion,
-    'org.bouncycastle:bcmail-jdk15on:' + bouncycastleVersion,
-    //'org.bouncycastle:bcpg-jdk15on:' + bouncycastleVersion
+//            libs.org.bouncycastle.bcprov.jdk15on,
+//            libs.org.bouncycastle.bcprov.ext.jdk15on,
+//            libs.org.bouncycastle.bcpkix.jdk15on,
+            libs.org.bouncycastle.bcmail.jdk15on,
+//            libs.org.bouncycastle.bcpg.jdk15on,
     )
 
     testImplementation(libs.junit)
-- 
cgit v1.2.3