Matrix SDK library is now built and hosted by Jitpack (Fixes matrix-o…

…rg/matrix-android-sdk#241)
element-hq · May 3, 2019 · 973cdef · 973cdef
1 parent f6973bc
commit 973cdef
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -13,6 +13,7 @@ Improvements:
 
 Other changes:
  - Olm lib is now only a dependency of Matrix Sdk
+ - Matrix SDK library is now built and hosted by Jitpack (https://jitpack.io/#matrix-org/matrix-android-sdk/) (matrix-org/matrix-android-sdk#241)
 
 Bugfix:
  - Fix mistake in Arabic translation (#3129)

diff --git a/build.gradle b/build.gradle
@@ -43,6 +43,10 @@ allprojects {
         maven {
             url "https://github.com/jitsi/jitsi-maven-repository/raw/master/releases"
         }
+        // For Matrix Android SDK
+        maven {
+            url 'https://jitpack.io'
+        }
     }
 }
 

diff --git a/compile_with_sdk_lib.sh b/compile_with_sdk_lib.sh
@@ -8,7 +8,7 @@ sed -i.bak "s/^include ':matrix-sdk'/\/\/include ':matrix-sdk'/" ./settings.grad
 sed -i.bak "s/^project(':matrix-sdk')/\/\/project(':matrix-sdk')/" ./settings.gradle || true
 
 echo "replace step 2"
-sed -i.bak "s/^    \/\/implementation(name: 'matrix/    implementation(name: 'matrix/" ./vector/build.gradle || true
+sed -i.bak "s/^    \/\/implementation 'com.github.matrix-org:matrix-android-sdk/    implementation 'com.github.matrix-org:matrix-android-sdk/" ./vector/build.gradle || true
 sed -i.bak "s/^    implementation project(':matrix-/    \/\/implementation project(':matrix-/" ./vector/build.gradle || true
 
 # Delete the created files

diff --git a/compile_with_sdk_project.sh b/compile_with_sdk_project.sh
@@ -8,7 +8,7 @@ sed -i.bak "s/^\/\/include ':matrix-sdk'/include ':matrix-sdk'/" ./settings.grad
 sed -i.bak "s/^\/\/project(':matrix-sdk')/project(':matrix-sdk')/" ./settings.gradle || true
 
 echo "replace step 2"
-sed -i.bak "s/^    implementation(name: 'matrix/    \/\/implementation(name: 'matrix/" ./vector/build.gradle || true
+sed -i.bak "s/^    implementation 'com.github.matrix-org:matrix-android-sdk/    \/\/implementation 'com.github.matrix-org:matrix-android-sdk/" ./vector/build.gradle || true
 sed -i.bak "s/^    \/\/implementation project(':matrix-/    implementation project(':matrix-/" ./vector/build.gradle || true
 
 # Delete the created files

diff --git a/vector/build.gradle b/vector/build.gradle
@@ -229,8 +229,8 @@ dependencies {
 
     /************* Matrix SDK management **************/
     // update settings.gradle
-    // use the matrix SDK as external lib
-    implementation(name: 'matrix-sdk', ext: 'aar')
+    // use the matrix SDK as external dependency
+    implementation 'com.github.matrix-org:matrix-android-sdk:v0.9.23'
     // use the matrix SDK as a sub project
     // you have to uncomment some lines in settings.gradle
     //implementation project(':matrix-sdk')

diff --git a/vector/libs/matrix-sdk.aar b/vector/libs/matrix-sdk.aar
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,6 +43,10 @@ allprojects { @@
             maven {
                 url "https://github.com/jitsi/jitsi-maven-repository/raw/master/releases"
             }
+            // For Matrix Android SDK
+            maven {
+                url 'https://jitpack.io'
+            }
         }
     }
@@ Expand Down @@