From 892d70812f0d6adc9e9495e0c5e79eec6443f5a9 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 7 Dec 2021 14:45:48 +0100 Subject: [PATCH] Upgrade OLM to v3.2.7 and get it from our maven repository. --- build.gradle | 6 +++--- changelog.d/4647.misc | 1 + matrix-sdk-android/build.gradle | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 changelog.d/4647.misc diff --git a/build.gradle b/build.gradle index 4c3734892d..89825428fb 100644 --- a/build.gradle +++ b/build.gradle @@ -38,12 +38,12 @@ allprojects { repositories { // For olm library. This has to be declared first, to ensure that Olm library is not downloaded from another repo + maven { url 'https://gitlab.matrix.org/api/v4/projects/27/packages/maven' } + maven { url 'https://jitpack.io' content { - // Use this repo only for olm library - includeGroupByRegex "org\\.matrix\\.gitlab\\.matrix-org" - // And also for FilePicker + // Use this repo only for FilePicker includeGroupByRegex "com\\.github\\.jaiselrahman" // And monarchy includeGroupByRegex "com\\.github\\.Zhuinden" diff --git a/changelog.d/4647.misc b/changelog.d/4647.misc new file mode 100644 index 0000000000..a33afba138 --- /dev/null +++ b/changelog.d/4647.misc @@ -0,0 +1 @@ + Upgrade OLM to v3.2.7 and get it from our maven repository. \ No newline at end of file diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle index e37231097d..cec5982658 100644 --- a/matrix-sdk-android/build.gradle +++ b/matrix-sdk-android/build.gradle @@ -140,8 +140,8 @@ dependencies { implementation libs.arrow.core implementation libs.arrow.instances - // olm lib is now hosted by jitpack: https://jitpack.io/#org.matrix.gitlab.matrix-org/olm - implementation 'org.matrix.gitlab.matrix-org:olm:3.2.4' + // olm lib is now hosted by maven at https://gitlab.matrix.org/api/v4/projects/27/packages/maven + implementation 'org.matrix.android:olm:3.2.7' // DI implementation libs.dagger.dagger