Skip to content

Commit abd0a94

Browse files
maaramirezpimaaramirezpi
authored
Merge branch 'main' into update/mdoc-2.5.4
2 parents 61a4aa7 + 6b56160 commit abd0a94

File tree

5 files changed

+31
-27
lines changed

5 files changed

+31
-27
lines changed

‎.scalafmt.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version=3.8.2
1+
version=3.8.3
22
style = defaultWithAlign
33
maxColumn = 100
44
runner {

‎build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
val scala213 = "2.13.14"
2-
val scala3 = "3.4.2"
1+
val scala213 = "2.13.15"
2+
val scala3 = "3.4.3"
33

44
ThisBuild / organization := "io.higherkindness"
55
ThisBuild / githubOrganization := "47degrees"

‎microsite/src/main/docs/tutorials/testing-rpc-service.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ a property-based test with ScalaCheck to verify that the service's happiness
152152
does not depend on the incoming request.
153153

154154
```scala mdoc:silent
155+
import munit.catseffect.IOFixture
155156
import munit.ScalaCheckSuite
156157
import org.scalacheck.Gen
157158
import org.scalacheck.Prop.*
@@ -162,7 +163,7 @@ class PropertyBasedServiceSpec extends CatsEffectSuite with ScalaCheckSuite with
162163

163164
val client = ResourceSuiteLocalFixture("client", clientResource)
164165

165-
override def munitFixtures: Seq[Fixture[_]] = List(client)
166+
override def munitFixtures: Seq[IOFixture[_]] = List(client)
166167

167168
property("server is always happy") {
168169
val c = client()

‎project/ProjectPlugin.scala

+21-18
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import higherkindness.mu.rpc.srcgen.SrcGenPlugin.autoImport._
1010
import _root_.io.github.davidgregory084.ScalacOptions
1111
import _root_.io.github.davidgregory084.TpolecatPlugin.autoImport._
1212

13+
import scala.language.reflectiveCalls
14+
1315
object ProjectPlugin extends AutoPlugin {
1416

1517
override def trigger: PluginTrigger = allRequirements
@@ -21,18 +23,19 @@ object ProjectPlugin extends AutoPlugin {
2123
val catsEffect: String = "3.5.4"
2224
val catsRetry: String = "3.1.3"
2325
val dockerItScala = "0.12.0"
24-
val dropwizard: String = "4.2.26"
25-
val enumeratum: String = "1.7.4"
26+
val dropwizard: String = "4.2.28"
27+
val enumeratum: String = "1.7.5"
2628
val fs2: String = "3.10.2"
27-
val fs2Grpc: String = "2.7.16"
29+
val fs2Grpc: String = "2.7.20"
2830
val grpc: String = "1.65.0"
2931
val kindProjector: String = "0.13.3"
3032
val log4cats: String = "2.7.0"
3133
val log4s: String = "1.10.0"
32-
val logback: String = "1.5.6"
33-
val munit: String = "0.7.29"
34-
val munitCE: String = "1.0.7"
35-
val natchez: String = "0.3.5"
34+
val logback: String = "1.5.11"
35+
val munit: String = "1.0.2"
36+
val munitSC: String = "1.0.0"
37+
val munitCE: String = "2.0.0"
38+
val natchez: String = "0.3.7"
3639
val nettySSL: String = "2.0.61.Final"
3740
val paradise: String = "2.1.1"
3841
val pbdirect: String = "0.7.0"
@@ -44,7 +47,7 @@ object ProjectPlugin extends AutoPlugin {
4447
val scalapb: String = "0.11.17"
4548
val scalatest: String = "3.2.12"
4649
val scalatestplusScheck: String = "3.2.2.0"
47-
val slf4j: String = "2.0.13"
50+
val slf4j: String = "2.0.16"
4851
}
4952

5053
lazy val rpcServiceSettings: Seq[Def.Setting[_]] = Seq(
@@ -122,8 +125,8 @@ object ProjectPlugin extends AutoPlugin {
122125
libraryDependencies ++= Seq(
123126
"com.github.pureconfig" %% "pureconfig" % V.pureconfig,
124127
"org.scalameta" %% "munit" % V.munit % Test,
125-
"org.scalameta" %% "munit-scalacheck" % V.munit % Test,
126-
"org.typelevel" %% "munit-cats-effect-3" % V.munitCE % Test,
128+
"org.scalameta" %% "munit-scalacheck" % V.munitSC % Test,
129+
"org.typelevel" %% "munit-cats-effect" % V.munitCE % Test,
127130
"org.typelevel" %% "cats-effect-testkit" % V.catsEffect % Test
128131
)
129132
)
@@ -198,10 +201,10 @@ object ProjectPlugin extends AutoPlugin {
198201

199202
lazy val docsSettings: Seq[Def.Setting[_]] = Seq(
200203
libraryDependencies ++= Seq(
201-
"org.scalameta" %% "munit-scalacheck" % V.munit,
202-
"org.typelevel" %% "munit-cats-effect-3" % V.munitCE,
203-
"io.dropwizard.metrics" % "metrics-jmx" % V.dropwizard,
204-
"org.tpolecat" %% "natchez-jaeger" % V.natchez
204+
"org.scalameta" %% "munit-scalacheck" % V.munitSC,
205+
"org.typelevel" %% "munit-cats-effect" % V.munitCE,
206+
"io.dropwizard.metrics" % "metrics-jmx" % V.dropwizard,
207+
"org.tpolecat" %% "natchez-jaeger" % V.natchez
205208
),
206209
scalacOptions ~= (_ filterNot Set(
207210
"-Xfatal-warnings",
@@ -217,7 +220,7 @@ object ProjectPlugin extends AutoPlugin {
217220
scalacOptions -= "-Xfatal-warnings",
218221
libraryDependencies ++= Seq(
219222
"io.grpc" % "grpc-core" % V.grpc,
220-
"org.scalameta" %% "munit-scalacheck" % V.munit,
223+
"org.scalameta" %% "munit-scalacheck" % V.munitSC,
221224
"org.typelevel" %% "cats-effect" % V.catsEffect
222225
)
223226
)
@@ -232,8 +235,8 @@ object ProjectPlugin extends AutoPlugin {
232235
"com.47deg" %% "scalacheck-toolbox-datetime" % V.scalacheckToolbox % Test,
233236
"org.scala-lang.modules" %% "scala-collection-compat" % V.scalaCollectionCompat % Test,
234237
"org.scalameta" %% "munit" % V.munit % Test,
235-
"org.scalameta" %% "munit-scalacheck" % V.munit % Test,
236-
"org.typelevel" %% "munit-cats-effect-3" % V.munitCE % Test,
238+
"org.scalameta" %% "munit-scalacheck" % V.munitSC % Test,
239+
"org.typelevel" %% "munit-cats-effect" % V.munitCE % Test,
237240
"org.typelevel" %% "cats-effect-testkit" % V.catsEffect % Test,
238241
"ch.qos.logback" % "logback-classic" % V.logback % Test,
239242
"com.github.cb372" %% "cats-retry" % V.catsRetry % Test
@@ -310,7 +313,7 @@ object ProjectPlugin extends AutoPlugin {
310313
missinglinkIgnoreSourcePackages += IgnoredPackage("io.netty.handler.ssl")
311314
)
312315

313-
import autoImport._
316+
import autoImport.*
314317

315318
override def projectSettings: Seq[Def.Setting[_]] =
316319
Seq(

‎project/plugins.sbt

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ ThisBuild / libraryDependencySchemes ++= Seq(
66
resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots"
77
addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.0")
88
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
9-
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
9+
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.0")
1010
addSbtPlugin("com.47deg" % "sbt-microsites" % "1.4.4")
1111
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
1212
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.4")
1313
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
14-
addSbtPlugin("com.alejandrohdezma" % "sbt-github" % "0.11.13")
15-
addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % "0.11.13")
16-
addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % "0.11.13")
14+
addSbtPlugin("com.alejandrohdezma" % "sbt-github" % "0.12.0")
15+
addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % "0.12.0")
16+
addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % "0.12.0")
1717
addSbtPlugin("com.alejandrohdezma" % "sbt-remove-test-from-pom" % "0.1.0")
1818
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.2")
1919
addSbtPlugin("ch.epfl.scala" % "sbt-missinglink" % "0.3.6")
20-
addSbtPlugin("io.higherkindness" % "sbt-mu-srcgen" % "0.32.0")
20+
addSbtPlugin("io.higherkindness" % "sbt-mu-srcgen" % "0.32.1")

0 commit comments

Comments
 (0)