Skip to content

Update dependency org.conscrypt:conscrypt-android to v2.6.1 #6469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndyScherzinger merged 3 commits into from
Aug 9, 2026
Merged

Update dependency org.conscrypt:conscrypt-android to v2.6.1 #6469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc54025
Update dependency org.conscrypt:conscrypt-android to v2.6.1
renovate[bot] Aug 7, 2026
b4b0dd1
Update dependency org.conscrypt:conscrypt-openjdk-uber to v2.6.1
renovate[bot] Aug 7, 2026
59cbf70
chore: Add meta data
AndyScherzinger Aug 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,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.1")
implementation("com.github.nextcloud-deps:qrcodescanner:0.1.2.4") // "com.github.blikoon:QRCodeScanner:0.1.2"

implementation("androidx.exifinterface:exifinterface:1.4.2")
Expand Down Expand Up @@ -384,7 +384,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.1")
}

tasks.register<Copy>("installGitHooks") {
Expand Down
16 changes: 16 additions & 0 deletions gradle/verification-keyring.keys
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6876,6 +6876,22 @@ Tky9VthoZQdJTLH/QYXHZRI0HRXfo3AVtf8=
=PL93
-----END PGP PUBLIC KEY BLOCK-----

pub 655CCC51B9BD2C38
uid Juerg Wullschleger (Key for signing maven artifacts) <juerg@google.com>

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 <remkop@yahoo.com>

Expand Down
4 changes: 4 additions & 0 deletions gradle/verification-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,10 @@
<trusting group="org.springframework" name="spring-framework-bom" version="5.3.32"/>
<trusting group="org.springframework" name="spring-framework-bom" version="5.3.39"/>
</trusted-key>
<trusted-key id="49CF4E3B2996BE658A57DD39655CCC51B9BD2C38">
<trusting group="org.conscrypt" name="conscrypt-android" version="2.6.1"/>
<trusting group="org.conscrypt" name="conscrypt-openjdk-uber" version="2.6.1"/>
</trusted-key>
<trusted-key id="4A2E4BE286EDAE3ADB3A3C26C21CE653B639E41A" group="com.bluelinelabs"/>
<trusted-key id="4BF79B8259007B566D2FCE82296CD27F60EED12C" group="com.google.crypto.tink" name="tink" version="1.7.0"/>
<trusted-key id="4C5F68D09D42BA7FAC888DF9A929EA2321FDBF8F">
Expand Down
Loading