Skip to content

Commit

Permalink
Update build.sbt
Browse files Browse the repository at this point in the history
  • Loading branch information
pjfanning committed Aug 16, 2023
1 parent 30e58bf commit 3320952
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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",
Expand Down

0 comments on commit 3320952

Please sign in to comment.