.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 ---
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v6.0.0
+    rev: v4.5.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace
@@ -12,6 +12,6 @@ repos:
       - id: trailing-whitespace
       - id: check-yaml
   - repo: https://git.garrity.co/garrity-software/gs-pre-commit-scala
-    rev: v1.0.2
+    rev: v1.0.1
     hooks:
       - id: scalafmt

.scalafmt.conf

@@ -1,5 +1,5 @@
 // See: https://github.com/scalameta/scalafmt/tags for the latest tags.
-version = 3.10.4
+version = 3.10.2
 runner.dialect = scala3
 maxColumn = 80
 

build.sbt

@@ -1,4 +1,4 @@
-val scala3: String = "3.8.3"
+val scala3: String = "3.7.4"
 
 ThisBuild / scalaVersion  := scala3
 ThisBuild / versionScheme := Some("semver-spec")
@@ -29,10 +29,10 @@ val Deps = new {
   }
 
   val Gs = new {
-    val Datagen: ModuleID = "gs" %% "gs-datagen-core-v0" % "0.4.1"
+    val Datagen: ModuleID = "gs" %% "gs-datagen-core-v0" % "0.3.3"
   }
 
-  val MUnit: ModuleID = "org.scalameta" %% "munit" % "1.2.1"
+  val MUnit: ModuleID = "org.scalameta" %% "munit" % "1.1.1"
 }
 
 lazy val testSettings = Seq(

project/build.properties

@@ -1 +1 @@
-sbt.version=1.12.11
+sbt.version=1.11.7

project/plugins.sbt

@@ -28,6 +28,6 @@ externalResolvers := Seq(
   "Garrity Software Releases" at "https://maven.garrity.co/gs"
 )
 
-addSbtPlugin("org.scoverage" % "sbt-scoverage"        % "2.4.4")
-addSbtPlugin("gs"            % "sbt-garrity-software" % "0.7.0")
+addSbtPlugin("org.scoverage" % "sbt-scoverage"        % "2.3.1")
+addSbtPlugin("gs"            % "sbt-garrity-software" % "0.6.0")
 addSbtPlugin("gs"            % "sbt-gs-semver"        % "0.3.0")

src/main/scala/gs/predicate/v0/api/Predicate.scala

@@ -23,14 +23,8 @@ end Predicate
 
 object Predicate:
 
-  /** @return
-    *   The predicate that evaluates to `true`.
-    */
   def alwaysTrue: Predicate = True
 
-  /** @return
-    *   The predicate that evaluates to `false`.
-    */
   def alwaysFalse: Predicate = False
 
   /** The result of evaluating a [[Predicate]] is a Boolean value where:

src/test/scala/gs/predicate/v0/json/JsonComparisonPredicateTests.scala

@@ -1,7 +1,7 @@
 package gs.predicate.v0.json
 
 import gs.datagen.v0.Gen
-import gs.datagen.v0.generators.Range
+import gs.datagen.v0.generators.Size
 import gs.predicate.v0.api.Predicate
 import gs.predicate.v0.json.query.JsonQuery
 import io.circe.Json
@@ -43,10 +43,10 @@ object JsonComparisonPredicateTests:
 
   object Data:
 
-    val keyGen: Gen[String] = Gen.string.alphaNumeric(Range.between(4, 16))
+    val keyGen: Gen[String] = Gen.string.alphaNumeric(Size.between(4, 16))
 
     val strValGen: Gen[Json] =
-      Gen.string.uppercaseAlpha(Range.fixed(8)).map(Json.fromString)
+      Gen.string.uppercaseAlpha(Size.fixed(8)).map(Json.fromString)
 
   end Data
 

src/test/scala/gs/predicate/v0/json/JsonComparisonTests.scala

@@ -1,7 +1,8 @@
 package gs.predicate.v0.json
 
 import gs.datagen.v0.Gen
-import gs.datagen.v0.generators.Range
+import gs.datagen.v0.generators.MinMax
+import gs.datagen.v0.generators.Size
 import io.circe.Json
 import java.time.LocalDate
 import munit.FunSuite
@@ -234,11 +235,11 @@ class JsonComparisonTests extends FunSuite:
 
 object JsonComparisonTests:
 
-  val keyGen: Gen[String]      = Gen.string.alphaNumeric(Range.between(8, 16))
-  val strGen: Gen[String]      = Gen.string.alphaNumeric(Range.between(8, 16))
-  val longStrGen: Gen[String]  = Gen.string.alphaNumeric(Range.fixed(32))
+  val keyGen: Gen[String]      = Gen.string.alphaNumeric(Size.between(8, 16))
+  val strGen: Gen[String]      = Gen.string.alphaNumeric(Size.between(8, 16))
+  val longStrGen: Gen[String]  = Gen.string.alphaNumeric(Size.fixed(32))
   val jsonStringGen: Gen[Json] = strGen.map(Json.fromString)
   val intGen: Gen[Int]         = Gen.integer.inRange(0, 100)
-  val dateGen: Gen[LocalDate]  = Gen.date.aroundToday(Range.between(1, 3))
+  val dateGen: Gen[LocalDate]  = Gen.date.aroundToday(MinMax(1, 3))
 
 end JsonComparisonTests

src/test/scala/gs/predicate/v0/string/StringComparisonTests.scala

@@ -1,7 +1,8 @@
 package gs.predicate.v0.string
 
 import gs.datagen.v0.Gen
-import gs.datagen.v0.generators.Range
+import gs.datagen.v0.generators.MinMax
+import gs.datagen.v0.generators.Size
 import java.time.LocalDate
 import munit.FunSuite
 
@@ -214,10 +215,10 @@ class StringComparisonTests extends FunSuite:
 
 object StringComparisonTests:
 
-  val keyGen: Gen[String]     = Gen.string.alphaNumeric(Range.between(8, 16))
-  val strGen: Gen[String]     = Gen.string.alphaNumeric(Range.between(8, 16))
-  val longStrGen: Gen[String] = Gen.string.alphaNumeric(Range.fixed(32))
+  val keyGen: Gen[String]     = Gen.string.alphaNumeric(Size.between(8, 16))
+  val strGen: Gen[String]     = Gen.string.alphaNumeric(Size.between(8, 16))
+  val longStrGen: Gen[String] = Gen.string.alphaNumeric(Size.fixed(32))
   val intGen: Gen[Int]        = Gen.integer.inRange(0, 100)
-  val dateGen: Gen[LocalDate] = Gen.date.aroundToday(Range.between(1, 3))
+  val dateGen: Gen[LocalDate] = Gen.date.aroundToday(MinMax(1, 3))
 
 end StringComparisonTests