Archives/tijder_SmsMatrix
1
0
Fork 0
mirror of https://github.com/tijder/SmsMatrix.git synced 2024-10-27 18:24:01 +00:00
Code Issues Projects Releases Wiki Activity

Start with using git submodules #24

Browse Source
This commit is contained in:
Gerben Droogers 2018-11-19 13:05:32 +01:00
parent 24f853a62e
commit c0a2571937
7 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored Normal file
View File

@ -0,0 +1,6 @@
[submodule "matrix-sdk"]
path = matrix-sdk
url = https://github.com/matrix-org/matrix-android-sdk
[submodule "olm-sdk"]
path = olm-sdk
url = http://git.matrix.org/git/olm.git/

12
app/build.gradle
View File

@ -17,12 +17,6 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
repositories {
flatDir {
dir 'libs'
}
}
}
dependencies {
@ -35,9 +29,9 @@ dependencies {
compile 'com.android.support.constraint:constraint-layout:1.0.2'
testCompile 'junit:junit:4.12'
compile(name: 'matrix-sdk', ext: 'aar')
compile(name: 'olm-sdk', ext: 'aar')
implementation project(':olm-sdk')
implementation project(':matrix-sdk')
compile 'com.squareup.retrofit:retrofit:1.6.1'
compile 'com.google.code.gson:gson:2.3'
compile 'com.squareup.okhttp:okhttp-urlconnection:2.2.0'

BIN
app/libs/matrix-sdk.aar
View File

Binary file not shown.

BIN
app/libs/olm-sdk.aar
View File

Binary file not shown.

1
matrix-sdk Submodule

@ -0,0 +1 @@
Subproject commit 4498034a3af3a886df2cda822897871206fddfcd

1
olm-sdk Submodule

@ -0,0 +1 @@
Subproject commit ec2695b9c945fa577c6fc4501d65a186208ecfed

4
settings.gradle
View File

@ -1 +1,5 @@
include ':app'
include ':olm-sdk'
project(':olm-sdk').projectDir=new File('olm-sdk/android/olm-sdk')
include ':matrix-sdk'
project(':matrix-sdk').projectDir=new File('matrix-sdk/matrix-sdk')