MINOR: Enable scala/java joint compilation consistently for core module (apache#10485)

ijuma · web-flow · commit 12e655f45c4f · 2021-04-06T12:10:55.000-07:00
We were doing it only for test files previously.

Reviewers: Chia-Ping Tsai &lt;chia7712@gmail.com&gt;, Jose Sancio &lt;jsancio@gmail.com&gt;
diff --git a/build.gradle b/build.gradle
@@ -1029,9 +1029,13 @@ project(':core') {
   }
 
   sourceSets {
+    // Set java/scala source folders in the `scala` block to enable joint compilation
     main {
       java {
-        srcDirs = ["src/generated/java", "src/main/java"]
+        srcDirs = []
+      }
+      scala {
+        srcDirs = ["src/generated/java", "src/main/java", "src/main/scala"]
       }
     }
     test {

Original file line number	Diff line number	Diff line change
`@@ -1029,9 +1029,13 @@ project(':core') {`
`1029`	`1029`	`}`
`1030`	`1030`
`1031`	`1031`	`sourceSets {`
	`1032`	+ // Set java/scala source folders in the `scala` block to enable joint compilation
`1032`	`1033`	`main {`
`1033`	`1034`	`java {`
`1034`		`- srcDirs = ["src/generated/java", "src/main/java"]`
	`1035`	`+ srcDirs = []`
	`1036`	`+ }`
	`1037`	`+ scala {`
	`1038`	`+ srcDirs = ["src/generated/java", "src/main/java", "src/main/scala"]`
`1035`	`1039`	`}`
`1036`	`1040`	`}`
`1037`	`1041`	`test {`