From 44496ac4255b02cfbf1f4afe5e9e3988a59836bf Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Sun, 5 Aug 2018 18:30:56 +0300 Subject: use juick-xmpp as submodule --- .gitmodules | 3 +++ build.gradle | 1 - juick-server/build.gradle | 2 +- juick-xmpp | 1 + settings.gradle | 2 +- 5 files changed, 6 insertions(+), 3 deletions(-) create mode 160000 juick-xmpp diff --git a/.gitmodules b/.gitmodules index 9fbba638..c24be4ba 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "juick-www/src/main/resources/help"] path = juick-www/src/main/resources/help url = https://github.com/juick/help.git +[submodule "juick-xmpp"] + path = juick-xmpp + url = https://github.com/juick/com.juick.xmpp.git diff --git a/build.gradle b/build.gradle index bd76e3ba..0e0b31b8 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,6 @@ allprojects { repositories { mavenCentral() jcenter() - maven { url "https://jitpack.io" } maven { url "https://repository.apache.org/content/repositories/snapshots/" } maven { url "https://oss.sonatype.org/content/repositories/snapshots" } } diff --git a/juick-server/build.gradle b/juick-server/build.gradle index a28f6efa..aab94f4b 100644 --- a/juick-server/build.gradle +++ b/juick-server/build.gradle @@ -22,7 +22,7 @@ dependencies { compile 'org.imgscalr:imgscalr-lib:4.2' compile 'org.twitter4j:twitter4j-core:4.0.6' - compile ('com.github.juick:com.juick.xmpp:9b7d8e07a9') { + compile (project(':juick-xmpp')) { exclude group: 'xmlpull' } compile 'xpp3:xpp3:1.1.4c' diff --git a/juick-xmpp b/juick-xmpp new file mode 160000 index 00000000..9b7d8e07 --- /dev/null +++ b/juick-xmpp @@ -0,0 +1 @@ +Subproject commit 9b7d8e07a93dc238ea8491c0d33121df285061ca diff --git a/settings.gradle b/settings.gradle index 86d92c90..2ad77c1c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ rootProject.name = "Juick" -include ':juick-common', ':juick-server', ':juick-notifications' +include ':juick-common', ':juick-server', ':juick-xmpp', ':juick-notifications' -- cgit v1.2.3