Skip to content

Commit bf114de

Browse files
committed
fix: Compiled docs after recent breaking change
refactor: Make build better by running Scalafix and mdoc inside check
1 parent 981088a commit bf114de

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

.scalafix.conf

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,6 @@ RemoveUnused {
162162
}
163163

164164
OrganizeImports {
165-
expandRelative = true
165+
# Allign with IntelliJ IDEA so that they don't fight each other
166166
groupedImports = Merge
167-
# IntelliJ IDEA's order so that they don't fight each other
168-
groups = [
169-
"*"
170-
"re:(javax?|scala)\\."
171-
]
172167
}

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -518,6 +518,6 @@ lazy val sslConfig = project
518518

519519
addCommandAlias(
520520
"check",
521-
"; scalafmtSbtCheck; scalafmtCheckAll; missinglinkCheck; +test"
521+
"scalafmtSbtCheck; scalafmtCheckAll; compile:scalafix --check; test:scalafix --check; site/mdoc; +missinglinkCheck; +test"
522522
)
523-
addCommandAlias("fix", "; compile:scalafix; test:scalafix; scalafmtSbt; scalafmtAll")
523+
addCommandAlias("fix", "compile:scalafix; test:scalafix; scalafmtSbt; scalafmtAll")

site/docs/subprojects/micrometer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ for {
3535
clock = Clock.create[Task]
3636
jmxMeterRegistry <- MicrometerJmxModule.make[Task](MicrometerJmxConfig("com.avast"))
3737
_ <- Resource.liftF(MicrometerJvmModule.make[Task](jmxMeterRegistry))
38-
serverMetricsModule <- Resource.liftF(MicrometerHttp4sServerMetricsModule.make[Task](jmxMeterRegistry, clock))
38+
serverMetricsModule <- Resource.liftF(MicrometerHttp4sServerMetricsModule.make[Task](jmxMeterRegistry, executorModule.blocker, clock))
3939
routes = Http4sRouting.make {
4040
serverMetricsModule.serverMetrics {
4141
HttpRoutes.of[Task] {

0 commit comments

Comments
 (0)