aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorSam Whited <sam@samwhited.com>2014-10-30 15:20:20 -0400
committerSam Whited <sam@samwhited.com>2014-10-30 15:33:13 -0400
commit46f147a82c6b161e071f717c7686f8b78a20aaf1 (patch)
tree38ee04006e38197fd8009697b8975007ec0f45c8 /README.md
parent142384e5805d93887d185c9a5b74d4850e4ec719 (diff)
parenta362bd10214b16f8939c12a1dd4376667fe0d49f (diff)
Merge branch 'gradle' into development
Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib
Diffstat (limited to 'README.md')
-rw-r--r--README.md23
1 files changed, 20 insertions, 3 deletions
diff --git a/README.md b/README.md
index c28d7e42..ed8a48af 100644
--- a/README.md
+++ b/README.md
@@ -271,9 +271,26 @@ Make sure to have ANDROID_HOME point to your Android SDK
git clone https://github.com/siacs/Conversations.git
cd Conversations
- git submodule update --init --recursive
- ant clean
- ant debug
+ ./gradlew build
+
+### How do I update/add external libraries?
+
+If the library you want to update is in Maven Central or JCenter (or has its own
+Maven repo), add it or update its version in `build.gradle`. If the library is
+in the `libs/` directory, you can update it using a subtree merge by doing the
+following (using `minidns` as an example):
+
+ git remote add minidns https://github.com/rtreffer/minidns.git
+ git fetch minidns
+ git merge -s subtree minidns master
+
+To add a new dependency to the `libs/` directory (replacing "name", "branch" and
+"url" as necessary):
+
+ git remote add name url
+ git merge -s ours --no-commit name/branch
+ git read-tree --prefix=libs/name -u name/branch
+ git commit -m "Subtree merged in name"
#### How do I debug Conversations