From f6b4341a30e4f9c4bd0b2c4c3e6d8754a5496d14 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Thu, 7 Nov 2019 09:34:09 +0100 Subject: [PATCH 1/2] gradle: We only need to exclude xpp3_min Since xpp3 is only declared as 'implementation' in smack-xmlparser-xpp3, whereas xpp3_min is declared as 'api'. This means that only xpp3_min is pulled in by the build system, but as it is already provided by Android, we need to exclude it again. --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2d41731..bc43b8e 100644 --- a/build.gradle +++ b/build.gradle @@ -37,7 +37,6 @@ allprojects { // Exclude XmlPullParser from Smack dependencies, as its now provided by Android // https://stackoverflow.com/questions/48488563/gradle-xpp3-error/48746294#48746294 all { - exclude group: 'xpp3', module: 'xpp3' exclude group: 'xpp3', module: 'xpp3_min' } } From b590c59ac685303f2a9138d503953e49ef02a8e2 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Thu, 7 Nov 2019 09:36:00 +0100 Subject: [PATCH 2/2] readme: improve instructions on how to update the git submodules --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0dc92bf..643a114 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ ``` git clone cd -git submodule init && git submodule update +git submodule update --init --recursive gradle assembleDebug ``` @@ -21,4 +21,4 @@ gradle assembleDebug * I want to develop, but lots of `org.jivesoftware.smackx.*` classes cannot be found! * You forgot to type `git submodule init && git submodule update` as mentioned above * I'm missing `org.mercury_im.messenger.persistence.requery.*` classes??? - * In Android Studio select the `persistence-requery` module and then click "Build -> Make Module 'persistence-requery'". \ No newline at end of file + * In Android Studio select the `persistence-requery` module and then click "Build -> Make Module 'persistence-requery'".