Skip to content

Commit 01634bc

Browse files
move MovieLibUsage.java from project rxjava-scala-java to project rxjava-scala and delete project rxjava-scala-java
1 parent cc8b756 commit 01634bc

File tree

5 files changed

+9
-39
lines changed

5 files changed

+9
-39
lines changed

language-adaptors/rxjava-scala-java/README.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

language-adaptors/rxjava-scala-java/build.gradle

Lines changed: 0 additions & 32 deletions
This file was deleted.

language-adaptors/rxjava-scala/build.gradle

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,20 @@ sourceSets {
2323
srcDir 'src/main/scala'
2424
srcDir 'src/test/scala'
2525
srcDir 'src/examples/scala'
26+
srcDir 'src/examples/java'
2627
}
28+
java.srcDirs = []
2729
}
28-
examples {
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:
2935
scala {
3036
srcDir 'src/examples/scala'
37+
srcDir 'src/examples/java'
3138
}
39+
java.srcDirs = []
3240
}
3341
}
3442

settings.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ include 'rxjava-core', \
33
'language-adaptors:rxjava-groovy', \
44
'language-adaptors:rxjava-clojure', \
55
'language-adaptors:rxjava-scala', \
6-
'language-adaptors:rxjava-scala-java', \
76
'rxjava-contrib:rxjava-swing', \
87
'rxjava-contrib:rxjava-android', \
98
'rxjava-contrib:rxjava-apache-http'

0 commit comments

Comments
 (0)