From a2ffaeca1ff70e72ee8b079c96e0b0fd9231864b Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flo@geekplace.eu>
Date: Fri, 19 Sep 2014 11:27:40 +0200
Subject: [PATCH] Make smack-android/smack-java7 declare minimal dependencies

---
 smack-android/build.gradle | 9 +++++++--
 smack-java7/build.gradle   | 8 ++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/smack-android/build.gradle b/smack-android/build.gradle
index fccf19d12..31793f3db 100644
--- a/smack-android/build.gradle
+++ b/smack-android/build.gradle
@@ -1,6 +1,8 @@
 description = """\
 Smack for Android.
-All the required dependencies to run Smack on Android"""
+All the required dependencies to run Smack on Android.
+Usually you want to add additional dependencies to smack-tcp,
+smack-extensions and smack-experimental."""
 
 ext {
 	smackMinAndroidSdk = 8
@@ -10,7 +12,10 @@ ext {
 // Note that the test dependencies (junit, …) are inferred from the
 // sourceSet.test of the core subproject
 dependencies {
-	androidProjects.each { project ->
+	// Filter out the optional Smack dependencies from androidProjects
+	androidProjects.findAll {
+		![':smack-tcp', ':smack-extensions', ':smack-experimental'].contains(it.getPath())
+	}.each { project ->
 		compile project
 	}
 }
diff --git a/smack-java7/build.gradle b/smack-java7/build.gradle
index 6a53eb668..52f0197d7 100644
--- a/smack-java7/build.gradle
+++ b/smack-java7/build.gradle
@@ -1,15 +1,11 @@
 description = """\
 Smack for Java7 (or higher).
 This is a pseudo-artifact that pulls all the required dependencies to
-run Smack on Java 7 (or higher) JVMs. You can add further dependencies
-like smack-bosh, run with a minimal subset by don't depending on
-smack-java7, but using e.g. just smack-core, smack-tcp and
-smack-resolver-javax"""
+run Smack on Java 7 (or higher) JVMs. Usually you want to add additional
+dependencies to smack-tcp, smack-extensions and smack-experimental."""
 
 dependencies {
 	compile project(":smack-core")
-	compile project(":smack-extensions")
-	compile project(":smack-tcp")
 	compile project(":smack-resolver-javax")
 	compile project(":smack-sasl-javax")
 }