Merge branch 'flow' of flow/Mercury-IM into master
This commit is contained in:
commit
5f51586dfd
|
@ -12,7 +12,7 @@
|
||||||
```
|
```
|
||||||
git clone <project-url>
|
git clone <project-url>
|
||||||
cd <project-directory>
|
cd <project-directory>
|
||||||
git submodule init && git submodule update
|
git submodule update --init --recursive
|
||||||
gradle assembleDebug
|
gradle assembleDebug
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
|
@ -37,7 +37,6 @@ allprojects {
|
||||||
// Exclude XmlPullParser from Smack dependencies, as its now provided by Android
|
// Exclude XmlPullParser from Smack dependencies, as its now provided by Android
|
||||||
// https://stackoverflow.com/questions/48488563/gradle-xpp3-error/48746294#48746294
|
// https://stackoverflow.com/questions/48488563/gradle-xpp3-error/48746294#48746294
|
||||||
all {
|
all {
|
||||||
exclude group: 'xpp3', module: 'xpp3'
|
|
||||||
exclude group: 'xpp3', module: 'xpp3_min'
|
exclude group: 'xpp3', module: 'xpp3_min'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue