Skip to content

Commit

Permalink
Merge branch 'main' into update/mdoc-2.5.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@maaramirezpi
maaramirezpi authored Oct 21, 2024
2 parents 61a4aa7 + 6b56160 commit abd0a94
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=3.8.2
version=3.8.3
style = defaultWithAlign
maxColumn = 100
runner {
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
val scala213 = "2.13.14"
val scala3 = "3.4.2"
val scala213 = "2.13.15"
val scala3 = "3.4.3"

ThisBuild / organization := "io.higherkindness"
ThisBuild / githubOrganization := "47degrees"
Expand Down
3 changes: 2 additions & 1 deletion microsite/src/main/docs/tutorials/testing-rpc-service.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ a property-based test with ScalaCheck to verify that the service's happiness
does not depend on the incoming request.

```scala mdoc:silent
import munit.catseffect.IOFixture
import munit.ScalaCheckSuite
import org.scalacheck.Gen
import org.scalacheck.Prop.*
Expand All @@ -162,7 +163,7 @@ class PropertyBasedServiceSpec extends CatsEffectSuite with ScalaCheckSuite with

val client = ResourceSuiteLocalFixture("client", clientResource)

override def munitFixtures: Seq[Fixture[_]] = List(client)
override def munitFixtures: Seq[IOFixture[_]] = List(client)

property("server is always happy") {
val c = client()
Expand Down
39 changes: 21 additions & 18 deletions project/ProjectPlugin.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import higherkindness.mu.rpc.srcgen.SrcGenPlugin.autoImport._
import _root_.io.github.davidgregory084.ScalacOptions
import _root_.io.github.davidgregory084.TpolecatPlugin.autoImport._

import scala.language.reflectiveCalls

object ProjectPlugin extends AutoPlugin {

override def trigger: PluginTrigger = allRequirements
Expand All @@ -21,18 +23,19 @@ object ProjectPlugin extends AutoPlugin {
val catsEffect: String = "3.5.4"
val catsRetry: String = "3.1.3"
val dockerItScala = "0.12.0"
val dropwizard: String = "4.2.26"
val enumeratum: String = "1.7.4"
val dropwizard: String = "4.2.28"
val enumeratum: String = "1.7.5"
val fs2: String = "3.10.2"
val fs2Grpc: String = "2.7.16"
val fs2Grpc: String = "2.7.20"
val grpc: String = "1.65.0"
val kindProjector: String = "0.13.3"
val log4cats: String = "2.7.0"
val log4s: String = "1.10.0"
val logback: String = "1.5.6"
val munit: String = "0.7.29"
val munitCE: String = "1.0.7"
val natchez: String = "0.3.5"
val logback: String = "1.5.11"
val munit: String = "1.0.2"
val munitSC: String = "1.0.0"
val munitCE: String = "2.0.0"
val natchez: String = "0.3.7"
val nettySSL: String = "2.0.61.Final"
val paradise: String = "2.1.1"
val pbdirect: String = "0.7.0"
Expand All @@ -44,7 +47,7 @@ object ProjectPlugin extends AutoPlugin {
val scalapb: String = "0.11.17"
val scalatest: String = "3.2.12"
val scalatestplusScheck: String = "3.2.2.0"
val slf4j: String = "2.0.13"
val slf4j: String = "2.0.16"
}

lazy val rpcServiceSettings: Seq[Def.Setting[_]] = Seq(
Expand Down Expand Up @@ -122,8 +125,8 @@ object ProjectPlugin extends AutoPlugin {
libraryDependencies ++= Seq(
"com.github.pureconfig" %% "pureconfig" % V.pureconfig,
"org.scalameta" %% "munit" % V.munit % Test,
"org.scalameta" %% "munit-scalacheck" % V.munit % Test,
"org.typelevel" %% "munit-cats-effect-3" % V.munitCE % Test,
"org.scalameta" %% "munit-scalacheck" % V.munitSC % Test,
"org.typelevel" %% "munit-cats-effect" % V.munitCE % Test,
"org.typelevel" %% "cats-effect-testkit" % V.catsEffect % Test
)
)
Expand Down Expand Up @@ -198,10 +201,10 @@ object ProjectPlugin extends AutoPlugin {

lazy val docsSettings: Seq[Def.Setting[_]] = Seq(
libraryDependencies ++= Seq(
"org.scalameta" %% "munit-scalacheck" % V.munit,
"org.typelevel" %% "munit-cats-effect-3" % V.munitCE,
"io.dropwizard.metrics" % "metrics-jmx" % V.dropwizard,
"org.tpolecat" %% "natchez-jaeger" % V.natchez
"org.scalameta" %% "munit-scalacheck" % V.munitSC,
"org.typelevel" %% "munit-cats-effect" % V.munitCE,
"io.dropwizard.metrics" % "metrics-jmx" % V.dropwizard,
"org.tpolecat" %% "natchez-jaeger" % V.natchez
),
scalacOptions ~= (_ filterNot Set(
"-Xfatal-warnings",
Expand All @@ -217,7 +220,7 @@ object ProjectPlugin extends AutoPlugin {
scalacOptions -= "-Xfatal-warnings",
libraryDependencies ++= Seq(
"io.grpc" % "grpc-core" % V.grpc,
"org.scalameta" %% "munit-scalacheck" % V.munit,
"org.scalameta" %% "munit-scalacheck" % V.munitSC,
"org.typelevel" %% "cats-effect" % V.catsEffect
)
)
Expand All @@ -232,8 +235,8 @@ object ProjectPlugin extends AutoPlugin {
"com.47deg" %% "scalacheck-toolbox-datetime" % V.scalacheckToolbox % Test,
"org.scala-lang.modules" %% "scala-collection-compat" % V.scalaCollectionCompat % Test,
"org.scalameta" %% "munit" % V.munit % Test,
"org.scalameta" %% "munit-scalacheck" % V.munit % Test,
"org.typelevel" %% "munit-cats-effect-3" % V.munitCE % Test,
"org.scalameta" %% "munit-scalacheck" % V.munitSC % Test,
"org.typelevel" %% "munit-cats-effect" % V.munitCE % Test,
"org.typelevel" %% "cats-effect-testkit" % V.catsEffect % Test,
"ch.qos.logback" % "logback-classic" % V.logback % Test,
"com.github.cb372" %% "cats-retry" % V.catsRetry % Test
Expand Down Expand Up @@ -310,7 +313,7 @@ object ProjectPlugin extends AutoPlugin {
missinglinkIgnoreSourcePackages += IgnoredPackage("io.netty.handler.ssl")
)

import autoImport._
import autoImport.*

override def projectSettings: Seq[Def.Setting[_]] =
Seq(
Expand Down
10 changes: 5 additions & 5 deletions project/plugins.sbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ ThisBuild / libraryDependencySchemes ++= Seq(
resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots"
addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.0")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.0")
addSbtPlugin("com.47deg" % "sbt-microsites" % "1.4.4")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.4")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
addSbtPlugin("com.alejandrohdezma" % "sbt-github" % "0.11.13")
addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % "0.11.13")
addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % "0.11.13")
addSbtPlugin("com.alejandrohdezma" % "sbt-github" % "0.12.0")
addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % "0.12.0")
addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % "0.12.0")
addSbtPlugin("com.alejandrohdezma" % "sbt-remove-test-from-pom" % "0.1.0")
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.2")
addSbtPlugin("ch.epfl.scala" % "sbt-missinglink" % "0.3.6")
addSbtPlugin("io.higherkindness" % "sbt-mu-srcgen" % "0.32.0")
addSbtPlugin("io.higherkindness" % "sbt-mu-srcgen" % "0.32.1")

0 comments on commit abd0a94

Please sign in to comment.