Don't use gradle 'configurations' in smack-core

Fixes SMACK-587
This commit is contained in:
Florian Schmaus 2014-10-09 19:53:53 +02:00
parent ade6d528e8
commit 328b733f7e
5 changed files with 4 additions and 32 deletions

View File

@ -3,6 +3,6 @@ Compression with jzlib
Allow to compress the XMPP stream with help of jzlib."""
dependencies {
compile project(path: ':smack-core', configuration: 'compression')
compile project(path: ':smack-core')
compile 'com.jcraft:jzlib:1.1.3'
}

View File

@ -1,12 +1,6 @@
description = """\
Smack core components."""
configurations {
compression
dns
sasl
}
dependencies {
compile 'xpp3:xpp3:1.1.4c'
compile "org.jxmpp:jxmpp-core:$jxmppVersion"
@ -19,28 +13,6 @@ dependencies {
testCompile 'net.iharder:base64:2.3.8'
}
task compressionJar(type: Jar) {
appendix = 'compression'
dependsOn classes
from sourceSets.main.output
include('org/jivesoftware/smack/compression/**')
include('org/jivesoftware/smack/SmackConfiguration.class')
}
task dnsJar(type: Jar) {
appendix = 'dns'
dependsOn classes
from sourceSets.main.output
include('org/jivesoftware/smack/util/dns/**')
include('org/jivesoftware/smack/util/DNSUtil.class')
include('org/jivesoftware/smack/initializer/**')
}
artifacts {
compression compressionJar
dns dnsJar
}
class CreateFileTask extends DefaultTask {
@Input
String fileContent

View File

@ -4,6 +4,6 @@ Use dnsjava for DNS SRV lookups. For platforms that don't provide the
javax.naming API (e.g. Android)."""
dependencies {
compile project(path: ':smack-core', configuration: 'dns')
compile project(path: ':smack-core')
compile 'dnsjava:dnsjava:2.1.+'
}

View File

@ -4,5 +4,5 @@ Use javax.naming for DNS SRV lookups. The javax.naming API is availabe in JavaSE
since Java7."""
dependencies {
compile project(path: ':smack-core', configuration: 'dns')
compile project(path: ':smack-core')
}

View File

@ -4,7 +4,7 @@ Use minidns for DNS SRV lookups. For platforms that don't provide the
javax.naming API (e.g. Android)."""
dependencies {
compile project(path: ':smack-core', configuration: 'dns')
compile project(path: ':smack-core')
compile 'de.measite.minidns:minidns:0.1.1'
compile "org.jxmpp:jxmpp-util-cache:$jxmppVersion"
}