From 781a838eb8333b829c1c468038a215e9b979c93f Mon Sep 17 00:00:00 2001 From: Chakorn Kungsanarux Date: Tue, 10 Nov 2026 12:27:32 -0700 Subject: [PATCH 1/5] chore: remove vestigial placeholder swift files and gitkeep --- Sources/OSDCore/.gitkeep | 0 Sources/OSDCore/Placeholder.swift | 0 Sources/OSDQuery/.gitkeep | 0 Sources/OSDQuery/Placeholder.swift | 0 Sources/OSDStorage/.gitkeep | 0 Sources/OSDStorage/Placeholder.swift | 0 Sources/OpenSwiftData/.gitkeep | 0 Sources/OpenSwiftDataMacros/.gitkeep | 0 Tests/OSDCoreTests/.gitkeep | 0 Tests/OSDCoreTests/Placeholder.swift | 0 Tests/OSDStorageTests/.gitkeep | 0 Tests/OSDStorageTests/Placeholder.swift | 0 Tests/OpenSwiftDataMacrosTests/.gitkeep | 0 Tests/OpenSwiftDataMacrosTests/Placeholder.swift | 0 Tests/OpenSwiftDataTests/.gitkeep | 0 Tests/OpenSwiftDataTests/Placeholder.swift | 0 16 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Sources/OSDCore/.gitkeep delete mode 100644 Sources/OSDCore/Placeholder.swift delete mode 100644 Sources/OSDQuery/.gitkeep delete mode 100644 Sources/OSDQuery/Placeholder.swift delete mode 100644 Sources/OSDStorage/.gitkeep delete mode 100644 Sources/OSDStorage/Placeholder.swift delete mode 100644 Sources/OpenSwiftData/.gitkeep delete mode 100644 Sources/OpenSwiftDataMacros/.gitkeep delete mode 100644 Tests/OSDCoreTests/.gitkeep delete mode 100644 Tests/OSDCoreTests/Placeholder.swift delete mode 100644 Tests/OSDStorageTests/.gitkeep delete mode 100644 Tests/OSDStorageTests/Placeholder.swift delete mode 100644 Tests/OpenSwiftDataMacrosTests/.gitkeep delete mode 100644 Tests/OpenSwiftDataMacrosTests/Placeholder.swift delete mode 100644 Tests/OpenSwiftDataTests/.gitkeep delete mode 100644 Tests/OpenSwiftDataTests/Placeholder.swift diff --git a/Sources/OSDCore/.gitkeep b/Sources/OSDCore/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/Sources/OSDCore/Placeholder.swift b/Sources/OSDCore/Placeholder.swift deleted file mode 100644 index e69de29b..00000000 diff --git a/Sources/OSDQuery/.gitkeep b/Sources/OSDQuery/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/Sources/OSDQuery/Placeholder.swift b/Sources/OSDQuery/Placeholder.swift deleted file mode 100644 index e69de29b..00000000 diff --git a/Sources/OSDStorage/.gitkeep b/Sources/OSDStorage/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/Sources/OSDStorage/Placeholder.swift b/Sources/OSDStorage/Placeholder.swift deleted file mode 100644 index e69de29b..00000000 diff --git a/Sources/OpenSwiftData/.gitkeep b/Sources/OpenSwiftData/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/Sources/OpenSwiftDataMacros/.gitkeep b/Sources/OpenSwiftDataMacros/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/Tests/OSDCoreTests/.gitkeep b/Tests/OSDCoreTests/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/Tests/OSDCoreTests/Placeholder.swift b/Tests/OSDCoreTests/Placeholder.swift deleted file mode 100644 index e69de29b..00000000 diff --git a/Tests/OSDStorageTests/.gitkeep b/Tests/OSDStorageTests/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/Tests/OSDStorageTests/Placeholder.swift b/Tests/OSDStorageTests/Placeholder.swift deleted file mode 100644 index e69de29b..00000000 diff --git a/Tests/OpenSwiftDataMacrosTests/.gitkeep b/Tests/OpenSwiftDataMacrosTests/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/Tests/OpenSwiftDataMacrosTests/Placeholder.swift b/Tests/OpenSwiftDataMacrosTests/Placeholder.swift deleted file mode 100644 index e69de29b..00000000 diff --git a/Tests/OpenSwiftDataTests/.gitkeep b/Tests/OpenSwiftDataTests/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/Tests/OpenSwiftDataTests/Placeholder.swift b/Tests/OpenSwiftDataTests/Placeholder.swift deleted file mode 100644 index e69de29b..00000000 From acd3de0f880552d0984c3e5bdf9275e2187936db Mon Sep 17 00:00:00 2001 From: Chakorn Kungsanarux Date: Tue, 10 Nov 2026 12:30:30 -0700 Subject: [PATCH 2/5] chore: remove unused osdconformance goldens infrastructure --- Package.swift | 12 +----------- Tests/OSDConformance/Golden.swift | 19 ------------------- Tests/OSDConformance/Goldens/.gitkeep | 0 .../GoldenDependentConformanceTests.swift | 15 --------------- Tests/OpenSwiftDataTests/GoldenTests.swift | 11 ----------- .../OpenSwiftDataTests/RuntimeAPITests.swift | 1 - 6 files changed, 1 insertion(+), 57 deletions(-) delete mode 100644 Tests/OSDConformance/Golden.swift delete mode 100644 Tests/OSDConformance/Goldens/.gitkeep delete mode 100644 Tests/OSDConformanceTests/GoldenDependentConformanceTests.swift delete mode 100644 Tests/OpenSwiftDataTests/GoldenTests.swift diff --git a/Package.swift b/Package.swift index 5c5cc460..cd07cb62 100644 --- a/Package.swift +++ b/Package.swift @@ -36,12 +36,6 @@ var targets: [Target] = [ dependencies: ["OpenSwiftData"], path: "Tests/OSDTestSupport" ), - .target( - name: "OSDConformance", - dependencies: [], - path: "Tests/OSDConformance", - resources: [.process("Goldens")] - ), .macro( name: "OpenSwiftDataMacros", dependencies: [ @@ -69,7 +63,7 @@ var targets: [Target] = [ .testTarget( name: "OpenSwiftDataTests", dependencies: [ - "OpenSwiftData", "OpenSwiftDataSQLite", "OSDTestSupport", "OSDConformance", "OSDCore", + "OpenSwiftData", "OpenSwiftDataSQLite", "OSDTestSupport", "OSDCore", .product(name: "GRDB", package: "GRDB.swift"), ], path: "Tests/OpenSwiftDataTests" @@ -83,10 +77,6 @@ var targets: [Target] = [ dependencies: ["OSDQuery", "OpenSwiftData", "OpenSwiftDataSQLite"], path: "Tests/OSDQueryTests" ), - .testTarget( - name: "OSDConformanceTests", - dependencies: ["OSDConformance"] - ), .testTarget( name: "OpenSwiftDataMacrosTests", dependencies: [ diff --git a/Tests/OSDConformance/Golden.swift b/Tests/OSDConformance/Golden.swift deleted file mode 100644 index 61f12601..00000000 --- a/Tests/OSDConformance/Golden.swift +++ /dev/null @@ -1,19 +0,0 @@ -import Foundation -import XCTest - -/// Looks up named oracle traces used by conformance tests. -public enum Golden { - /// Returns whether a named golden trace is present in the package resources. - public static func exists(_ name: String) -> Bool { - url(for: name) != nil - } - - /// Returns the URL of a named golden trace, if it is present. - public static func url(for name: String) -> URL? { - Bundle.module.url(forResource: resourceName(for: name), withExtension: "json") - } - - static func resourceName(for name: String) -> String { - name.hasSuffix(".json") ? String(name.dropLast(".json".count)) : name - } -} diff --git a/Tests/OSDConformance/Goldens/.gitkeep b/Tests/OSDConformance/Goldens/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/Tests/OSDConformanceTests/GoldenDependentConformanceTests.swift b/Tests/OSDConformanceTests/GoldenDependentConformanceTests.swift deleted file mode 100644 index 6d6c924e..00000000 --- a/Tests/OSDConformanceTests/GoldenDependentConformanceTests.swift +++ /dev/null @@ -1,15 +0,0 @@ -import Foundation -import XCTest -import OSDConformance - -final class GoldenDependentConformanceTests: XCTestCase { - func testRelationshipTraceMatchesGolden() throws { - try XCTSkipUnless(Golden.exists("relationship-trace")) - - let url = try XCTUnwrap(Golden.url(for: "relationship-trace")) - let data = try Data(contentsOf: url) - let json = try JSONSerialization.jsonObject(with: data) - - XCTAssertTrue(json is [String: Any], "Relationship trace golden must be a JSON object") - } -} diff --git a/Tests/OpenSwiftDataTests/GoldenTests.swift b/Tests/OpenSwiftDataTests/GoldenTests.swift deleted file mode 100644 index b1021ae9..00000000 --- a/Tests/OpenSwiftDataTests/GoldenTests.swift +++ /dev/null @@ -1,11 +0,0 @@ -import OSDConformance -import XCTest - -final class GoldenTests: XCTestCase { - func testExistsAcceptsNamesWithAndWithoutJSONExtension() { - let name = "nonexistent-golden-resource-9B2A61" - - XCTAssertFalse(Golden.exists(name)) - XCTAssertFalse(Golden.exists("\(name).json")) - } -} diff --git a/Tests/OpenSwiftDataTests/RuntimeAPITests.swift b/Tests/OpenSwiftDataTests/RuntimeAPITests.swift index 485b68fa..44d93c19 100644 --- a/Tests/OpenSwiftDataTests/RuntimeAPITests.swift +++ b/Tests/OpenSwiftDataTests/RuntimeAPITests.swift @@ -4,7 +4,6 @@ import XCTest import OpenSwiftDataSQLite import OSDCore @testable import OSDTestSupport -import OSDConformance @ModelActor actor PersistenceTestActor { From 74a26d296dbe1680caff122af6b3e75973f576a7 Mon Sep 17 00:00:00 2001 From: Chakorn Kungsanarux Date: Tue, 10 Nov 2026 12:32:21 -0700 Subject: [PATCH 3/5] chore: remove empty declaration files --- Sources/OpenSwiftData/Container/Schema+Models.swift | 8 -------- Sources/OpenSwiftData/Container/SchemaIntrospection.swift | 2 -- 2 files changed, 10 deletions(-) delete mode 100644 Sources/OpenSwiftData/Container/Schema+Models.swift delete mode 100644 Sources/OpenSwiftData/Container/SchemaIntrospection.swift diff --git a/Sources/OpenSwiftData/Container/Schema+Models.swift b/Sources/OpenSwiftData/Container/Schema+Models.swift deleted file mode 100644 index 70d429f3..00000000 --- a/Sources/OpenSwiftData/Container/Schema+Models.swift +++ /dev/null @@ -1,8 +0,0 @@ -import OSDCore - -extension Schema { - /// Creates a schema describing the given model types and their ancestors. - /// - /// Entities appear in name order. Invalid model declarations produce an empty entity set here and - /// throw when a container opens with this schema. -} diff --git a/Sources/OpenSwiftData/Container/SchemaIntrospection.swift b/Sources/OpenSwiftData/Container/SchemaIntrospection.swift deleted file mode 100644 index 414ae6d8..00000000 --- a/Sources/OpenSwiftData/Container/SchemaIntrospection.swift +++ /dev/null @@ -1,2 +0,0 @@ -import Foundation -import OSDCore From e94a5fca2ba11f5e8d6b969a7d6c89880733f4dd Mon Sep 17 00:00:00 2001 From: Chakorn Kungsanarux Date: Tue, 10 Nov 2026 12:33:33 -0700 Subject: [PATCH 4/5] chore: remove broken foundationessentialsshim submodule --- .gitmodules | 3 --- Support/FoundationEssentialsShim | 1 - 2 files changed, 4 deletions(-) delete mode 100644 .gitmodules delete mode 160000 Support/FoundationEssentialsShim diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 3774b1b2..00000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "Support/FoundationEssentialsShim"] - path = Support/FoundationEssentialsShim - url = https://github.com/ChakornK/FoundationEssentialsShim diff --git a/Support/FoundationEssentialsShim b/Support/FoundationEssentialsShim deleted file mode 160000 index ce9ace8d..00000000 --- a/Support/FoundationEssentialsShim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ce9ace8d4a5b0300a7a9f96b3cadeb5081939b49 From 100e9327b72b3c46c8c6ceec2e95bbd0a041f4e3 Mon Sep 17 00:00:00 2001 From: Chakorn Kungsanarux Date: Tue, 10 Nov 2026 12:34:23 -0700 Subject: [PATCH 5/5] chore: harden gitignore against stale artifact regrowth --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 329f3e5f..d54e69d2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ -.build/ \ No newline at end of file +.build/ +# Stale top-level probe/validation directory shells (sources removed; prevent reappearing as clutter) +/AppleSDKProbe/ +/AppleSwiftDataBehaviorValidation/