| 18 | 18 |
Disable tests until all the dependencies are packaged and they can be run
|
| 19 | 19 |
reliably.
|
| 20 | 20 |
|
| 21 | |
libidn-java package does not provide metadata suitable for Debian's Maven
|
| 22 | |
repository.
|
| 23 | |
|
| 24 | |
Alter the build file to use the provided .jar instead.
|
| 25 | |
|
| 26 | 21 |
Disable sub-projects that have additional dependencies and focus on parts that
|
| 27 | 22 |
are needed for Smack and Jitsi.
|
| 28 | 23 |
|
| 29 | 24 |
Forwarded: not-needed
|
| 30 | 25 |
---
|
| 31 | |
build.gradle | 54 ++++++++++++++++++------------------
|
| 32 | |
jxmpp-stringprep-libidn/build.gradle | 2 +-
|
| 33 | |
settings.gradle | 8 +++---
|
| 34 | |
3 files changed, 32 insertions(+), 32 deletions(-)
|
|
26 |
build.gradle | 58 ++++++++++++++++++++++++++++-----------------------------
|
|
27 |
settings.gradle | 10 +++++-----
|
|
28 |
2 files changed, 34 insertions(+), 34 deletions(-)
|
| 35 | 29 |
|
| 36 | 30 |
diff --git a/build.gradle b/build.gradle
|
| 37 | |
index 194c9df..a3dadf3 100644
|
|
31 |
index 194c9df..0010922 100644
|
| 38 | 32 |
--- a/build.gradle
|
| 39 | 33 |
+++ b/build.gradle
|
| 40 | 34 |
@@ -6,22 +6,22 @@ buildscript {
|
|
| 69 | 63 |
|
| 70 | 64 |
repositories {
|
| 71 | 65 |
mavenLocal()
|
| 72 | |
@@ -50,7 +50,7 @@ allprojects {
|
|
66 |
@@ -45,14 +45,14 @@ allprojects {
|
|
67 |
sonatypeStagingUrl = 'https://oss.sonatype.org/service/local/staging/deploy/maven2'
|
|
68 |
builtDate = (new java.text.SimpleDateFormat("yyyy-MM-dd")).format(new Date())
|
|
69 |
oneLineDesc = 'An Open Source XMPP (Jabber) library'
|
|
70 |
- androidProjects = [':jxmpp-core', ':jxmpp-jid', ':jxmpp-stringprep-libidn', ':jxmpp-util-cache'].collect{ project(it) }
|
|
71 |
+ androidProjects = [':jxmpp-core', ':jxmpp-jid', ':jxmpp-util-cache'].collect{ project(it) }
|
|
72 |
jmhProjects = [':jxmpp-util-cache'].collect { project(it) }
|
| 73 | 73 |
junit4Projects = [
|
| 74 | 74 |
':jxmpp-core',
|
| 75 | 75 |
':jxmpp-jid',
|
| 76 | 76 |
- ':jxmpp-repl',
|
| 77 | 77 |
+ // ':jxmpp-repl',
|
| 78 | 78 |
':jxmpp-stringprep-icu4j',
|
| 79 | |
':jxmpp-stringprep-libidn',
|
|
79 |
- ':jxmpp-stringprep-libidn',
|
|
80 |
+ // ':jxmpp-stringprep-libidn',
|
| 80 | 81 |
':jxmpp-util-cache',
|
|
82 |
].collect { project(it) }
|
|
83 |
// Only enable Error Prone for non JMH projects, as JMH
|
| 81 | 84 |
@@ -79,11 +79,11 @@ allprojects {
|
| 82 | 85 |
)
|
| 83 | 86 |
}
|
|
| 195 | 198 |
|
| 196 | 199 |
def getGitCommit() {
|
| 197 | 200 |
def projectDirFile = new File("$projectDir")
|
| 198 | |
diff --git a/jxmpp-stringprep-libidn/build.gradle b/jxmpp-stringprep-libidn/build.gradle
|
| 199 | |
index c507adb..d5ffa81 100644
|
| 200 | |
--- a/jxmpp-stringprep-libidn/build.gradle
|
| 201 | |
+++ b/jxmpp-stringprep-libidn/build.gradle
|
| 202 | |
@@ -3,5 +3,5 @@ JXMPP Stringprep with libidn."""
|
| 203 | |
|
| 204 | |
dependencies {
|
| 205 | |
compile project(':jxmpp-core')
|
| 206 | |
- compile 'org.gnu.inet:libidn:1.15'
|
| 207 | |
+ compile files('/usr/share/java/libidn.jar')
|
| 208 | |
}
|
| 209 | 201 |
diff --git a/settings.gradle b/settings.gradle
|
| 210 | |
index ff18801..c408e49 100644
|
|
202 |
index ff18801..b1c8476 100644
|
| 211 | 203 |
--- a/settings.gradle
|
| 212 | 204 |
+++ b/settings.gradle
|
| 213 | 205 |
@@ -1,8 +1,8 @@
|
|
| 216 | 208 |
- 'jxmpp-strings-testframework',
|
| 217 | 209 |
+ // 'jxmpp-strings-testframework',
|
| 218 | 210 |
'jxmpp-stringprep-icu4j',
|
| 219 | |
'jxmpp-stringprep-libidn',
|
|
211 |
- 'jxmpp-stringprep-libidn',
|
| 220 | 212 |
- 'jxmpp-stringprep-rocksxmppprecis',
|
| 221 | 213 |
- 'jxmpp-util-cache',
|
| 222 | 214 |
- 'jxmpp-repl'
|
|
215 |
+ // 'jxmpp-stringprep-libidn',
|
| 223 | 216 |
+ // 'jxmpp-stringprep-rocksxmppprecis',
|
| 224 | 217 |
+ 'jxmpp-util-cache'
|
| 225 | 218 |
+ // 'jxmpp-repl'
|