Skip to content

fix(deps): update dependency org.conscrypt:conscrypt-android to v2.6.2 #6487

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 13, 2026
Merged

fix(deps): update dependency org.conscrypt:conscrypt-android to v2.6.2 #6487

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
bd434a2
Update dependency org.conscrypt:conscrypt-android to v2.6.2
renovate[bot] Aug 12, 2026
1b260fe
Update dependency org.conscrypt:conscrypt-openjdk-uber to v2.6.2
renovate[bot] Aug 12, 2026
7387d40
fix(deps): update dependency androidx.appcompat:appcompat to v1.8.0
renovate[bot] Aug 13, 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
6 changes: 3 additions & 3 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,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.14.0")
implementation("androidx.constraintlayout:constraintlayout:2.2.2")
implementation("androidx.emoji2:emoji2:$emojiVersion")
Expand All @@ -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.6.1")
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.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.6.1")
testImplementation("org.conscrypt:conscrypt-openjdk-uber:2.6.2")
}

tasks.register<Copy>("installGitHooks") {
Expand Down
3 changes: 3 additions & 0 deletions gradle/verification-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
<trusted-key id="0D5D634755737A19ABBE2930D4DA5EAB3CD7E958" group="com.google.devtools.ksp" name="symbol-processing-api" version="1.7.0-1.0.6"/>
<trusted-key id="0E225917414670F4442C250DFD533C07C264648F">
<trusting group="androidx.activity"/>
<trusting group="androidx.appcompat"/>
<trusting group="androidx.constraintlayout"/>
<trusting group="androidx.core"/>
<trusting group="androidx.databinding"/>
Expand Down Expand Up @@ -212,7 +213,9 @@
</trusted-key>
<trusted-key id="49CF4E3B2996BE658A57DD39655CCC51B9BD2C38">
<trusting group="org.conscrypt" name="conscrypt-android" version="2.6.1"/>
<trusting group="org.conscrypt" name="conscrypt-android" version="2.6.2"/>
<trusting group="org.conscrypt" name="conscrypt-openjdk-uber" version="2.6.1"/>
<trusting group="org.conscrypt" name="conscrypt-openjdk-uber" version="2.6.2"/>
</trusted-key>
<trusted-key id="4A2E4BE286EDAE3ADB3A3C26C21CE653B639E41A" group="com.bluelinelabs"/>
<trusted-key id="4BF79B8259007B566D2FCE82296CD27F60EED12C" group="com.google.crypto.tink" name="tink" version="1.7.0"/>
Expand Down
Loading