Reworked Scala adaptor to use implicits in RxImplicits, rather than code generation

Author: mattrjacobs

build.gradle

@@ -1,3 +1,9 @@
+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')
+
 ext.githubProjectName = rootProject.name
 
 buildscript {
@@ -9,20 +15,51 @@ allprojects {
     repositories { mavenCentral() }
 }
 
-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')
 
 subprojects {
+    apply plugin: 'java'
+    apply plugin: 'eclipse'
+    apply plugin: 'idea'
 
     group = "com.netflix.${githubProjectName}"
 
+    // make 'examples' use the same classpath
+    configurations { 
+        examplesCompile.extendsFrom compile
+        examplesRuntime.extendsFrom runtime
+    }
+
     sourceSets.test.java.srcDir 'src/main/java'
 
     tasks.withType(Javadoc).each {
         it.classpath = sourceSets.main.compileClasspath
     }
+
+    //include /src/examples folder
+    sourceSets { 
+        examples
+    }
+    
+    //include 'examples' in build task
+    tasks.build { 
+        dependsOn(examplesClasses)
+    }
+    
+    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
+        }
+    }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.3-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip

language-adaptors/rxjava-scala/build.gradle

@@ -1,58 +1,49 @@
 apply plugin: 'scala'
-apply plugin: 'eclipse'
-apply plugin: 'idea'
 apply plugin: 'osgi'
 
 tasks.withType(ScalaCompile) {
 	scalaCompileOptions.fork = true
     scalaCompileOptions.unchecked = true
+    scalaCompileOptions.setAdditionalParameters(['-feature'])
 
     configure(scalaCompileOptions.forkOptions) {
         memoryMaximumSize = '1g'
         jvmArgs = ['-XX:MaxPermSize=512m']
     }
 }
 
+sourceSets { 
+    test { 
+        scala { 
+            srcDir 'src/main/scala'
+        }
+    }
+}
+
 dependencies {
-    // Scala compiler and related tools
-    scalaTools 'org.scala-lang:scala-compiler:2.10+'
-    scalaTools 'org.scala-lang:scala-library:2.10+'
-    provided 'org.scalatest:scalatest_2.10:1.9.1'
+    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'
+}
 
-    testCompile 'org.scalatest:scalatest_2.10:1.9.1'
+tasks.compileScala {  
+    classpath = classpath + (configurations.compile + configurations.provided)
 }
 
 task test(overwrite: true, dependsOn: testClasses) << {
     ant.taskdef(name: 'scalatest',
             classname: 'org.scalatest.tools.ScalaTestAntTask',
-            classpath: sourceSets.test.runtimeClasspath.asPath
+            classpath: configurations.provided.asPath + ':' + configurations.testRuntime.asPath + ":" + compileScala.destinationDir
     )
-    ant.scalatest(runpath: sourceSets.test.classesDir,
+    ant.scalatest(runpath: sourceSets.test.output.classesDir,
             haltonfailure: 'true',
             fork: 'false') {reporter(type: 'stdout')}
 }
 
-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
-	}
-}
-
 jar {
     manifest {
         name = 'rxjava-scala'