From eddc455071b596dfa3d51358ea3f8fc49c6a7374 Mon Sep 17 00:00:00 2001 From: dpevunov-cp Date: Thu, 18 Dec 2025 18:53:52 +0400 Subject: [PATCH 1/5] bumped cats-effect and prometheus lib --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index b2fd87d..2c8710f 100644 --- a/build.sbt +++ b/build.sbt @@ -35,9 +35,9 @@ lazy val site = project.in(file("site")) .dependsOn(core) -val prometheusV = "1.2.1" +val prometheusV = "1.4.3" val catsV = "2.9.0" -val catsEffectV = "3.4.8" +val catsEffectV = "3.6.3" val shapelessV = "2.3.9" val munitCatsEffectV = "1.0.7" From eb0ea623c5a4aff46f8e1380f13fb0db4607b253 Mon Sep 17 00:00:00 2001 From: dpevunov-cp Date: Thu, 18 Dec 2025 18:56:08 +0400 Subject: [PATCH 2/5] bumped cats-effect and prometheus lib and scala --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 2c8710f..1e79279 100644 --- a/build.sbt +++ b/build.sbt @@ -15,7 +15,7 @@ ThisBuild / tlSonatypeUseLegacyHost := true ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17")) ThisBuild / githubWorkflowSbtCommand := "./sbt" -val Scala213 = "2.13.12" +val Scala213 = "2.13.18" ThisBuild / crossScalaVersions := Seq("2.12.18", "3.3.1", Scala213) ThisBuild / scalaVersion := Scala213 From d17df1642ae25307b72f7ea3dccc6d455779e1db Mon Sep 17 00:00:00 2001 From: dpevunov-cp Date: Thu, 18 Dec 2025 19:19:25 +0400 Subject: [PATCH 3/5] fixes to make it compile with new libs --- build.sbt | 11 ++++++++--- docs/docs/05-Counter.md | 8 ++++++-- project/build.properties | 2 +- project/plugins.sbt | 4 ++-- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/build.sbt b/build.sbt index 1e79279..bc61c1e 100644 --- a/build.sbt +++ b/build.sbt @@ -10,9 +10,7 @@ ThisBuild / developers := List( tlGitHubDev("christopherdavenport", "Christopher Davenport") ) -// true by default, set to false to publish to s01.oss.sonatype.org -ThisBuild / tlSonatypeUseLegacyHost := true -ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17")) +ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("21")) ThisBuild / githubWorkflowSbtCommand := "./sbt" val Scala213 = "2.13.18" @@ -33,6 +31,13 @@ lazy val core = project.in(file("core")) lazy val site = project.in(file("site")) .enablePlugins(TypelevelSitePlugin) .dependsOn(core) + .settings( + laikaTheme := tlSiteHelium.value.site + .topNavigationBar( + homeLink = laika.helium.config.IconLink.internal(laika.ast.Path.Root / "index.md", laika.helium.config.HeliumIcon.home) + ) + .build + ) val prometheusV = "1.4.3" diff --git a/docs/docs/05-Counter.md b/docs/docs/05-Counter.md index d5da40c..c8955af 100644 --- a/docs/docs/05-Counter.md +++ b/docs/docs/05-Counter.md @@ -71,7 +71,9 @@ labelledExample.unsafeRunSync() An Example of a Counter backed algebra. ```scala mdoc -sealed trait Foo; case object Bar extends Foo; case object Baz extends Foo; +sealed trait Foo +case object Bar extends Foo +case object Baz extends Foo def fooLabel(f: Foo) = { f match { @@ -83,7 +85,9 @@ def fooLabel(f: Foo) = { trait FooAlg[F[_]]{ def bar: F[Unit] def baz: F[Unit] -}; object FooAlg { +} + +object FooAlg { def impl[F[_]](c: Counter.UnlabelledCounter[F, Foo]) = new FooAlg[F]{ def bar: F[Unit] = c.label(Bar).inc def baz: F[Unit] = c.label(Baz).inc diff --git a/project/build.properties b/project/build.properties index 94ffde7..3adc1d8 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version= 1.10.11 +sbt.version= 1.11.7 diff --git a/project/plugins.sbt b/project/plugins.sbt index 1712cf2..0837e27 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,3 @@ // addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.20") -addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.6.7") -addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.6.7") +addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.8.4") +addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.8.4") From ed46bc835949bc9fa056f0e971bafc34cc1fa430 Mon Sep 17 00:00:00 2001 From: dpevunov-cp Date: Thu, 18 Dec 2025 19:21:44 +0400 Subject: [PATCH 4/5] Revert "fixes to make it compile with new libs" This reverts commit d17df1642ae25307b72f7ea3dccc6d455779e1db. --- build.sbt | 11 +++-------- docs/docs/05-Counter.md | 8 ++------ project/build.properties | 2 +- project/plugins.sbt | 4 ++-- 4 files changed, 8 insertions(+), 17 deletions(-) diff --git a/build.sbt b/build.sbt index bc61c1e..1e79279 100644 --- a/build.sbt +++ b/build.sbt @@ -10,7 +10,9 @@ ThisBuild / developers := List( tlGitHubDev("christopherdavenport", "Christopher Davenport") ) -ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("21")) +// true by default, set to false to publish to s01.oss.sonatype.org +ThisBuild / tlSonatypeUseLegacyHost := true +ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17")) ThisBuild / githubWorkflowSbtCommand := "./sbt" val Scala213 = "2.13.18" @@ -31,13 +33,6 @@ lazy val core = project.in(file("core")) lazy val site = project.in(file("site")) .enablePlugins(TypelevelSitePlugin) .dependsOn(core) - .settings( - laikaTheme := tlSiteHelium.value.site - .topNavigationBar( - homeLink = laika.helium.config.IconLink.internal(laika.ast.Path.Root / "index.md", laika.helium.config.HeliumIcon.home) - ) - .build - ) val prometheusV = "1.4.3" diff --git a/docs/docs/05-Counter.md b/docs/docs/05-Counter.md index c8955af..d5da40c 100644 --- a/docs/docs/05-Counter.md +++ b/docs/docs/05-Counter.md @@ -71,9 +71,7 @@ labelledExample.unsafeRunSync() An Example of a Counter backed algebra. ```scala mdoc -sealed trait Foo -case object Bar extends Foo -case object Baz extends Foo +sealed trait Foo; case object Bar extends Foo; case object Baz extends Foo; def fooLabel(f: Foo) = { f match { @@ -85,9 +83,7 @@ def fooLabel(f: Foo) = { trait FooAlg[F[_]]{ def bar: F[Unit] def baz: F[Unit] -} - -object FooAlg { +}; object FooAlg { def impl[F[_]](c: Counter.UnlabelledCounter[F, Foo]) = new FooAlg[F]{ def bar: F[Unit] = c.label(Bar).inc def baz: F[Unit] = c.label(Baz).inc diff --git a/project/build.properties b/project/build.properties index 3adc1d8..94ffde7 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version= 1.11.7 +sbt.version= 1.10.11 diff --git a/project/plugins.sbt b/project/plugins.sbt index 0837e27..1712cf2 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,3 @@ // addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.20") -addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.8.4") -addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.8.4") +addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.6.7") +addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.6.7") From f8cbc1a67fe10809442847067ab93e21348909c3 Mon Sep 17 00:00:00 2001 From: dpevunov-cp Date: Thu, 18 Dec 2025 19:24:48 +0400 Subject: [PATCH 5/5] minimum changes to make it work --- build.sbt | 8 +++++++- docs/docs/05-Counter.md | 8 ++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 1e79279..e3dd178 100644 --- a/build.sbt +++ b/build.sbt @@ -33,7 +33,13 @@ lazy val core = project.in(file("core")) lazy val site = project.in(file("site")) .enablePlugins(TypelevelSitePlugin) .dependsOn(core) - + .settings( + laikaTheme := tlSiteHelium.value.site + .topNavigationBar( + homeLink = laika.helium.config.IconLink.internal(laika.ast.Path.Root / "index.md", laika.helium.config.HeliumIcon.home) + ) + .build + ) val prometheusV = "1.4.3" val catsV = "2.9.0" diff --git a/docs/docs/05-Counter.md b/docs/docs/05-Counter.md index d5da40c..c8955af 100644 --- a/docs/docs/05-Counter.md +++ b/docs/docs/05-Counter.md @@ -71,7 +71,9 @@ labelledExample.unsafeRunSync() An Example of a Counter backed algebra. ```scala mdoc -sealed trait Foo; case object Bar extends Foo; case object Baz extends Foo; +sealed trait Foo +case object Bar extends Foo +case object Baz extends Foo def fooLabel(f: Foo) = { f match { @@ -83,7 +85,9 @@ def fooLabel(f: Foo) = { trait FooAlg[F[_]]{ def bar: F[Unit] def baz: F[Unit] -}; object FooAlg { +} + +object FooAlg { def impl[F[_]](c: Counter.UnlabelledCounter[F, Foo]) = new FooAlg[F]{ def bar: F[Unit] = c.label(Bar).inc def baz: F[Unit] = c.label(Baz).inc