Merge pull request #4097 from nextcloud/renovate/org.conscrypt-conscrypt-android-2.x

fix(deps): update dependency org.conscrypt:conscrypt-android to v2.5.3
This commit is contained in:
github-actions[bot] 2024-08-20 17:25:21 +02:00 committed by GitHub
commit 1e9b52ca39
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions

View file

@ -207,7 +207,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.2'
implementation 'org.conscrypt:conscrypt-android:2.5.3'
implementation "androidx.camera:camera-core:${androidxCameraVersion}"
implementation "androidx.camera:camera-camera2:${androidxCameraVersion}"

View file

@ -44,7 +44,10 @@
<trusting group="org.mockito.kotlin" name="mockito-kotlin" version="4.1.0"/>
<trusting group="org.mockito.kotlin" name="mockito-kotlin" version="5.4.0"/>
</trusted-key>
<trusted-key id="1597AB231B7ADD7E14B1D9C43F00DB67AE236E2E" group="org.conscrypt" name="conscrypt-android" version="2.5.2"/>
<trusted-key id="1597AB231B7ADD7E14B1D9C43F00DB67AE236E2E">
<trusting group="org.conscrypt" name="conscrypt-android" version="2.5.2"/>
<trusting group="org.conscrypt" name="conscrypt-android" version="2.5.3"/>
</trusted-key>
<trusted-key id="190D5A957FF22273E601F7A7C92C5FEC70161C62" group="org.apache" name="apache" version="18"/>
<trusted-key id="19BEAB2D799C020F17C69126B16698A4ADF4D638" group="org.checkerframework"/>
<trusted-key id="1D0A8B5E77C678A7C724445ABF984B4145EA13F7" group="com.squareup" name="javapoet" version="1.13.0"/>