Skip to content

Commit 520bedf

Browse files
committed
* Removed all methods working with Objects from rxjava-core
- This allows for type safety in statically-typed languages - This prevents dynamically-typed languages from hooking into rxjava-core. -- See ReactiveX#204 for details on code generation for dynamic languages * Added Scala implicits into rx.lang.scala.RxImplicits * Added tests of most methods on Observable using Scala functions * Fixed Scala Gradle/ScalaTest build
1 parent 2df0bea commit 520bedf

File tree

5 files changed

+629
-1254
lines changed

5 files changed

+629
-1254
lines changed

language-adaptors/rxjava-scala/build.gradle

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ apply plugin: 'osgi'
66
tasks.withType(ScalaCompile) {
77
scalaCompileOptions.fork = true
88
scalaCompileOptions.unchecked = true
9+
scalaCompileOptions.setAdditionalParameters(['-feature'])
910

1011
configure(scalaCompileOptions.forkOptions) {
1112
memoryMaximumSize = '1g'
@@ -24,14 +25,18 @@ dependencies {
2425
provided 'org.mockito:mockito-core:1.8.5'
2526

2627
testCompile 'org.scalatest:scalatest_2.10:1.9.1'
28+
testCompile 'junit:junit:4.10'
29+
testCompile 'org.mockito:mockito-core:1.8.5'
2730
}
2831

32+
sourceSets.test.scala.srcDir 'src/main/scala'
33+
2934
task test(overwrite: true, dependsOn: testClasses) << {
3035
ant.taskdef(name: 'scalatest',
3136
classname: 'org.scalatest.tools.ScalaTestAntTask',
32-
classpath: sourceSets.test.runtimeClasspath.asPath
37+
classpath: configurations.testRuntime.asPath + ':' + compileScala.destinationDir
3338
)
34-
ant.scalatest(runpath: sourceSets.test.classesDir,
39+
ant.scalatest(runpath: sourceSets.test.output.classesDir,
3540
haltonfailure: 'true',
3641
fork: 'false') {reporter(type: 'stdout')}
3742
}

0 commit comments

Comments
 (0)