From bc5000e48278b99c5f3b90118111cf20332817b1 Mon Sep 17 00:00:00 2001 From: Pat Garrity Date: Sun, 27 Jul 2025 21:42:56 -0500 Subject: [PATCH] (patch) version updates and some minor fixes --- build.sbt | 4 ++-- modules/core/src/main/scala/gs/datagen/v0/gen.scala | 4 ++-- .../main/scala/gs/datagen/v0/generators/GenOneOf.scala | 2 +- .../main/scala/gs/datagen/v0/generators/GenOneOfGen.scala | 8 ++++---- .../core/src/test/scala/gs/datagen/v0/DatagenTests.scala | 4 ++-- project/build.properties | 2 +- project/plugins.sbt | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build.sbt b/build.sbt index a0ca72d..344131e 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,4 @@ -val scala3: String = "3.6.4" +val scala3: String = "3.7.1" ThisBuild / scalaVersion := scala3 ThisBuild / versionScheme := Some("semver-spec") @@ -39,6 +39,6 @@ lazy val core = project .settings(name := s"${gsProjectName.value}-core-v${semVerMajor.value}") .settings( libraryDependencies ++= Seq( - "gs" %% "gs-uuid-v0" % "0.4.0" + "gs" %% "gs-uuid-v0" % "0.4.1" ) ) diff --git a/modules/core/src/main/scala/gs/datagen/v0/gen.scala b/modules/core/src/main/scala/gs/datagen/v0/gen.scala index 677be27..f145427 100644 --- a/modules/core/src/main/scala/gs/datagen/v0/gen.scala +++ b/modules/core/src/main/scala/gs/datagen/v0/gen.scala @@ -192,7 +192,7 @@ object Gen: * @param cs * The choices. */ - def generatedChoices[A: ClassTag](cs: Gen[A]*): Gen[A] = + def generatedChoices[A](cs: Gen[A]*): Gen[A] = GenOneOfGen.list(cs.toList) /** Generator which randomly selects from a fixed list of choices. @@ -210,7 +210,7 @@ object Gen: * @param choices * The choices. */ - def generatedList[A: ClassTag]( + def generatedList[A]( choices: List[Gen[A]] ): Gen[A] = GenOneOfGen.list(choices) diff --git a/modules/core/src/main/scala/gs/datagen/v0/generators/GenOneOf.scala b/modules/core/src/main/scala/gs/datagen/v0/generators/GenOneOf.scala index d548d81..5bf4524 100644 --- a/modules/core/src/main/scala/gs/datagen/v0/generators/GenOneOf.scala +++ b/modules/core/src/main/scala/gs/datagen/v0/generators/GenOneOf.scala @@ -3,7 +3,7 @@ package gs.datagen.v0.generators import gs.datagen.v0.Gen import scala.reflect.ClassTag -final class GenOneOf[A: ClassTag] private ( +final class GenOneOf[A] private ( val choices: Array[A] ) extends Gen[A]: diff --git a/modules/core/src/main/scala/gs/datagen/v0/generators/GenOneOfGen.scala b/modules/core/src/main/scala/gs/datagen/v0/generators/GenOneOfGen.scala index 0de71ff..14b9fec 100644 --- a/modules/core/src/main/scala/gs/datagen/v0/generators/GenOneOfGen.scala +++ b/modules/core/src/main/scala/gs/datagen/v0/generators/GenOneOfGen.scala @@ -3,7 +3,7 @@ package gs.datagen.v0.generators import gs.datagen.v0.Gen import scala.reflect.ClassTag -final class GenOneOfGen[A: ClassTag] private ( +final class GenOneOfGen[A] private ( val choices: Array[Gen[A]] ) extends Gen[A]: @@ -12,7 +12,7 @@ final class GenOneOfGen[A: ClassTag] private ( object GenOneOfGen: - def choices[A: ClassTag]( + def choices[A]( cs: Gen[A]* ): GenOneOfGen[A] = if cs.isEmpty then @@ -21,7 +21,7 @@ object GenOneOfGen: ) else new GenOneOfGen[A](cs.toArray) - def list[A: ClassTag]( + def list[A]( choices: List[Gen[A]] ): GenOneOfGen[A] = if choices.isEmpty then @@ -30,7 +30,7 @@ object GenOneOfGen: ) else new GenOneOfGen[A](choices.toArray) - def set[A: ClassTag]( + def set[A]( choices: Set[Gen[A]] ): GenOneOfGen[A] = if choices.isEmpty then diff --git a/modules/core/src/test/scala/gs/datagen/v0/DatagenTests.scala b/modules/core/src/test/scala/gs/datagen/v0/DatagenTests.scala index 99ba874..998bd1a 100644 --- a/modules/core/src/test/scala/gs/datagen/v0/DatagenTests.scala +++ b/modules/core/src/test/scala/gs/datagen/v0/DatagenTests.scala @@ -14,10 +14,10 @@ class DatagenTests extends munit.FunSuite: val data = "foo" val p1: NoInput[String] = - Datagen.pure(data).flatMap(x => Datagen.pure(data)) + Datagen.pure(data).flatMap(_ => Datagen.pure(data)) val p2: Datagen[String, Any] = - Datagen.pure(data).map(x => data) + Datagen.pure(data).map(_ => data) assert(p1.generate(()) == data) assert(p2.generate(()) == data) 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")