From ccb8ac03f8436d9d5ac7a483474393342653fb9f Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Mon, 17 Aug 2026 13:20:35 +0200 Subject: [PATCH] bump conscrypt to 2.6.2 to remove "Your app could crash on 16 KB devices" warning on gplay. https://github.com/google/conscrypt/releases -> 2.6.0 -> "conscrypt-android is 16 KB-aligned." manual "backport" of https://github.com/nextcloud/talk-android/pull/6487 Signed-off-by: Marcel Hibbe --- app/build.gradle.kts | 6 +++--- gradle/verification-keyring.keys | 16 ++++++++++++++++ gradle/verification-metadata.xml | 2 ++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 00d59f224f4..c98156f9dc0 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -213,7 +213,7 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.11.0") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-rx2:$coroutinesVersion") - implementation("androidx.appcompat:appcompat:1.7.1") + implementation("androidx.appcompat:appcompat:1.8.0") implementation("com.google.android.material:material:1.13.0") implementation("androidx.constraintlayout:constraintlayout:2.2.1") implementation("com.vanniktech:emoji-google:0.23.0") @@ -229,7 +229,7 @@ dependencies { implementation("com.github.bitfireAT:dav4jvm:2.1.3") { exclude(group = "org.ogce", module = "xpp3") // Android comes with its own XmlPullParser } - implementation("org.conscrypt:conscrypt-android:2.5.3") + implementation("org.conscrypt:conscrypt-android:2.6.2") implementation("com.github.nextcloud-deps:qrcodescanner:0.1.2.4") // "com.github.blikoon:QRCodeScanner:0.1.2" implementation("androidx.camera:camera-core:$androidxCameraVersion") @@ -386,7 +386,7 @@ dependencies { testImplementation("org.robolectric:robolectric:4.16.1") // conscrypt-android provides Android JNI libs only; the openjdk-uber variant bundles // JVM host natives so Robolectric can initialise the security provider without crashing. - testImplementation("org.conscrypt:conscrypt-openjdk-uber:2.5.2") + testImplementation("org.conscrypt:conscrypt-openjdk-uber:2.6.2") } tasks.register("installGitHooks") { diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys index c365128a861..2e03f976193 100644 --- a/gradle/verification-keyring.keys +++ b/gradle/verification-keyring.keys @@ -6789,6 +6789,22 @@ Tky9VthoZQdJTLH/QYXHZRI0HRXfo3AVtf8= =PL93 -----END PGP PUBLIC KEY BLOCK----- +pub 655CCC51B9BD2C38 +uid Juerg Wullschleger (Key for signing maven artifacts) + +sub 1D8420104D50DEB6 +-----BEGIN PGP PUBLIC KEY BLOCK----- + +xjMEaha/UBYJKwYBBAHaRw8BAQdAbsQnyQZeUSn3HeAYjG4LfUmBiGA8AbVgdh4o +r94PKTG0R0p1ZXJnIFd1bGxzY2hsZWdlciAoS2V5IGZvciBzaWduaW5nIG1hdmVu +IGFydGlmYWN0cykgPGp1ZXJnQGdvb2dsZS5jb20+zjgEaha/UBIKKwYBBAGXVQEF +AQEHQBZaO7bwfVR88kyicIFPVrz3GhdM7MBYoQk54gSx2hw+AwEIB8J+BBgWCgAm +FiEESc9OOymWvmWKV905ZVzMUbm9LDgFAmoWv1ACGwwFCQHhM4AACgkQZVzMUbm9 +LDhPFQD/fJsIXrtRDbCR7PkozwpPY8z6dOGZ3qRTFxuyWjuWoycA/RMUHBSGOJeP ++QiG9g497f/rjbC8s02quHS1CHna0lIC +=Eb5c +-----END PGP PUBLIC KEY BLOCK----- + pub 6601E5C08DCCBB96 uid Popma Remko diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 72a3efb0dd5..7d016c2f3cf 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -37,6 +37,7 @@ + @@ -202,6 +203,7 @@ +