Skip to content

Commit

Permalink
move java 17 tests
Browse files Browse the repository at this point in the history
  • Loading branch information
pjfanning committed Dec 5, 2024
1 parent 1931eae commit 109bb6f
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 13 deletions.
13 changes: 0 additions & 13 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ scalaMajorVersion := {
}
}

val addJava17Tests: Boolean = System.getProperty("java.specification.version").toDouble >= 17

scalacOptions ++= {
val additionalSettings =
if (scalaReleaseVersion.value == 2 && scalaMajorVersion.value <= 12) {
Expand Down Expand Up @@ -106,17 +104,6 @@ Test / unmanagedSourceDirectories ++= {
}
}

Test / unmanagedSourceDirectories ++= {
if (addJava17Tests) {
Seq(
(LocalRootProject / baseDirectory).value / "src" / "test" / "java-17",
(LocalRootProject / baseDirectory).value / "src" / "test" / "scala-jdk-17",
)
} else {
Seq.empty
}
}

libraryDependencies ++= Seq(
"tools.jackson.core" % "jackson-core" % jacksonVersion changing(),
"tools.jackson.core" % "jackson-databind" % jacksonVersion changing(),
Expand Down

0 comments on commit 109bb6f

Please sign in to comment.