Skip to content

Commit d77bdab

Browse files
Merge pull request #17115 from nextcloud/backport/17113/stable-33.1.x
[stable-33.1.x] chore(openssl): use android-openssl
2 parents 14cb851 + 218b77d commit d77bdab

5 files changed

Lines changed: 27 additions & 11 deletions

File tree

app/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ dependencies {
455455

456456
// region Crypto
457457
implementation(libs.conscrypt.android)
458-
implementation(libs.openssl)
458+
implementation(libs.android.openssl)
459459
// endregion
460460

461461
// region Library
-10.3 MB
Binary file not shown.

app/libs/local-maven/com/nextcloud/openssl/3.5.6/openssl-3.5.6.pom

Lines changed: 0 additions & 8 deletions
This file was deleted.

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# SPDX-License-Identifier: AGPL-3.0-or-later
33

44
[versions]
5+
androidOpensslVersion = "3.5.6"
56
androidCommonLibraryVersion = "0.33.2"
67
androidGifDrawableVersion = "1.2.31"
78
androidImageCropperVersion = "4.7.0"
@@ -65,7 +66,6 @@ mockitoVersion = "5.22.0"
6566
mockkVersion = "1.14.9"
6667
nnioVersion = "0.3.1"
6768
objenesis = "3.5"
68-
opensslVersion = "3.5.6"
6969
orchestratorVersion = "1.6.1"
7070
orgJbundleUtilOsgiWrappedOrgApacheHttpClientVersion = "4.1.2"
7171
osmdroidAndroidVersion = "6.1.20"
@@ -90,6 +90,7 @@ foundationVersion = "1.10.6"
9090
[libraries]
9191
# Crypto
9292
android-library = { module = "com.github.nextcloud:android-library", version.ref = "androidLibraryVersion" }
93+
android-openssl = { module = "com.github.nextcloud-releases:android-openssl", version.ref = "androidOpensslVersion" }
9394
conscrypt-android = { module = "org.conscrypt:conscrypt-android", version.ref = "conscryptAndroidVersion" }
9495
bcpkix-jdk18on = { module = "org.bouncycastle:bcpkix-jdk18on", version.ref = "bcpkixJdk18onVersion" }
9596

@@ -101,7 +102,6 @@ document-scanning-android-sdk = { module = "com.github.Hazzatur:Document-Scannin
101102
fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "fragmentKtxVersion" }
102103
exifinterface = { module = "androidx.exifinterface:exifinterface", version.ref = "exifinterfaceVersion" }
103104
material-icons-core = { module = "androidx.compose.material:material-icons-core", version.ref = "materialIconsCoreVersion" }
104-
openssl = { module = "com.nextcloud:openssl", version.ref = "opensslVersion" }
105105
webkit = { module = "androidx.webkit:webkit", version.ref = "webkitVersion" }
106106
splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "splash-screen" }
107107
sectioned-recyclerview = { module = "com.github.nextcloud-deps:sectioned-recyclerview", version.ref = "sectionedRecyclerviewVersion" }

gradle/verification-metadata.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22051,6 +22051,30 @@
2205122051
<sha256 value="8567749803d3d0a5c63fc5186992017f2dd3dff66ffd4140bd2b58ce0a176ef0" origin="Generated by Gradle" reason="Artifact is not signed"/>
2205222052
</artifact>
2205322053
</component>
22054+
<component group="com.github.nextcloud-releases" name="android-openssl" version="3.5.6">
22055+
<artifact name="android-openssl-3.5.6.aar">
22056+
<sha256 value="d40cc1f71bd611d781feba6d81bb6e31cde953578afa64ac5d52ffa69218d284" origin="Generated by Gradle" reason="Artifact is not signed"/>
22057+
</artifact>
22058+
<artifact name="android-openssl-3.5.6.pom">
22059+
<sha256 value="b7d7ea3dcc550b869ac7f895e16c9120f5ed14f3295c73f8c94a887b4a8337a3" origin="Generated by Gradle" reason="Artifact is not signed"/>
22060+
</artifact>
22061+
</component>
22062+
<component group="com.github.nextcloud-releases" name="android-openssl" version="946ebdad00">
22063+
<artifact name="android-openssl-946ebdad00.aar">
22064+
<sha256 value="20bd642a65013c6a3e5a4029732c95e1f7a03744b820b76870ab1948eff72541" origin="Generated by Gradle" reason="Artifact is not signed"/>
22065+
</artifact>
22066+
<artifact name="android-openssl-946ebdad00.pom">
22067+
<sha256 value="7adfa72b7e3f4ff5fbd55a27feeb57b0e64b2e648ecb4d517e26352ed3f6eb4d" origin="Generated by Gradle" reason="Artifact is not signed"/>
22068+
</artifact>
22069+
</component>
22070+
<component group="com.github.nextcloud-releases" name="android-openssl" version="bfa7229f60">
22071+
<artifact name="android-openssl-bfa7229f60.aar">
22072+
<sha256 value="1433ff8b12d9977246996ac126c0a2db344083b0ea224dfd5674ed9b9572e8bf" origin="Generated by Gradle" reason="Artifact is not signed"/>
22073+
</artifact>
22074+
<artifact name="android-openssl-bfa7229f60.pom">
22075+
<sha256 value="af2bcd5c144a7f3354d2b1b8381c850bac1d6c6c8bb238e462f0b3b1a5a517a5" origin="Generated by Gradle" reason="Artifact is not signed"/>
22076+
</artifact>
22077+
</component>
2205422078
<component group="com.github.nextcloud.android-common" name="core" version="0.13.0">
2205522079
<artifact name="core-0.13.0.aar">
2205622080
<sha256 value="df4ea8a3e1bbe22fbe9abb84cbb6a21073bdbe776598c4442c0a3cbe60ef24cb" origin="Generated by Gradle" reason="Artifact is not signed"/>

0 commit comments

Comments
 (0)