Move common dependencies to convention script.

ldaley · ldaley · commit 21ba03c58faf · 2014-01-21T13:25:30.000Z
diff --git a/gradle/convention.gradle b/gradle/convention.gradle
@@ -1,7 +1,7 @@
 // GRADLE-2087 workaround, perform after java plugin
 status = project.hasProperty('preferredStatus') ? project.preferredStatus : (version.contains('SNAPSHOT') ? 'snapshot' : 'release')
 
-subprojects { project ->
+subprojects {
     if (!subprojects.empty) { // is a container
         return
     }
@@ -11,6 +11,15 @@ subprojects { project ->
     apply plugin: 'java'
     apply plugin: 'osgi'
 
+    dependencies {
+        if (project.path != ":rxjava-core") {
+            compile project(':rxjava-core')
+        }
+
+        testCompile 'junit:junit-dep:4.10'
+        testCompile 'org.mockito:mockito-core:1.8.5'
+    }
+
     sourceCompatibility = JavaVersion.VERSION_1_6
     targetCompatibility = JavaVersion.VERSION_1_6
 
@@ -49,7 +58,7 @@ subprojects { project ->
         }
     }
 
-    // When outputing to an Ivy repo, we want to use the proper type field
+// When outputing to an Ivy repo, we want to use the proper type field
     gradle.taskGraph.whenReady {
         def isNotMaven = !it.hasTask(project.uploadMavenCentral)
         if (isNotMaven) {
@@ -116,8 +125,8 @@ subprojects { project ->
         dependsOn examplesClasses
     }
 
-    // Individual projects will apply specific language plugins which add to source sets…
-    // do this late so we get those additions
+// Individual projects will apply specific language plugins which add to source sets…
+// do this late so we get those additions
     afterEvaluate {
         idea {
             module {
diff --git a/language-adaptors/rxjava-clojure/build.gradle b/language-adaptors/rxjava-clojure/build.gradle
@@ -10,7 +10,6 @@ repositories {
 }
 
 dependencies {
-    compile project(':rxjava-core')
     compile 'org.clojure:clojure:1.4.+'
     compile 'clj-http:clj-http:0.6.4' // https://clojars.org/clj-http
 }
diff --git a/language-adaptors/rxjava-groovy/build.gradle b/language-adaptors/rxjava-groovy/build.gradle
@@ -1,8 +1,5 @@
 apply plugin: 'groovy'
 
 dependencies {
-    compile project(':rxjava-core')
     compile 'org.codehaus.groovy:groovy-all:2.+'
-    testCompile 'junit:junit-dep:4.10'
-    testCompile 'org.mockito:mockito-core:1.8.5'
 }
diff --git a/language-adaptors/rxjava-jruby/build.gradle b/language-adaptors/rxjava-jruby/build.gradle
@@ -18,10 +18,7 @@ sourceSets {
 }
 
 dependencies {
-    compile project(':rxjava-core')
     compile 'org.jruby:jruby:1.7+'
-    testCompile 'junit:junit-dep:4.10'
-    testCompile 'org.mockito:mockito-core:1.8.5'
     rspec 'org.jruby:jruby-complete:1.7.4'
     rspec 'org.rubygems:rspec:2.14.1'
 }
diff --git a/language-adaptors/rxjava-kotlin/build.gradle b/language-adaptors/rxjava-kotlin/build.gradle
@@ -11,8 +11,5 @@ buildscript {
 apply plugin: 'kotlin'
 
 dependencies {
-    compile project(':rxjava-core')
     compile 'org.jetbrains.kotlin:kotlin-stdlib:0.6.1673'
-    testCompile 'junit:junit-dep:4.10'
-    testCompile 'org.mockito:mockito-core:1.8.5'
 }
diff --git a/language-adaptors/rxjava-scala/build.gradle b/language-adaptors/rxjava-scala/build.gradle
@@ -13,10 +13,6 @@ tasks.withType(ScalaCompile) {
 
 dependencies {
     compile 'org.scala-lang:scala-library:2.10.+'
-    compile project(':rxjava-core')
-    
-    testCompile 'junit:junit-dep:4.10'
-    testCompile 'org.mockito:mockito-core:1.8.5'
     testCompile 'org.scalatest:scalatest_2.10:1.9.1'
 }
 
diff --git a/rxjava-contrib/rxjava-android/build.gradle b/rxjava-contrib/rxjava-android/build.gradle
@@ -1,12 +1,7 @@
-
-
 dependencies {
-    compile project(':rxjava-core')
     provided 'com.google.android:android:4.0.1.2'
     provided 'com.google.android:support-v4:r7'
 
-    testCompile 'junit:junit-dep:4.10'
-    testCompile 'org.mockito:mockito-core:1.8.5'
     testCompile 'org.robolectric:robolectric:2.1.1'
 }
 
diff --git a/rxjava-contrib/rxjava-apache-http/build.gradle b/rxjava-contrib/rxjava-apache-http/build.gradle
@@ -1,5 +1,4 @@
 dependencies {
-    compile project(':rxjava-core')
     compile 'org.apache.httpcomponents:httpclient:4.3'
     compile 'org.apache.httpcomponents:httpcore-nio:4.3'
     compile 'org.apache.httpcomponents:httpasyncclient:4.0'
diff --git a/rxjava-contrib/rxjava-async-util/build.gradle b/rxjava-contrib/rxjava-async-util/build.gradle
@@ -1,6 +1,3 @@
 dependencies {
-    compile project(':rxjava-core')
-    testCompile project(":rxjava-core").sourceSets.test.output 
-    testCompile 'junit:junit-dep:4.10'
-    testCompile 'org.mockito:mockito-core:1.8.5'
+    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
diff --git a/rxjava-contrib/rxjava-string/build.gradle b/rxjava-contrib/rxjava-string/build.gradle
@@ -1,6 +1,3 @@
 dependencies {
-    compile project(':rxjava-core')
-    testCompile project(":rxjava-core").sourceSets.test.output 
-    testCompile 'junit:junit-dep:4.10'
-    testCompile 'org.mockito:mockito-core:1.8.5'
+    testCompile project(":rxjava-core").sourceSets.test.output
 }
diff --git a/rxjava-contrib/rxjava-swing/build.gradle b/rxjava-contrib/rxjava-swing/build.gradle

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ repositories {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`dependencies {`
`13`		`- compile project(':rxjava-core')`
`14`	`13`	`compile 'org.clojure:clojure:1.4.+'`
`15`	`14`	`compile 'clj-http:clj-http:0.6.4' // https://clojars.org/clj-http`
`16`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,5 @@`
`1`	`1`	`apply plugin: 'groovy'`
`2`	`2`
`3`	`3`	`dependencies {`
`4`		`- compile project(':rxjava-core')`
`5`	`4`	`compile 'org.codehaus.groovy:groovy-all:2.+'`
`6`		`- testCompile 'junit:junit-dep:4.10'`
`7`		`- testCompile 'org.mockito:mockito-core:1.8.5'`
`8`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,7 @@ sourceSets {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`dependencies {`
`21`		`- compile project(':rxjava-core')`
`22`	`21`	`compile 'org.jruby:jruby:1.7+'`
`23`		`- testCompile 'junit:junit-dep:4.10'`
`24`		`- testCompile 'org.mockito:mockito-core:1.8.5'`
`25`	`22`	`rspec 'org.jruby:jruby-complete:1.7.4'`
`26`	`23`	`rspec 'org.rubygems:rspec:2.14.1'`
`27`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,5 @@ buildscript {`
`11`	`11`	`apply plugin: 'kotlin'`
`12`	`12`
`13`	`13`	`dependencies {`
`14`		`- compile project(':rxjava-core')`
`15`	`14`	`compile 'org.jetbrains.kotlin:kotlin-stdlib:0.6.1673'`
`16`		`- testCompile 'junit:junit-dep:4.10'`
`17`		`- testCompile 'org.mockito:mockito-core:1.8.5'`
`18`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,6 @@ tasks.withType(ScalaCompile) {`
`13`	`13`
`14`	`14`	`dependencies {`
`15`	`15`	`compile 'org.scala-lang:scala-library:2.10.+'`
`16`		`- compile project(':rxjava-core')`
`17`		`-`
`18`		`- testCompile 'junit:junit-dep:4.10'`
`19`		`- testCompile 'org.mockito:mockito-core:1.8.5'`
`20`	`16`	`testCompile 'org.scalatest:scalatest_2.10:1.9.1'`
`21`	`17`	`}`
`22`	`18`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`dependencies {`
`2`		`- compile project(':rxjava-core')`
`3`	`2`	`compile 'org.apache.httpcomponents:httpclient:4.3'`
`4`	`3`	`compile 'org.apache.httpcomponents:httpcore-nio:4.3'`
`5`	`4`	`compile 'org.apache.httpcomponents:httpasyncclient:4.0'`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,3 @@`
`1`	`1`	`dependencies {`
`2`		`- compile project(':rxjava-core')`
`3`		`- testCompile project(":rxjava-core").sourceSets.test.output`
`4`		`- testCompile 'junit:junit-dep:4.10'`
`5`		`- testCompile 'org.mockito:mockito-core:1.8.5'`
	`2`	`+ testCompile project(":rxjava-core").sourceSets.test.output`
`6`	`3`	`}`