recombine two base and xtend plugin

gradle/bintrayRelease.gradle

@@ -19,8 +19,8 @@ bintray {
 			version {
 					def gradlePluginsDir = project.file('src/main/resources/META-INF/gradle-plugins')
 					if (gradlePluginsDir.exists()) {
-						def gradlePluginName = gradlePluginsDir.listFiles().first().name
-						attributes = ['gradle-plugin': '$project.group:project.name:$gradlePluginName']
+						def gradlePlugins = gradlePluginsDir.listFiles().collect{'$project.group:project.name:${name.replace(".properties", "")}'}
+						attributes = ['gradle-plugin': gradlePlugins.join(',')]
 					}
 			}
 		}

settings.gradle

@@ -1 +1 @@
-include 'xtend-base-gradle-plugin', 'xtend-android-gradle-plugin', 'xtend-gradle-plugin','xtend-gradle-lib'
+include 'xtend-android-gradle-plugin', 'xtend-gradle-plugin','xtend-gradle-lib'

xtend-android-gradle-plugin/build.gradle

@@ -1,6 +1,6 @@
 description = 'A Gradle Plugin that integrates Xtend into the Android build system'
 
 dependencies {
-  compile project(':xtend-base-gradle-plugin')
+  compile project(':xtend-gradle-plugin')
 	compile 'com.android.tools.build:gradle:0.13+'
 }

xtend-gradle-plugin/build.gradle

@@ -1,5 +1,13 @@
 description = 'A Gradle Plugin for building Xtend projects'
 
 dependencies {
-  compile project(':xtend-base-gradle-plugin')
-}
+  compile gradleApi()
+  compile 'com.martiansoftware:nailgun-server:0.9.1'
+	compile 'org.eclipse.core:org.eclipse.core.runtime:3.7.0'
+}
+
+jar {
+  manifest {
+    attributes("Implementation-Version": version)
+  }
+}