From 50cbf41dee6bf8af1001531e443122e6468d17c8 Mon Sep 17 00:00:00 2001
From: James Pamplona <pamplonajames@gmail.com>
Date: Sun, 25 May 2025 17:41:29 -0700
Subject: [PATCH] Fix Swift 6 concurrency errors.

- Make package compatible with Swift 6
---
 Package.swift                           |  2 +-
 Package@swift-5.2.swift                 | 23 ++++++++++++++
 Sources/SwiftCheck/Random.swift         |  9 ++++--
 Tests/SwiftCheckTests/ComplexSpec.swift | 16 +++++-----
 Tests/SwiftCheckTests/SimpleSpec.swift  | 40 ++++++++++++-------------
 5 files changed, 58 insertions(+), 32 deletions(-)
 create mode 100644 Package@swift-5.2.swift

diff --git a/Package.swift b/Package.swift
index f81b361..980e833 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.2
+// swift-tools-version:6.0
 
 import PackageDescription
 
diff --git a/Package@swift-5.2.swift b/Package@swift-5.2.swift
new file mode 100644
index 0000000..f81b361
--- /dev/null
+++ b/Package@swift-5.2.swift
@@ -0,0 +1,23 @@
+// swift-tools-version:5.2
+
+import PackageDescription
+
+let package = Package(
+	name: "SwiftCheck",
+	products: [
+		.library(
+			name: "SwiftCheck",
+			targets: ["SwiftCheck"]),
+	],
+	dependencies: [
+		.package(url: "https://github.com/llvm-swift/FileCheck.git", from: "0.1.0")
+	],
+	targets: [
+		.target(
+			name: "SwiftCheck"),
+		.testTarget(
+			name: "SwiftCheckTests",
+			dependencies: ["SwiftCheck", "FileCheck"]),
+	]
+)
+
diff --git a/Sources/SwiftCheck/Random.swift b/Sources/SwiftCheck/Random.swift
index c804261..5363077 100644
--- a/Sources/SwiftCheck/Random.swift
+++ b/Sources/SwiftCheck/Random.swift
@@ -100,12 +100,15 @@ extension StdGen : Equatable, CustomStringConvertible {
 	}
 }
 
-private var theStdGen : StdGen = mkStdRNG(0)
+private actor TheStdGen {
+    static var shared : StdGen = mkStdRNG(0)
+
+}
 
 /// A library-provided standard random number generator.
 public func newStdGen() -> StdGen {
-	let (left, right) = theStdGen.split
-	theStdGen = left
+    let (left, right) = TheStdGen.shared.split
+    TheStdGen.shared = left
 	return right
 }
 
diff --git a/Tests/SwiftCheckTests/ComplexSpec.swift b/Tests/SwiftCheckTests/ComplexSpec.swift
index 6646210..2a132eb 100644
--- a/Tests/SwiftCheckTests/ComplexSpec.swift
+++ b/Tests/SwiftCheckTests/ComplexSpec.swift
@@ -12,16 +12,16 @@ import XCTest
 import FileCheck
 #endif
 
-let upper : Gen<Character> = Gen<Character>.fromElements(in: "A"..."Z")
-let lower : Gen<Character> = Gen<Character>.fromElements(in: "a"..."z")
-let numeric : Gen<Character> = Gen<Character>.fromElements(in: "0"..."9")
-let special : Gen<Character> = Gen<Character>.fromElements(of: ["!", "#", "$", "%", "&", "'", "*", "+", "-", "/", "=", "?", "^", "_", "`", "{", "|", "}", "~", "."])
-let hexDigits = Gen<Character>.one(of: [
-	Gen<Character>.fromElements(in: "A"..."F"),
-	numeric,
-])
 
 class ComplexSpec : XCTestCase {
+    let upper : Gen<Character> = Gen<Character>.fromElements(in: "A"..."Z")
+    let lower : Gen<Character> = Gen<Character>.fromElements(in: "a"..."z")
+    let numeric : Gen<Character> = Gen<Character>.fromElements(in: "0"..."9")
+    let special : Gen<Character> = Gen<Character>.fromElements(of: ["!", "#", "$", "%", "&", "'", "*", "+", "-", "/", "=", "?", "^", "_", "`", "{", "|", "}", "~", "."])
+    lazy var hexDigits = Gen<Character>.one(of: [
+        Gen<Character>.fromElements(in: "A"..."F"),
+        numeric,
+    ])
 	func testEmailAddressProperties() {
 		XCTAssert(fileCheckOutput(withPrefixes: ["CHECKEMAIL"]) {
 			let localEmail = Gen<Character>.one(of: [
diff --git a/Tests/SwiftCheckTests/SimpleSpec.swift b/Tests/SwiftCheckTests/SimpleSpec.swift
index f9b0f29..5c475bb 100644
--- a/Tests/SwiftCheckTests/SimpleSpec.swift
+++ b/Tests/SwiftCheckTests/SimpleSpec.swift
@@ -120,28 +120,28 @@ extension ArbitraryLargeFoo : Arbitrary {
 	}
 }
 
-let composedArbitraryLargeFoo = Gen<ArbitraryLargeFoo>.compose { c in
-	let evenInt16 = Int16.arbitrary.suchThat { $0 % 2 == 0 }
-	return ArbitraryLargeFoo(
-		a: c.generate(),
-		b: c.generate(using: evenInt16),
-		c: c.generate(),
-		d: c.generate(),
-		e: c.generate(),
-		f: c.generate(),
-		g: c.generate(),
-		h: c.generate(),
-		i: c.generate(),
-		j: c.generate(),
-		k: c.generate(),
-		l: (c.generate(), c.generate()),
-		m: (c.generate(), c.generate(), c.generate()),
-		n: (c.generate(), c.generate(), c.generate(), c.generate())
-	)
-}
-
 class SimpleSpec : XCTestCase {
 	func testAll() {
+        let composedArbitraryLargeFoo = Gen<ArbitraryLargeFoo>.compose { c in
+            let evenInt16 = Int16.arbitrary.suchThat { $0 % 2 == 0 }
+            return ArbitraryLargeFoo(
+                a: c.generate(),
+                b: c.generate(using: evenInt16),
+                c: c.generate(),
+                d: c.generate(),
+                e: c.generate(),
+                f: c.generate(),
+                g: c.generate(),
+                h: c.generate(),
+                i: c.generate(),
+                j: c.generate(),
+                k: c.generate(),
+                l: (c.generate(), c.generate()),
+                m: (c.generate(), c.generate(), c.generate()),
+                n: (c.generate(), c.generate(), c.generate(), c.generate())
+            )
+        }
+        
 		XCTAssert(fileCheckOutput {
 			// CHECK: *** Passed 100 tests
 			// CHECK-NEXT: .