aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2018-08-05 21:03:48 +0300
committerGravatar Vitaly Takmazov2018-08-05 21:03:48 +0300
commit0d7dcb9c837bdd5f76f0f3202969d8b8a46b8d77 (patch)
tree7ec145aedd902dca8ccc985d9590af279679bc09
parentaa144cf6b8ca6a0f83c68b30bdecc4c8d32862db (diff)
Revert "use juick-xmpp as submodule"
This reverts commit 44496ac4255b02cfbf1f4afe5e9e3988a59836bf.
-rw-r--r--.gitmodules3
-rw-r--r--build.gradle1
-rw-r--r--juick-server/build.gradle2
m---------juick-xmpp0
-rw-r--r--settings.gradle2
5 files changed, 3 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules
index c24be4ba..9fbba638 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
[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 0e0b31b8..bd76e3ba 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,6 +14,7 @@ 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 aab94f4b..a28f6efa 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 (project(':juick-xmpp')) {
+ compile ('com.github.juick:com.juick.xmpp:9b7d8e07a9') {
exclude group: 'xmlpull'
}
compile 'xpp3:xpp3:1.1.4c'
diff --git a/juick-xmpp b/juick-xmpp
deleted file mode 160000
-Subproject 9b7d8e07a93dc238ea8491c0d33121df285061c
diff --git a/settings.gradle b/settings.gradle
index 2ad77c1c..86d92c90 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,4 @@
rootProject.name = "Juick"
-include ':juick-common', ':juick-server', ':juick-xmpp', ':juick-notifications'
+include ':juick-common', ':juick-server', ':juick-notifications'