Skip to content

merge queue: embarking 0.11.x (7bec113), #1879, #1881, #1883 and #1886 together #1898

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

Closed
wants to merge 8 commits into from
Closed

merge queue: embarking 0.11.x (7bec113), #1879, #1881, #1883 and #1886 together #1898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c04a8ab
Update mockito-core to 5.18.0 in 0.11.x
scala-steward Jun 10, 2025
8f3e446
Update scala-compiler, scala-library to 2.12.20 in 0.11.x
scala-steward Jun 10, 2025
720f1b7
Update sbt, scripted-plugin to 1.11.2 in 0.11.x
scala-steward Jun 10, 2025
303b70a
Update sbt-mdoc, sbt-scalafmt to 2.5.4 in 0.11.x
scala-steward Jun 10, 2025
9182b64
Merge of #1879
mergify[bot] Jun 10, 2025
8678c36
Merge of #1881
mergify[bot] Jun 10, 2025
f8d257c
Merge of #1883
mergify[bot] Jun 10, 2025
ecf0209
Merge of #1886
mergify[bot] Jun 10, 2025
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
2 changes: 1 addition & 1 deletion benchmarks/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
val ScalapbVersion = sys.env.getOrElse("SCALAPB", "0.10.0-SNAPSHOT")

addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")

addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.27")

Expand Down
2 changes: 1 addition & 1 deletion examples/basic/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.6")

addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")

libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.1"
4 changes: 2 additions & 2 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ object Dependencies {
// For testing
val annotationApi = "1.3.2"
val cats = "2.6.1"
val mockito = "5.11.0"
val mockito = "5.18.0"
val munit = "1.0.0-M12"
val scalaTest = "3.2.18"
val scalaTestPlusMockito = "3.1.0.0"
val scalaTestPlusScalaCheck = "3.2.18.0"
val utest = "0.7.10"
}

val Scala212 = "2.12.19"
val Scala212 = "2.12.20"

val Scala213 = "2.13.16"

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.11.1
sbt.version=1.11.2
4 changes: 2 additions & 2 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")

addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")

addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")

addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.8")

Expand All @@ -24,6 +24,6 @@ addSbtPlugin("com.thesamet" % "sbt-protoc-gen-project" % "0.1.8")

addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.1")

addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.2")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.4")

addSbtPlugin("org.scalameta" % "sbt-native-image" % "0.3.4")
Loading