Skip to content

Commit a27388b

Browse files
committed
Remove unnecessary configuration for scala compilation.
1 parent 4c2a3f3 commit a27388b

File tree

1 file changed

+1
-25
lines changed

1 file changed

+1
-25
lines changed

language-adaptors/rxjava-scala/build.gradle

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,31 +13,7 @@ tasks.withType(ScalaCompile) {
1313
}
1414

1515
sourceSets {
16-
main {
17-
scala {
18-
srcDir 'src/main/scala'
19-
}
20-
}
21-
test {
22-
scala {
23-
srcDir 'src/main/scala'
24-
srcDir 'src/test/scala'
25-
srcDir 'src/examples/scala'
26-
//srcDir 'src/examples/java'
27-
}
28-
java.srcDirs = []
29-
}
30-
examples {
31-
// It seems that in Gradle, the dependency "compileScala depends on compileJava" is hardcoded,
32-
// or at least not meant to be removed.
33-
// However, compileScala also runs javac at the very end, so we just add the Java sources to
34-
// the scala source set:
35-
scala {
36-
srcDir 'src/examples/scala'
37-
//srcDir 'src/examples/java'
38-
}
39-
java.srcDirs = []
40-
}
16+
test.scala.srcDir 'src/examples/scala'
4117
}
4218

4319
dependencies {

0 commit comments

Comments
 (0)