From 56d001ca823b0981c3d8badcfc97e09f01760a74 Mon Sep 17 00:00:00 2001
From: Taras <tarassmakula@gmail.com>
Date: Wed, 23 Mar 2022 14:18:07 +0200
Subject: [PATCH] Add git submodule
---
.gitmodules | 4 ++++
app/build.gradle | 5 +----
matrix-android-sdk | 1 +
settings.gradle | 6 +-----
4 files changed, 7 insertions(+), 9 deletions(-)
create mode 100644 .gitmodules
create mode 160000 matrix-android-sdk
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..a6d61c48a
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "matrix-android-sdk"]
+ path = matrix-android-sdk
+ url = https://gitlab.futo.org/circles/matrix-android-sdk.git
+ branch = main
diff --git a/app/build.gradle b/app/build.gradle
index 8f50bf064..9617344b6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -49,10 +49,7 @@ android {
}
dependencies {
- //Matrix
- implementation 'org.matrix.android:matrix-sdk-android:v1.4.4'
- implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-
+ implementation project(':matrix-android-sdk:matrix-sdk-android')
implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'com.google.android.material:material:1.5.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
diff --git a/matrix-android-sdk b/matrix-android-sdk
new file mode 160000
index 000000000..ee9747283
--- /dev/null
+++ b/matrix-android-sdk
@@ -0,0 +1 @@
+Subproject commit ee9747283a69afe99022f0f2884671bb307f1cc0
diff --git a/settings.gradle b/settings.gradle
index 99b371d8f..b0b529fa1 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,7 +1,3 @@
rootProject.name = "Circles"
include ':app'
-sourceControl {
- gitRepository("https://gitlab.futo.org/circles/matrix-android-sdk.git") {
- producesModule("org.matrix.android:matrix-sdk-android")
- }
-}
\ No newline at end of file
+include ':matrix-android-sdk:matrix-sdk-android'
\ No newline at end of file
--
GitLab