Merge pull request #18 from davdroman/gitignore-swiftpm-folder

Gitignore .swiftpm folder
davdroman · Oct 25, 2022 · c62ea9f · c62ea9f
2 parents 4f0f510 + 22fd93c
commit c62ea9f
Show file tree

Hide file tree

Showing 11 changed files with 103 additions and 132 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .DS_Store
 /.build
+/.swiftpm
 /Packages
 /*.xcodeproj
 xcuserdata/

diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/PeriodDuration-Package.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/PeriodDuration-Package.xcscheme
diff --git a/Package.resolved b/Package.resolved
@@ -24,8 +24,8 @@
         "repositoryURL": "https://github.com/pointfreeco/swift-case-paths",
         "state": {
           "branch": null,
-          "revision": "7346701ea29da0a85d4403cf3d7a589a58ae3dee",
-          "version": "0.9.2"
+          "revision": "bb436421f57269fbcfe7360735985321585a86e5",
+          "version": "0.10.1"
         }
       },
       {
@@ -37,6 +37,15 @@
           "version": "0.6.0"
         }
       },
+      {
+        "package": "swift-json-testing",
+        "repositoryURL": "https://github.com/davdroman/swift-json-testing",
+        "state": {
+          "branch": "main",
+          "revision": "9223048c0e9de244b6ba4f4f81a16828f44db13e",
+          "version": null
+        }
+      },
       {
         "package": "swift-parsing",
         "repositoryURL": "https://github.com/pointfreeco/swift-parsing",
@@ -51,17 +60,8 @@
         "repositoryURL": "https://github.com/pointfreeco/xctest-dynamic-overlay",
         "state": {
           "branch": null,
-          "revision": "30314f1ece684dd60679d598a9b89107557b67d9",
-          "version": "0.4.1"
-        }
-      },
-      {
-        "package": "XCTJSONKit",
-        "repositoryURL": "https://github.com/davdroman/XCTJSONKit",
-        "state": {
-          "branch": "main",
-          "revision": "ad5527a077f3517ef4da31cbebfc7514ab5f4cb5",
-          "version": null
+          "revision": "16e6409ee82e1b81390bdffbf217b9c08ab32784",
+          "version": "0.5.0"
         }
       }
     ]

diff --git a/Package.swift b/Package.swift
@@ -20,7 +20,7 @@ let package = Package(
         ]),
         .testTarget(name: "PeriodDurationTests", dependencies: [
             .target(name: "PeriodDuration"),
-            .product(name: "XCTJSONKit", package: "XCTJSONKit"),
+            .product(name: "JSONTesting", package: "swift-json-testing"),
         ]),
 
         .executableTarget(name: "Benchmarks", dependencies: [
@@ -33,5 +33,5 @@ let package = Package(
 package.dependencies = [
     .package(url: "https://github.com/google/swift-benchmark", branch: "main"),
     .package(url: "https://github.com/pointfreeco/swift-parsing", from: "0.9.0"),
-    .package(url: "https://github.com/davdroman/XCTJSONKit", branch: "main"),
+    .package(url: "https://github.com/davdroman/swift-json-testing", branch: "main"),
 ]
diff --git a/PeriodDuration.xcworkspace/contents.xcworkspacedata b/PeriodDuration.xcworkspace/contents.xcworkspacedata
diff --git a/PeriodDuration.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/PeriodDuration.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/PeriodDuration.xcworkspace/xcshareddata/swiftpm/Package.resolved b/PeriodDuration.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -0,0 +1,70 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "swift-argument-parser",
+        "repositoryURL": "https://github.com/apple/swift-argument-parser",
+        "state": {
+          "branch": null,
+          "revision": "9f39744e025c7d377987f30b03770805dcb0bcd1",
+          "version": "1.1.4"
+        }
+      },
+      {
+        "package": "Benchmark",
+        "repositoryURL": "https://github.com/google/swift-benchmark",
+        "state": {
+          "branch": "main",
+          "revision": "8163295f6fe82356b0bcf8e1ab991645de17d096",
+          "version": null
+        }
+      },
+      {
+        "package": "swift-case-paths",
+        "repositoryURL": "https://github.com/pointfreeco/swift-case-paths",
+        "state": {
+          "branch": null,
+          "revision": "bb436421f57269fbcfe7360735985321585a86e5",
+          "version": "0.10.1"
+        }
+      },
+      {
+        "package": "swift-custom-dump",
+        "repositoryURL": "https://github.com/pointfreeco/swift-custom-dump",
+        "state": {
+          "branch": null,
+          "revision": "819d9d370cd721c9d87671e29d947279292e4541",
+          "version": "0.6.0"
+        }
+      },
+      {
+        "package": "swift-json-testing",
+        "repositoryURL": "https://github.com/davdroman/swift-json-testing",
+        "state": {
+          "branch": "main",
+          "revision": "9223048c0e9de244b6ba4f4f81a16828f44db13e",
+          "version": null
+        }
+      },
+      {
+        "package": "swift-parsing",
+        "repositoryURL": "https://github.com/pointfreeco/swift-parsing",
+        "state": {
+          "branch": null,
+          "revision": "bc92e84968990b41640214b636667f35b6e5d44c",
+          "version": "0.10.0"
+        }
+      },
+      {
+        "package": "xctest-dynamic-overlay",
+        "repositoryURL": "https://github.com/pointfreeco/xctest-dynamic-overlay",
+        "state": {
+          "branch": null,
+          "revision": "16e6409ee82e1b81390bdffbf217b9c08ab32784",
+          "version": "0.5.0"
+        }
+      }
+    ]
+  },
+  "version": 1
+}
diff --git a/...cshareddata/xcschemes/Benchmarks.xcscheme → ...cshareddata/xcschemes/Benchmarks.xcscheme b/...cshareddata/xcschemes/Benchmarks.xcscheme → ...cshareddata/xcschemes/Benchmarks.xcscheme
diff --git a/...reddata/xcschemes/PeriodDuration.xcscheme → ...reddata/xcschemes/PeriodDuration.xcscheme b/...reddata/xcschemes/PeriodDuration.xcscheme → ...reddata/xcschemes/PeriodDuration.xcscheme
@@ -30,7 +30,6 @@
       <Testables>
          <TestableReference
             skipped = "NO"
-            parallelizable = "YES"
             testExecutionOrdering = "random">
             <BuildableReference
                BuildableIdentifier = "primary"

diff --git a/Tests/PeriodDurationTests/CodableTests.swift b/Tests/PeriodDurationTests/CodableTests.swift
@@ -1,6 +1,6 @@
 import CustomDump
+import JSONTesting
 import PeriodDuration
-import XCTJSONKit
 
 final class CodableTests: XCTestCase {
     func testPeriodDurationScenarios() throws {

diff --git a/Tests/PeriodDurationTests/Scenarios.swift b/Tests/PeriodDurationTests/Scenarios.swift
@@ -1,6 +1,6 @@
 import Foundation
+import JSONTesting
 import PeriodDuration
-import XCTJSONKit
 
 let scenarios: [Scenario] = [
     // MARK: Full