Merge pull request #4882 from vector-im/feature/bma/olm_3.2.9

Olm lib is now hosted in MavenCentral
This commit is contained in:
Benoit Marty 2022-01-10 17:39:08 +01:00 committed by GitHub
commit 56ff5f795a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 17 deletions

View file

@ -36,14 +36,6 @@ allprojects {
apply plugin: "org.jlleitschuh.gradle.ktlint" apply plugin: "org.jlleitschuh.gradle.ktlint"
repositories { 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 { maven {
url 'https://jitpack.io' url 'https://jitpack.io'
content { content {

1
changelog.d/4882.misc Normal file
View file

@ -0,0 +1 @@
Olm lib is now hosted in MavenCentral - upgrade to 3.2.10

View file

@ -14,13 +14,6 @@ ext.groups = [
'com.github.Zhuinden', 'com.github.Zhuinden',
] ]
], ],
olm : [
regex: [
],
group: [
'org.matrix.android',
]
],
jitsi : [ jitsi : [
regex: [ regex: [
], ],
@ -166,6 +159,7 @@ ext.groups = [
'org.junit.jupiter', 'org.junit.jupiter',
'org.junit.platform', 'org.junit.platform',
'org.jvnet.staxex', 'org.jvnet.staxex',
'org.matrix.android',
'org.mockito', 'org.mockito',
'org.mongodb', 'org.mongodb',
'org.objenesis', 'org.objenesis',

View file

@ -140,8 +140,8 @@ dependencies {
implementation libs.arrow.core implementation libs.arrow.core
implementation libs.arrow.instances implementation libs.arrow.instances
// olm lib is now hosted by maven at https://gitlab.matrix.org/api/v4/projects/27/packages/maven // olm lib is now hosted in MavenCentral
implementation 'org.matrix.android:olm:3.2.7' implementation 'org.matrix.android:olm-sdk:3.2.10'
// DI // DI
implementation libs.dagger.dagger implementation libs.dagger.dagger