Skip to content

Commit

Permalink
Merge branch 'feature-mockito-5' of https://github.com/scalatest/scal…
Browse files Browse the repository at this point in the history
…atestplus-mockito into mockito-5.8/3.2.17.x
  • Loading branch information
cheeseng committed Dec 18, 2023
2 parents c9a55f5 + f4edd78 commit 5b82a9a
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 8
java-version: 11
- name: Build and Test
run: sbt -v +test
9 changes: 6 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,28 @@ ScalaTest + Mockito provides integration support between ScalaTest and Mockito.

**Usage**

To use it for ScalaTest 3.2.17 and Mockito 4.11.x:
To use it for ScalaTest 3.2.17 and Mockito 5.8.x:

SBT:

```
libraryDependencies += "org.scalatestplus" %% "mockito-4-11" % "3.2.17.0" % "test"
libraryDependencies += "org.scalatestplus" %% "mockito-5-8" % "3.2.17.0" % "test"
```

Maven:

```
<dependency>
<groupId>org.scalatestplus</groupId>
<artifactId>mockito-4-11_2.13</artifactId>
<artifactId>mockito-5-8_3</artifactId>
<version>3.2.17.0</version>
<scope>test</scope>
</dependency>
```

**Note**
Mockito 5.x requires JDK11+, if you are on JDK8, please use `mockito-4-11` instead.

**Publishing**

Please use the following commands to publish to Sonatype:
Expand Down
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import java.io.PrintWriter
import scala.io.Source

name := "mockito-4.11"
name := "mockito-5.8"

organization := "org.scalatestplus"

Expand All @@ -28,12 +28,12 @@ developers := List(
)
)

scalaVersion := "2.13.11"
scalaVersion := "2.13.12"

crossScalaVersions := List("2.10.7", "2.11.12", "2.12.17", "2.13.11", "3.1.3")
crossScalaVersions := List("2.10.7", "2.11.12", "2.12.18", "2.13.12", "3.1.3")

libraryDependencies ++= Seq(
"org.mockito" % "mockito-core" % "4.11.0",
"org.mockito" % "mockito-core" % "5.8.0",
"org.scalatest" %% "scalatest-core" % "3.2.17",
"org.scalatest" %% "scalatest-funsuite" % "3.2.17" % "test"
)
Expand Down

0 comments on commit 5b82a9a

Please sign in to comment.