From 32a69d734b5689455cc55feca1f888f5bb977d5f Mon Sep 17 00:00:00 2001
From: Pat Garrity <pfm@garrity.co>
Date: Sat, 3 Aug 2024 16:44:12 +0000
Subject: [PATCH] (minor) Maintenance and using GS UUID (#5)

Reviewed-on: https://git.garrity.co/garrity-software/gs-datagen/pulls/5
---
 build.sbt                                             |  2 +-
 modules/core/src/main/scala/gs/datagen/v0/gen.scala   | 11 +++--------
 .../main/scala/gs/datagen/v0/generators/GenUUID.scala |  5 +++--
 project/build.properties                              |  2 +-
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/build.sbt b/build.sbt
index c26ed57..7d327b9 100644
--- a/build.sbt
+++ b/build.sbt
@@ -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.2.4"
+      "gs" %% "gs-uuid-v0" % "0.3.0"
     )
   )
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 84e3f07..e097342 100644
--- a/modules/core/src/main/scala/gs/datagen/v0/gen.scala
+++ b/modules/core/src/main/scala/gs/datagen/v0/gen.scala
@@ -16,11 +16,11 @@ import gs.datagen.v0.generators.GenString
 import gs.datagen.v0.generators.GenUUID
 import gs.datagen.v0.generators.MinMax
 import gs.datagen.v0.generators.Size
+import gs.uuid.v0.UUID
 import java.time.Clock
 import java.time.Instant
 import java.time.LocalDate
 import java.util.Random
-import java.util.UUID
 import java.util.concurrent.atomic.AtomicLong
 import java.util.concurrent.atomic.AtomicReference
 import scala.concurrent.duration.DAYS
@@ -561,7 +561,7 @@ object Gen:
 
   end date
 
-  /** Geneators for `java.util.UUID` values.
+  /** Geneators for GS `UUID` values.
     */
   object uuid:
 
@@ -571,12 +571,7 @@ object Gen:
 
     /** Generator for UUIDs represented as strings.
       */
-    def string(): Gen[String] = uuid.random().map(id => id.toString)
-
-    /** Generator for UUIDs represented as strings, without dashes.
-      */
-    def noDashes(): Gen[String] =
-      uuid.random().map(id => id.toString.replace("-", ""))
+    def string(): Gen[String] = uuid.random().map(id => id.str())
 
   end uuid
 
diff --git a/modules/core/src/main/scala/gs/datagen/v0/generators/GenUUID.scala b/modules/core/src/main/scala/gs/datagen/v0/generators/GenUUID.scala
index fcc5000..6377224 100644
--- a/modules/core/src/main/scala/gs/datagen/v0/generators/GenUUID.scala
+++ b/modules/core/src/main/scala/gs/datagen/v0/generators/GenUUID.scala
@@ -1,9 +1,10 @@
 package gs.datagen.v0.generators
 
 import gs.datagen.v0.Gen
-import java.util.UUID
+import gs.uuid.v0.UUID
 
 final class GenUUID extends Gen[UUID]:
+  given UUID.Generator = UUID.Generator.version4()
 
   override def generate(input: Any): UUID =
-    UUID.randomUUID()
+    UUID.generate()
diff --git a/project/build.properties b/project/build.properties
index 081fdbb..ee4c672 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.0
+sbt.version=1.10.1