Simplify build configuration.

 - Make extra 'examples' and 'perf' source sets super sets of test classpaths (simplifies IDE configuration)
 - Consolidate all standard configuration to convention.gradle
 - Remove redundant configuration
 - Use more conventional configuration idioms

Author: ldaley

build.gradle

@@ -1,11 +1,5 @@
 ext.githubProjectName = 'RxJava'
 
-apply from: file('gradle/convention.gradle')
-apply from: file('gradle/maven.gradle')
-//apply from: file('gradle/check.gradle')
-apply from: file('gradle/license.gradle')
-apply from: file('gradle/release.gradle')
-
 buildscript {
     repositories {
         mavenLocal()
@@ -15,59 +9,19 @@ buildscript {
 }
 
 allprojects {
+    group = "com.netflix.rxjava"
+
     apply plugin: 'eclipse'
     apply plugin: 'idea'
+
     repositories { 
         mavenLocal()
         mavenCentral() // maven { url: 'http://jcenter.bintray.com' }
     }
 }
 
-subprojects {
-    apply plugin: 'java'
-    group = "com.netflix.rxjava"
-
-    // make 'examples' use the same classpath
-    configurations { 
-        examplesCompile.extendsFrom compile
-        examplesRuntime.extendsFrom runtime
-	    perfCompile.extendsFrom compile
-	    perfRuntime.extendsFrom runtime
-    }
-
-
-    tasks.withType(Javadoc).each {
-        it.classpath = sourceSets.main.compileClasspath
-    }
-
-    sourceSets { 
-		//include /src/examples folder
-        examples
-		//include /src/perf folder
-		// perf //-> Not working so commented out
-    }
-    
-    tasks.build { 
-		//include 'examples' in build task
-        dependsOn(examplesClasses)
-		//include 'perf' in build task
-        // dependsOn(perfClasses)  //-> Not working so commented out
-    }
-    
-    eclipse {  
-        classpath {  
-            // include 'provided' dependencies on the classpath
-            plusConfigurations += configurations.provided
-            
-            downloadSources = true
-            downloadJavadoc = true
-        }
-    }
-    
-    idea {
-        module {
-            // include 'provided' dependencies on the classpath
-            scopes.PROVIDED.plus += configurations.provided
-        }
-    }
-}
+apply from: file('gradle/convention.gradle')
+apply from: file('gradle/maven.gradle')
+//apply from: file('gradle/check.gradle')
+apply from: file('gradle/license.gradle')
+apply from: file('gradle/release.gradle')

gradle/convention.gradle

@@ -1,31 +1,34 @@
 // GRADLE-2087 workaround, perform after java plugin
-status = project.hasProperty('preferredStatus')?project.preferredStatus:(version.contains('SNAPSHOT')?'snapshot':'release')
+status = project.hasProperty('preferredStatus') ? project.preferredStatus : (version.contains('SNAPSHOT') ? 'snapshot' : 'release')
 
 subprojects { project ->
+
     apply plugin: 'java' // Plugin as major conventions
 
     sourceCompatibility = 1.6
 
     // Restore status after Java plugin
     status = rootProject.status
 
-    task sourcesJar(type: Jar, dependsOn:classes) {
+    task sourcesJar(type: Jar, dependsOn: classes) {
         from sourceSets.main.allSource
         classifier 'sources'
         extension 'jar'
     }
 
-    task javadocJar(type: Jar, dependsOn:javadoc) {
+    task javadocJar(type: Jar, dependsOn: javadoc) {
         from javadoc.destinationDir
         classifier 'javadoc'
         extension 'jar'
     }
 
-    configurations.create('sources')
-    configurations.create('javadoc')
-    configurations.archives {
-        extendsFrom configurations.sources
-        extendsFrom configurations.javadoc
+    configurations {
+        create("sources")
+        create("javadoc")
+        archives {
+            extendsFrom configurations.sources
+            extendsFrom configurations.javadoc
+        }
     }
 
     // When outputing to an Ivy repo, we want to use the proper type field
@@ -56,26 +59,72 @@ subprojects { project ->
         }
     }
 
-    project.sourceSets {
-        main.compileClasspath += project.configurations.provided
-        main.runtimeClasspath -= project.configurations.provided
-        test.compileClasspath += project.configurations.provided
-        test.runtimeClasspath += project.configurations.provided
+    sourceSets {
+        main {
+            compileClasspath += configurations.provided
+            runtimeClasspath -= configurations.provided
+        }
+        test {
+            compileClasspath += configurations.provided
+            runtimeClasspath += configurations.provided
+        }
+        examples {
+            compileClasspath += configurations.provided + main.output
+        }
+        perf {
+            compileClasspath += configurations.provided + main.output
+        }
+    }
+
+    configurations {
+        examplesCompile.extendsFrom testCompile
+        examplesRuntime.extendsFrom testRuntime
+        perfCompile.extendsFrom testCompile
+        perfRuntime.extendsFrom testRuntime
+    }
+
+    build {
+        dependsOn examplesClasses
     }
+
+    // Individual projects will apply specific language plugins which add to source sets…
+    // do this late so we get those additions
+    afterEvaluate {
+        idea {
+            module {
+                [sourceSets.examples, sourceSets.perf].each {
+                    [it.allSource.srcDirs, it.resources.srcDirs].each {
+                        testSourceDirs += it
+                    }
+                }
+                scopes.PROVIDED.plus += configurations.provided
+            }
+        }
+
+        eclipse {
+            classpath {
+                plusConfigurations += configurations.provided
+                downloadJavadoc = true
+            }
+        }
+    }
+
 }
 
 apply plugin: 'github-pages' // Used to create publishGhPages task
 
 def docTasks = [:]
-[Javadoc,ScalaDoc,Groovydoc].each{ Class docClass ->
-    def allSources = allprojects.tasks*.withType(docClass).flatten()*.source 
+[Javadoc, ScalaDoc, Groovydoc].each { Class docClass ->
+    def allSources = allprojects.tasks*.withType(docClass).flatten()*.source
     if (allSources) {
         def shortName = docClass.simpleName.toLowerCase()
         def docTask = task "aggregate${shortName.capitalize()}"(type: docClass, description: "Aggregate subproject ${shortName}s") {
             source = allSources
             destinationDir = file("${project.buildDir}/docs/${shortName}")
             doFirst {
-                def classpaths = allprojects.findAll { it.plugins.hasPlugin(JavaPlugin) }.collect { it.sourceSets.main.compileClasspath }
+                def classpaths = allprojects.findAll { it.plugins.hasPlugin(JavaPlugin) }.collect {
+                    it.sourceSets.main.compileClasspath
+                }
                 classpath = files(classpaths)
             }
         }
@@ -93,9 +142,4 @@ githubPages {
             }
         }
     }
-}
-
-// Generate wrapper, which is distributed as part of source to alleviate the need of installing gradle
-task createWrapper(type: Wrapper) {
-    gradleVersion = '1.6'
-}
+}

language-adaptors/rxjava-groovy/build.gradle

@@ -4,8 +4,8 @@ apply plugin: 'osgi'
 dependencies {
     compile project(':rxjava-core')
     compile 'org.codehaus.groovy:groovy-all:2.+'
-    provided 'junit:junit-dep:4.10'
-    provided 'org.mockito:mockito-core:1.8.5'
+    testCompile 'junit:junit-dep:4.10'
+    testCompile 'org.mockito:mockito-core:1.8.5'
 }
 
 jar {

language-adaptors/rxjava-scala/build.gradle

@@ -12,26 +12,13 @@ tasks.withType(ScalaCompile) {
     }
 }
 
-sourceSets { 
-    test.scala.srcDir 'src/examples/scala'
-}
-
 dependencies {
     compile 'org.scala-lang:scala-library:2.10.+'
-
     compile project(':rxjava-core')
 
-    provided 'junit:junit-dep:4.10'
-    provided 'org.mockito:mockito-core:1.8.5'
-    provided 'org.scalatest:scalatest_2.10:1.9.1'
-}
-
-tasks.compileScala {  
-    classpath = classpath + (configurations.compile + configurations.provided)
-}
-
-tasks.compileExamplesScala {  
-    classpath = classpath + files(compileScala.destinationDir) + (configurations.compile + configurations.provided)
+    testCompile 'junit:junit-dep:4.10'
+    testCompile 'org.mockito:mockito-core:1.8.5'
+    testCompile 'org.scalatest:scalatest_2.10:1.9.1'
 }
 
 // Add RxJava core to Scaladoc input: