From 3320952ce577fe29a91e2caf6f1aabc662992914 Mon Sep 17 00:00:00 2001
From: PJ Fanning <pjfanning@users.noreply.github.com>
Date: Wed, 16 Aug 2023 17:14:38 +0100
Subject: [PATCH] Update build.sbt

---
 build.sbt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build.sbt b/build.sbt
index a521df1a..5f9ef86f 100644
--- a/build.sbt
+++ b/build.sbt
@@ -72,6 +72,8 @@ scalacOptions ++= {
 // and we use it.
 //scalacOptions in (Compile, compile) += "-Xfatal-warnings"
 
+compileOrder := CompileOrder.JavaThenScala
+
 Compile / unmanagedSourceDirectories ++= {
   if (scalaReleaseVersion.value > 2) {
     Seq(
@@ -100,7 +102,7 @@ Test / unmanagedSourceDirectories ++= {
 }
 
 Test / unmanagedSourceDirectories ++= {
-  if (addJava17Tests && scalaReleaseVersion.value == 2 && scalaMajorVersion.value >= 13) {
+  if (addJava17Tests) {
     Seq(
       (LocalRootProject / baseDirectory).value / "src" / "test" / "java-17",
       (LocalRootProject / baseDirectory).value / "src" / "test" / "scala-jdk-17",