Skip to content

Commit cc8b756

Browse files
move examples from src/main/scala to src/examples/scala
and tweak build.gradle to make this work
1 parent 8856077 commit cc8b756

File tree

5 files changed

+18
-1
lines changed

5 files changed

+18
-1
lines changed

language-adaptors/rxjava-scala/build.gradle

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,21 @@ tasks.withType(ScalaCompile) {
1313
}
1414

1515
sourceSets {
16+
main {
17+
scala {
18+
srcDir 'src/main/scala'
19+
}
20+
}
1621
test {
1722
scala {
1823
srcDir 'src/main/scala'
24+
srcDir 'src/test/scala'
25+
srcDir 'src/examples/scala'
26+
}
27+
}
28+
examples {
29+
scala {
30+
srcDir 'src/examples/scala'
1931
}
2032
}
2133
}
@@ -34,6 +46,10 @@ tasks.compileScala {
3446
classpath = classpath + (configurations.compile + configurations.provided)
3547
}
3648

49+
tasks.compileExamplesScala {
50+
classpath = classpath + files(compileScala.destinationDir) + (configurations.compile + configurations.provided)
51+
}
52+
3753
task test(overwrite: true, dependsOn: testClasses) << {
3854
ant.taskdef(name: 'scalatest',
3955
classname: 'org.scalatest.tools.ScalaTestAntTask',

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/Observable.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2049,7 +2049,7 @@ class UnitTestSuite extends org.scalatest.junit.JUnitSuite {
20492049
}
20502050

20512051
@Test def testFirstOrElse() {
2052-
def mustNotBeCalled: String = error("this method should not be called")
2052+
def mustNotBeCalled: String = sys.error("this method should not be called")
20532053
def mustBeCalled: String = "this is the default value"
20542054
assertEquals("hello", Observable("hello").firstOrElse(mustNotBeCalled).toBlockingObservable.single)
20552055
assertEquals("this is the default value", Observable().firstOrElse(mustBeCalled).toBlockingObservable.single)
@@ -2069,6 +2069,7 @@ class UnitTestSuite extends org.scalatest.junit.JUnitSuite {
20692069
@Test def testTest() = {
20702070
val a: Observable[Int] = Observable()
20712071
assertEquals(4, Observable(1, 2, 3, 4).toBlockingObservable.toIterable.last)
2072+
println("This UnitTestSuite.testTest() for rx.lang.scala.Observable")
20722073
}
20732074

20742075
}

0 commit comments

Comments
 (0)