Skip to content

Commit

Permalink
Merge branch 'master' into update/mockito-core-5.13.0
Browse files Browse the repository at this point in the history
  • Loading branch information
gaeljw authored Sep 16, 2024
2 parents 3817dfc + b8eb22b commit 766b51f
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/renovatebot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- name: Checkout
uses: actions/[email protected]
- name: Self-hosted Renovate
uses: renovatebot/[email protected].6
uses: renovatebot/[email protected].9
with:
configurationFile: .github/renovate-config.js
token: ${{ secrets.RENOVATE_TOKEN }}
Expand Down
11 changes: 8 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ThisBuild / developers := List(

val play28Version = "2.8.22"
val play29Version = "2.9.5"
val play30Version = "3.0.4"
val play30Version = "3.0.5"

def play2Dependencies(version: String): Seq[ModuleID] = Seq(
"com.typesafe.play" %% "play" % version,
Expand All @@ -36,7 +36,12 @@ def play3Dependencies(version: String): Seq[ModuleID] = Seq(
lazy val testDependencies: Seq[ModuleID] = Seq(
"org.scalatest" %% "scalatest" % "3.2.19",
"org.scalatestplus" %% "scalacheck-1-15" % "3.2.11.0",
"org.scalacheck" %% "scalacheck" % "1.18.0",




"org.scalacheck" %% "scalacheck" % "1.18.1",

"org.mockito" % "mockito-core" % "5.13.0"
).map(_ % Test)

Expand All @@ -49,7 +54,7 @@ def scalaCollectionsCompat(scalaVersion: String): immutable.Seq[ModuleID] = {
}
}

val scala212 = "2.12.19"
val scala212 = "2.12.20"
val scala213 = "2.13.14"
val scala3 = "3.3.3"

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sbt.version = 1.10.1
sbt.version = 1.10.2

2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
logLevel := Level.Warn

// https://github.com/scoverage/sbt-scoverage/releases
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.1.1")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.0")

// https://github.com/scoverage/sbt-coveralls/releases
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.13")
Expand Down

0 comments on commit 766b51f

Please sign in to comment.