Move osgi plugin application to the conventions script.

ldaley · ldaley · commit 6076f230f418 · 2014-01-21T12:29:48.000Z
diff --git a/gradle/convention.gradle b/gradle/convention.gradle
@@ -2,9 +2,13 @@
 status = project.hasProperty('preferredStatus') ? project.preferredStatus : (version.contains('SNAPSHOT') ? 'snapshot' : 'release')
 
 subprojects { project ->
+    if (!subprojects.empty) { // is a container
+        return
+    }
+
     description = name.capitalize().replaceAll("-\\w") { " " + (it.toUpperCase() - "-") }.replaceAll("Rxjava", "RxJava")
 
-    apply plugin: 'java' // Plugin as major conventions
+    apply plugin: 'java'
 
     sourceCompatibility = JavaVersion.VERSION_1_6
     targetCompatibility = JavaVersion.VERSION_1_6
diff --git a/language-adaptors/rxjava-clojure/build.gradle b/language-adaptors/rxjava-clojure/build.gradle
@@ -4,7 +4,6 @@ buildscript {
 }
 
 apply plugin: 'clojure'
-apply plugin: 'osgi'
 
 repositories {
     clojarsRepo()
diff --git a/language-adaptors/rxjava-groovy/build.gradle b/language-adaptors/rxjava-groovy/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'groovy'
-apply plugin: 'osgi'
 
 dependencies {
     compile project(':rxjava-core')
diff --git a/language-adaptors/rxjava-jruby/build.gradle b/language-adaptors/rxjava-jruby/build.gradle
@@ -1,5 +1,3 @@
-apply plugin: 'osgi'
-
 repositories {
     maven {
         url 'http://deux.gemjars.org/'
diff --git a/language-adaptors/rxjava-kotlin/build.gradle b/language-adaptors/rxjava-kotlin/build.gradle
@@ -9,7 +9,6 @@ buildscript {
 }
 
 apply plugin: 'kotlin'
-apply plugin: 'osgi'
 
 dependencies {
     compile project(':rxjava-core')
diff --git a/language-adaptors/rxjava-scala/build.gradle b/language-adaptors/rxjava-scala/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'scala'
-apply plugin: 'osgi'
 
 tasks.withType(ScalaCompile) {
 	scalaCompileOptions.fork = true
diff --git a/rxjava-contrib/rxjava-android/build.gradle b/rxjava-contrib/rxjava-android/build.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'osgi'
+
 
 dependencies {
     compile project(':rxjava-core')
diff --git a/rxjava-contrib/rxjava-apache-http/build.gradle b/rxjava-contrib/rxjava-apache-http/build.gradle
@@ -1,5 +1,3 @@
-apply plugin: 'osgi'
-
 dependencies {
     compile project(':rxjava-core')
     compile 'org.apache.httpcomponents:httpclient:4.3'
diff --git a/rxjava-contrib/rxjava-async-util/build.gradle b/rxjava-contrib/rxjava-async-util/build.gradle
@@ -1,5 +1,3 @@
-apply plugin: 'osgi'
-
 dependencies {
     compile project(':rxjava-core')
     testCompile project(":rxjava-core").sourceSets.test.output 
diff --git a/rxjava-contrib/rxjava-computation-expressions/build.gradle b/rxjava-contrib/rxjava-computation-expressions/build.gradle
@@ -1,5 +1,3 @@
-apply plugin: 'osgi'
-
 dependencies {
     compile project(':rxjava-core')
     testCompile 'junit:junit-dep:4.10'
diff --git a/rxjava-contrib/rxjava-string/build.gradle b/rxjava-contrib/rxjava-string/build.gradle
@@ -1,5 +1,3 @@
-apply plugin: 'osgi'
-
 dependencies {
     compile project(':rxjava-core')
     testCompile project(":rxjava-core").sourceSets.test.output 
diff --git a/rxjava-contrib/rxjava-swing/build.gradle b/rxjava-contrib/rxjava-swing/build.gradle
@@ -1,5 +1,3 @@
-apply plugin: 'osgi'
-
 dependencies {
     compile project(':rxjava-core')
     provided 'junit:junit-dep:4.10'
diff --git a/rxjava-core/build.gradle b/rxjava-core/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'maven'
-apply plugin: 'osgi'
 
 dependencies {
     provided 'junit:junit-dep:4.10'

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ buildscript {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`apply plugin: 'clojure'`
`7`		`-apply plugin: 'osgi'`
`8`	`7`
`9`	`8`	`repositories {`
`10`	`9`	`clojarsRepo()`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`apply plugin: 'groovy'`
`2`		`-apply plugin: 'osgi'`
`3`	`2`
`4`	`3`	`dependencies {`
`5`	`4`	`compile project(':rxjava-core')`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-apply plugin: 'osgi'`
`2`		`-`
`3`	`1`	`repositories {`
`4`	`2`	`maven {`
`5`	`3`	`url 'http://deux.gemjars.org'`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ buildscript {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`apply plugin: 'kotlin'`
`12`		`-apply plugin: 'osgi'`
`13`	`12`
`14`	`13`	`dependencies {`
`15`	`14`	`compile project(':rxjava-core')`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`apply plugin: 'scala'`
`2`		`-apply plugin: 'osgi'`
`3`	`2`
`4`	`3`	`tasks.withType(ScalaCompile) {`
`5`	`4`	`scalaCompileOptions.fork = true`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-apply plugin: 'osgi'`
	`1`	`+`
`2`	`2`
`3`	`3`	`dependencies {`
`4`	`4`	`compile project(':rxjava-core')`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`apply plugin: 'maven'`
`2`		`-apply plugin: 'osgi'`
`3`	`2`
`4`	`3`	`dependencies {`
`5`	`4`	`provided 'junit:junit-dep:4.10'`