From 8142b9b7ba2e65eb4e091647fa08699542d24b68 Mon Sep 17 00:00:00 2001
From: Ismael Juma <ismael@juma.me.uk>
Date: Mon, 5 Apr 2021 21:46:42 -0700
Subject: [PATCH] MINOR: Enable scala/java joint compilation consistently for
 `core` module

We were doing it only for test files previously.
---
 build.gradle | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index e1a05e3c0a170..f4b0bf44e5c33 100644
--- 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 {