Skip to content

Commit

Permalink
Merge pull request #4647 from vector-im/feature/bma/olm_on_maven
Browse files Browse the repository at this point in the history
Upgrade OLM to v3.2.7 and get it from our maven repository.
  • Loading branch information
bmarty authored Dec 7, 2021
2 parents 53e4ef5 + 892d708 commit 147935d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions changelog.d/4647.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Upgrade OLM to v3.2.7 and get it from our maven repository.
4 changes: 2 additions & 2 deletions matrix-sdk-android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 147935d

Please sign in to comment.