diff --git a/Package.resolved b/Package.resolved index fc9dd94..fc2125b 100644 --- a/Package.resolved +++ b/Package.resolved @@ -51,17 +51,26 @@ "repositoryURL": "https://github.com/apple/swift-argument-parser.git", "state": { "branch": null, - "revision": "986d191f94cec88f6350056da59c2e59e83d1229", - "version": "0.4.3" + "revision": "46989693916f56d1186bd59ac15124caef896560", + "version": "1.3.1" + } + }, + { + "package": "cmark-gfm", + "repositoryURL": "https://github.com/apple/swift-cmark.git", + "state": { + "branch": null, + "revision": "f218e5d7691f78b55bfa39b367763f4612486c35", + "version": "0.3.0" } }, { "package": "swift-format", "repositoryURL": "https://github.com/apple/swift-format.git", "state": { - "branch": "swift-5.4-branch", - "revision": "9c15831b798d767c9af0927a931de5d557004936", - "version": null + "branch": null, + "revision": "7996ac678197d293f6c088a1e74bb778b4e10139", + "version": "510.1.0" } }, { @@ -74,12 +83,21 @@ } }, { - "package": "SwiftSyntax", + "package": "swift-markdown", + "repositoryURL": "https://github.com/apple/swift-markdown.git", + "state": { + "branch": null, + "revision": "e4f95e2dc23097a1a9a1dfdfe3fe3ee44de77378", + "version": "0.3.0" + } + }, + { + "package": "swift-syntax", "repositoryURL": "https://github.com/apple/swift-syntax", "state": { "branch": null, - "revision": "2fff9fc25cdc059379b6bd309377cfab45d8520c", - "version": "0.50400.0" + "revision": "303e5c5c36d6a558407d364878df131c3546fad8", + "version": "510.0.2" } }, { diff --git a/Package.swift b/Package.swift index d2dfebd..a665df7 100644 --- a/Package.swift +++ b/Package.swift @@ -16,7 +16,7 @@ let package = Package( .package(url: "https://github.com/kylef/Commander.git", from: "0.9.0"), - .package(url: "https://github.com/apple/swift-format.git", .branch("swift-5.4-branch")), + .package(url: "https://github.com/apple/swift-format.git", from: "510.1.0"), ], targets: [ .target(name: "SwiftNES"), diff --git a/Tests/SwiftNESTests/CPU/CPUEmulatorSpec.swift b/Tests/SwiftNESTests/CPU/CPUEmulatorSpec.swift index a6b8395..598ccc7 100644 --- a/Tests/SwiftNESTests/CPU/CPUEmulatorSpec.swift +++ b/Tests/SwiftNESTests/CPU/CPUEmulatorSpec.swift @@ -51,7 +51,6 @@ class CPUEmulatorSpec: QuickSpec { } } - describe("stack") { it("push data, and pull the same") { @@ -79,7 +78,7 @@ class CPUEmulatorSpec: QuickSpec { } } -class CPUEmulatorStub : CPUEmulator { +class CPUEmulatorStub: CPUEmulator { var cpu = CPU() var mem = [UInt8](repeating: 0x00, count: 65536) diff --git a/Tests/SwiftNESTests/CPU/CPUInstructionsSpec.swift b/Tests/SwiftNESTests/CPU/CPUInstructionsSpec.swift index 0cfb61f..96cab5b 100644 --- a/Tests/SwiftNESTests/CPU/CPUInstructionsSpec.swift +++ b/Tests/SwiftNESTests/CPU/CPUInstructionsSpec.swift @@ -1518,7 +1518,6 @@ class InstructionSpec: QuickSpec { } } - extension CPUEmulator { fileprivate func step(interruptLine: InterruptLine) -> UInt { let before = cpu.cycles