diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 17741a007775..319f94cc43ff 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -447,7 +447,7 @@ dependencies { // region Crypto implementation(libs.conscrypt.android) - implementation(libs.openssl) + implementation(libs.android.openssl) // endregion // region Library diff --git a/app/libs/local-maven/com/nextcloud/openssl/3.5.6/openssl-3.5.6.aar b/app/libs/local-maven/com/nextcloud/openssl/3.5.6/openssl-3.5.6.aar deleted file mode 100644 index 4ad6d0743358..000000000000 Binary files a/app/libs/local-maven/com/nextcloud/openssl/3.5.6/openssl-3.5.6.aar and /dev/null differ diff --git a/app/libs/local-maven/com/nextcloud/openssl/3.5.6/openssl-3.5.6.pom b/app/libs/local-maven/com/nextcloud/openssl/3.5.6/openssl-3.5.6.pom deleted file mode 100644 index cd21b9cd1056..000000000000 --- a/app/libs/local-maven/com/nextcloud/openssl/3.5.6/openssl-3.5.6.pom +++ /dev/null @@ -1,8 +0,0 @@ - - - 4.0.0 - com.nextcloud - openssl - 3.5.6 - aar - diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 21cc251dfeda..8eaf64ee2c9f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,6 +6,7 @@ androidCommonLibraryVersion = "0.33.2" androidGifDrawableVersion = "1.2.31" androidImageCropperVersion = "4.7.0" androidLibraryVersion ="1c847678482c739d0b92e27a445d2f5f168f7d33" +androidOpensslVersion = "3.5.6" androidPluginVersion = "9.2.1" androidsvgVersion = "1.4" androidxMediaVersion = "1.5.1" @@ -65,7 +66,6 @@ mockitoVersion = "5.22.0" mockkVersion = "1.14.9" nnioVersion = "0.3.1" objenesis = "3.5" -opensslVersion = "3.5.6" orchestratorVersion = "1.6.1" orgJbundleUtilOsgiWrappedOrgApacheHttpClientVersion = "4.1.2" osmdroidAndroidVersion = "6.1.20" @@ -90,6 +90,7 @@ foundationVersion = "1.11.2" [libraries] # Crypto android-library = { module = "com.github.nextcloud:android-library", version.ref = "androidLibraryVersion" } +android-openssl = { module = "com.github.nextcloud-releases:android-openssl", version.ref = "androidOpensslVersion" } conscrypt-android = { module = "org.conscrypt:conscrypt-android", version.ref = "conscryptAndroidVersion" } bcpkix-jdk18on = { module = "org.bouncycastle:bcpkix-jdk18on", version.ref = "bcpkixJdk18onVersion" } @@ -101,7 +102,6 @@ document-scanning-android-sdk = { module = "com.github.Hazzatur:Document-Scannin fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "fragmentKtxVersion" } exifinterface = { module = "androidx.exifinterface:exifinterface", version.ref = "exifinterfaceVersion" } material-icons-core = { module = "androidx.compose.material:material-icons-core", version.ref = "materialIconsCoreVersion" } -openssl = { module = "com.nextcloud:openssl", version.ref = "opensslVersion" } webkit = { module = "androidx.webkit:webkit", version.ref = "webkitVersion" } splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "splash-screen" } sectioned-recyclerview = { module = "com.github.nextcloud-deps:sectioned-recyclerview", version.ref = "sectionedRecyclerviewVersion" } diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 4ec7b49b5934..eca475f05b55 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -22117,6 +22117,30 @@ + + + + + + + + + + + + + + + + + + + + + + + +