From ae8d1d1429fb24f327434a05f4d6162794c07b95 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 7 Jan 2022 19:56:55 +0100
Subject: [PATCH] Olm lib is now hosted in MavenCentral. Upgrade to 3.2.10

---
 build.gradle                    | 8 --------
 changelog.d/4882.misc           | 1 +
 dependencies_groups.gradle      | 8 +-------
 matrix-sdk-android/build.gradle | 4 ++--
 4 files changed, 4 insertions(+), 17 deletions(-)
 create mode 100644 changelog.d/4882.misc

diff --git a/build.gradle b/build.gradle
index 255d9da849..b7299b01f7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,14 +36,6 @@ allprojects {
     apply plugin: "org.jlleitschuh.gradle.ktlint"
 
     repositories {
-        // For olm library.
-        maven {
-            url 'https://gitlab.matrix.org/api/v4/projects/27/packages/maven'
-            content {
-                groups.olm.regex.each { includeGroupByRegex it }
-                groups.olm.group.each { includeGroup it }
-            }
-        }
         maven {
             url 'https://jitpack.io'
             content {
diff --git a/changelog.d/4882.misc b/changelog.d/4882.misc
new file mode 100644
index 0000000000..46c5ec0bb7
--- /dev/null
+++ b/changelog.d/4882.misc
@@ -0,0 +1 @@
+ Olm lib is now hosted in MavenCentral - upgrade to 3.2.10
\ No newline at end of file
diff --git a/dependencies_groups.gradle b/dependencies_groups.gradle
index 7edf54fb50..3853919bcb 100644
--- a/dependencies_groups.gradle
+++ b/dependencies_groups.gradle
@@ -14,13 +14,6 @@ ext.groups = [
                         'com.github.Zhuinden',
                 ]
         ],
-        olm         : [
-                regex: [
-                ],
-                group: [
-                        'org.matrix.android',
-                ]
-        ],
         jitsi       : [
                 regex: [
                 ],
@@ -166,6 +159,7 @@ ext.groups = [
                         'org.junit.jupiter',
                         'org.junit.platform',
                         'org.jvnet.staxex',
+                        'org.matrix.android',
                         'org.mockito',
                         'org.mongodb',
                         'org.objenesis',
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 44b002697d..936609c1d7 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 maven at https://gitlab.matrix.org/api/v4/projects/27/packages/maven
-    implementation 'org.matrix.android:olm:3.2.7'
+    // olm lib is now hosted in MavenCentral
+    implementation 'org.matrix.android:olm-sdk:3.2.10'
 
     // DI
     implementation libs.dagger.dagger