Skip to content

Commit

Permalink
* Removed all methods working with Objects from rxjava-core
Browse files Browse the repository at this point in the history
 - 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
  • Loading branch information
mattrjacobs committed Mar 28, 2013
1 parent 2df0bea commit 520bedf
Show file tree
Hide file tree
Showing 5 changed files with 629 additions and 1,254 deletions.
9 changes: 7 additions & 2 deletions language-adaptors/rxjava-scala/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ apply plugin: 'osgi'
tasks.withType(ScalaCompile) {
scalaCompileOptions.fork = true
scalaCompileOptions.unchecked = true
scalaCompileOptions.setAdditionalParameters(['-feature'])

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

testCompile 'org.scalatest:scalatest_2.10:1.9.1'
testCompile 'junit:junit:4.10'
testCompile 'org.mockito:mockito-core:1.8.5'
}

sourceSets.test.scala.srcDir 'src/main/scala'

task test(overwrite: true, dependsOn: testClasses) << {
ant.taskdef(name: 'scalatest',
classname: 'org.scalatest.tools.ScalaTestAntTask',
classpath: sourceSets.test.runtimeClasspath.asPath
classpath: 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')}
}
Expand Down
Loading

0 comments on commit 520bedf

Please sign in to comment.