Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

support scala 3 build for util-test #306

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

support scala 3 build for util-test #306

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,12 +650,25 @@ lazy val utilTest = Project(
id = "util-test",
base = file("util-test")
).settings(
sharedSettings
sharedScala3EnabledSettings
).settings(
name := "util-test",
libraryDependencies ++= Seq(
"org.mockito" % "mockito-all" % "1.10.19",
"org.scalatestplus" %% "mockito-1-10" % "3.1.0.0"
libraryDependencies ++= (
if (scalaVersion.value.startsWith("2"))
Seq(
"org.mockito" % "mockito-all" % "1.10.19",
"org.scalatestplus" %% "mockito-1-10" % "3.1.0.0"
)
else
Seq(
// We keep this ancient version for now as it's unclear how much source incompatibility a jump to 3.4.x would
// cause to consumers of this module.
// If we run into compatibility issues with new versions of scalatest-mockito we will have to upgrade to
// mockito-core 3.4.x for Scala 2 and 3.
"org.mockito" % "mockito-all" % "1.10.19",
"org.scalatest" %% "scalatest" % "3.2.9",
"org.scalatestplus" %% "mockito-3-4" % "3.2.9.0"
)
)
).dependsOn(utilCore, utilLogging, utilStats)

Expand Down