From 50944ff6f0bb9faa66f4fdb08cbb9218917ff51e Mon Sep 17 00:00:00 2001 From: Pat Garrity Date: Sun, 27 Jul 2025 21:56:07 -0500 Subject: [PATCH] Version updates and minor fixes. --- build.sbt | 6 +++--- project/build.properties | 2 +- project/plugins.sbt | 2 +- src/main/scala/gs/config/v0/AuditedConfiguration.scala | 2 +- src/main/scala/gs/config/v0/ConfigKey.scala | 6 +++--- src/main/scala/gs/config/v0/audit/ConfigManifest.scala | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build.sbt b/build.sbt index fcee4e4..292e636 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,4 @@ -val scala3: String = "3.6.4" +val scala3: String = "3.7.1" externalResolvers := Seq( "Garrity Software Mirror" at "https://maven.garrity.co/releases", @@ -19,7 +19,7 @@ lazy val sharedSettings = Seq( lazy val testSettings = Seq( libraryDependencies ++= Seq( - "org.scalameta" %% "munit" % "1.1.0" % Test + "org.scalameta" %% "munit" % "1.1.1" % Test ) ) @@ -30,6 +30,6 @@ lazy val `gs-config` = project .settings(name := s"${gsProjectName.value}-v${semVerMajor.value}") .settings( libraryDependencies ++= Seq( - "org.typelevel" %% "cats-effect" % "3.5.7" + "org.typelevel" %% "cats-effect" % "3.6.3" ) ) diff --git a/project/build.properties b/project/build.properties index cc68b53..bbb0b60 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.11 +sbt.version=1.11.2 diff --git a/project/plugins.sbt b/project/plugins.sbt index cac78e0..83e5dc1 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -29,5 +29,5 @@ externalResolvers := Seq( ) addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.3.1") -addSbtPlugin("gs" % "sbt-garrity-software" % "0.5.0") +addSbtPlugin("gs" % "sbt-garrity-software" % "0.6.0") addSbtPlugin("gs" % "sbt-gs-semver" % "0.3.0") diff --git a/src/main/scala/gs/config/v0/AuditedConfiguration.scala b/src/main/scala/gs/config/v0/AuditedConfiguration.scala index e3f27ce..ddfd96d 100644 --- a/src/main/scala/gs/config/v0/AuditedConfiguration.scala +++ b/src/main/scala/gs/config/v0/AuditedConfiguration.scala @@ -41,7 +41,7 @@ final class AuditedConfiguration[F[_]: Sync]( audit(key, result._2, result._1, acc).as(result._2) } - private def find[A: Configurable]( + private def find[A]( key: ConfigKey[A] ): F[Acc] = sources.foldLeft(Acc.empty[F]) { diff --git a/src/main/scala/gs/config/v0/ConfigKey.scala b/src/main/scala/gs/config/v0/ConfigKey.scala index 6f04389..7fb9671 100644 --- a/src/main/scala/gs/config/v0/ConfigKey.scala +++ b/src/main/scala/gs/config/v0/ConfigKey.scala @@ -11,7 +11,7 @@ package gs.config.v0 * The type of data referenced by this key. This type must be * [[Configurable]]. */ -sealed trait ConfigKey[A: Configurable]: +sealed trait ConfigKey[A]: def name: ConfigName object ConfigKey: @@ -23,7 +23,7 @@ object ConfigKey: * @param name * The name of this configuration. */ - case class Required[A: Configurable]( + case class Required[A]( name: ConfigName ) extends ConfigKey[A] @@ -35,7 +35,7 @@ object ConfigKey: * @param defaultValue * The default value for this configuration. */ - case class WithDefaultValue[A: Configurable]( + case class WithDefaultValue[A]( name: ConfigName, defaultValue: () => A ) extends ConfigKey[A] diff --git a/src/main/scala/gs/config/v0/audit/ConfigManifest.scala b/src/main/scala/gs/config/v0/audit/ConfigManifest.scala index da04008..32f587c 100644 --- a/src/main/scala/gs/config/v0/audit/ConfigManifest.scala +++ b/src/main/scala/gs/config/v0/audit/ConfigManifest.scala @@ -51,7 +51,7 @@ object ConfigManifest: * @param manifest * The underlying manifest. */ - final class Standard[F[_]: Sync] private ( + final class Standard[F[_]] private ( private val manifest: Ref[F, Map[ConfigName, List[ConfigQueryResult]]] ) extends ConfigManifest[F]: