From bdf856c35442b2a8ee0a2fce0ddeca8cfd6865a2 Mon Sep 17 00:00:00 2001 From: Christopher Fuller Date: Tue, 27 Sep 2022 14:28:00 -0700 Subject: [PATCH] Upgrade to Swift 5.7 --- Nodes.podspec | 2 +- Package.resolved | 276 +++++++++++++++++++++++------------------------ Package.swift | 5 +- 3 files changed, 140 insertions(+), 143 deletions(-) diff --git a/Nodes.podspec b/Nodes.podspec index 799b5ab03..940df6fd6 100644 --- a/Nodes.podspec +++ b/Nodes.podspec @@ -12,6 +12,6 @@ Pod::Spec.new do |s| s.tvos.deployment_target = `make get-deployment-target platform=tvos` s.watchos.deployment_target = `make get-deployment-target platform=watchos` - s.swift_version = '5.2', '5.3', '5.4', '5.5', '5.6' + s.swift_version = '5.5', '5.6', '5.7' s.source_files = 'Sources/Nodes/**/*' end diff --git a/Package.resolved b/Package.resolved index 2ae57680f..57d9cfd76 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,142 +1,140 @@ { - "object": { - "pins": [ - { - "package": "Codextended", - "repositoryURL": "https://github.com/JohnSundell/Codextended.git", - "state": { - "branch": null, - "revision": "8d7c46dfc9c55240870cf5561d6cefa41e3d7105", - "version": "0.3.0" - } - }, - { - "package": "CwlCatchException", - "repositoryURL": "https://github.com/mattgallagher/CwlCatchException.git", - "state": { - "branch": null, - "revision": "35f9e770f54ce62dd8526470f14c6e137cef3eea", - "version": "2.1.1" - } - }, - { - "package": "CwlPreconditionTesting", - "repositoryURL": "https://github.com/mattgallagher/CwlPreconditionTesting.git", - "state": { - "branch": null, - "revision": "c21f7bab5ca8eee0a9998bbd17ca1d0eb45d4688", - "version": "2.1.0" - } - }, - { - "package": "Nimble", - "repositoryURL": "https://github.com/Quick/Nimble.git", - "state": { - "branch": null, - "revision": "1f3bde57bde12f5e7b07909848c071e9b73d6edc", - "version": "10.0.0" - } - }, - { - "package": "PathKit", - "repositoryURL": "https://github.com/kylef/PathKit.git", - "state": { - "branch": null, - "revision": "3bfd2737b700b9a36565a8c94f4ad2b050a5e574", - "version": "1.0.1" - } - }, - { - "package": "Preflight", - "repositoryURL": "git@github.com:TinderApp/Preflight.git", - "state": { - "branch": null, - "revision": "dae833f3aeff1fade6ed92604be189969bae3280", - "version": "0.0.5" - } - }, - { - "package": "SourceKitten", - "repositoryURL": "https://github.com/jpsim/SourceKitten.git", - "state": { - "branch": null, - "revision": "558628392eb31d37cb251cfe626c53eafd330df6", - "version": "0.31.1" - } - }, - { - "package": "Spectre", - "repositoryURL": "https://github.com/kylef/Spectre.git", - "state": { - "branch": null, - "revision": "26cc5e9ae0947092c7139ef7ba612e34646086c7", - "version": "0.10.1" - } - }, - { - "package": "Stencil", - "repositoryURL": "https://github.com/stencilproject/Stencil.git", - "state": { - "branch": null, - "revision": "ccd9402682f4c07dac9561befd207c8156e80e20", - "version": "0.14.2" - } - }, - { - "package": "swift-argument-parser", - "repositoryURL": "https://github.com/apple/swift-argument-parser.git", - "state": { - "branch": null, - "revision": "e394bf350e38cb100b6bc4172834770ede1b7232", - "version": "1.0.3" - } - }, - { - "package": "SnapshotTesting", - "repositoryURL": "https://github.com/pointfreeco/swift-snapshot-testing.git", - "state": { - "branch": null, - "revision": "f8a9c997c3c1dab4e216a8ec9014e23144cbab37", - "version": "1.9.0" - } - }, - { - "package": "SwiftLint", - "repositoryURL": "https://github.com/realm/SwiftLint.git", - "state": { - "branch": null, - "revision": "b4a54f32df66008d30f0229446831cb823576c42", - "version": "0.46.2" - } - }, - { - "package": "SwiftyTextTable", - "repositoryURL": "https://github.com/scottrhoyt/SwiftyTextTable.git", - "state": { - "branch": null, - "revision": "c6df6cf533d120716bff38f8ff9885e1ce2a4ac3", - "version": "0.9.0" - } - }, - { - "package": "SWXMLHash", - "repositoryURL": "https://github.com/drmohundro/SWXMLHash.git", - "state": { - "branch": null, - "revision": "9183170d20857753d4f331b0ca63f73c60764bf3", - "version": "5.0.2" - } - }, - { - "package": "Yams", - "repositoryURL": "https://github.com/jpsim/Yams.git", - "state": { - "branch": null, - "revision": "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa", - "version": "4.0.6" - } + "pins" : [ + { + "identity" : "codextended", + "kind" : "remoteSourceControl", + "location" : "https://github.com/JohnSundell/Codextended.git", + "state" : { + "revision" : "8d7c46dfc9c55240870cf5561d6cefa41e3d7105", + "version" : "0.3.0" } - ] - }, - "version": 1 + }, + { + "identity" : "cwlcatchexception", + "kind" : "remoteSourceControl", + "location" : "https://github.com/mattgallagher/CwlCatchException.git", + "state" : { + "revision" : "35f9e770f54ce62dd8526470f14c6e137cef3eea", + "version" : "2.1.1" + } + }, + { + "identity" : "cwlpreconditiontesting", + "kind" : "remoteSourceControl", + "location" : "https://github.com/mattgallagher/CwlPreconditionTesting.git", + "state" : { + "revision" : "c21f7bab5ca8eee0a9998bbd17ca1d0eb45d4688", + "version" : "2.1.0" + } + }, + { + "identity" : "nimble", + "kind" : "remoteSourceControl", + "location" : "https://github.com/Quick/Nimble.git", + "state" : { + "revision" : "1f3bde57bde12f5e7b07909848c071e9b73d6edc", + "version" : "10.0.0" + } + }, + { + "identity" : "pathkit", + "kind" : "remoteSourceControl", + "location" : "https://github.com/kylef/PathKit.git", + "state" : { + "revision" : "3bfd2737b700b9a36565a8c94f4ad2b050a5e574", + "version" : "1.0.1" + } + }, + { + "identity" : "preflight", + "kind" : "remoteSourceControl", + "location" : "git@github.com:TinderApp/Preflight.git", + "state" : { + "revision" : "dae833f3aeff1fade6ed92604be189969bae3280", + "version" : "0.0.5" + } + }, + { + "identity" : "sourcekitten", + "kind" : "remoteSourceControl", + "location" : "https://github.com/jpsim/SourceKitten.git", + "state" : { + "revision" : "558628392eb31d37cb251cfe626c53eafd330df6", + "version" : "0.31.1" + } + }, + { + "identity" : "spectre", + "kind" : "remoteSourceControl", + "location" : "https://github.com/kylef/Spectre.git", + "state" : { + "revision" : "26cc5e9ae0947092c7139ef7ba612e34646086c7", + "version" : "0.10.1" + } + }, + { + "identity" : "stencil", + "kind" : "remoteSourceControl", + "location" : "https://github.com/stencilproject/Stencil.git", + "state" : { + "revision" : "ccd9402682f4c07dac9561befd207c8156e80e20", + "version" : "0.14.2" + } + }, + { + "identity" : "swift-argument-parser", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-argument-parser.git", + "state" : { + "revision" : "e394bf350e38cb100b6bc4172834770ede1b7232", + "version" : "1.0.3" + } + }, + { + "identity" : "swift-snapshot-testing", + "kind" : "remoteSourceControl", + "location" : "https://github.com/pointfreeco/swift-snapshot-testing.git", + "state" : { + "revision" : "f8a9c997c3c1dab4e216a8ec9014e23144cbab37", + "version" : "1.9.0" + } + }, + { + "identity" : "swiftlint", + "kind" : "remoteSourceControl", + "location" : "https://github.com/realm/SwiftLint.git", + "state" : { + "revision" : "b4a54f32df66008d30f0229446831cb823576c42", + "version" : "0.46.2" + } + }, + { + "identity" : "swiftytexttable", + "kind" : "remoteSourceControl", + "location" : "https://github.com/scottrhoyt/SwiftyTextTable.git", + "state" : { + "revision" : "c6df6cf533d120716bff38f8ff9885e1ce2a4ac3", + "version" : "0.9.0" + } + }, + { + "identity" : "swxmlhash", + "kind" : "remoteSourceControl", + "location" : "https://github.com/drmohundro/SWXMLHash.git", + "state" : { + "revision" : "9183170d20857753d4f331b0ca63f73c60764bf3", + "version" : "5.0.2" + } + }, + { + "identity" : "yams", + "kind" : "remoteSourceControl", + "location" : "https://github.com/jpsim/Yams.git", + "state" : { + "revision" : "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa", + "version" : "4.0.6" + } + } + ], + "version" : 2 } diff --git a/Package.swift b/Package.swift index 7f45e4684..4113a7059 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.5 +// swift-tools-version:5.7 import PackageDescription @@ -44,7 +44,6 @@ let package = Package( url: "https://github.com/Quick/Nimble.git", from: "10.0.0"), .package( - name: "SnapshotTesting", url: "https://github.com/pointfreeco/swift-snapshot-testing.git", from: "1.9.0"), ], @@ -80,7 +79,7 @@ let package = Package( dependencies: [ "XcodeTemplateGeneratorLibrary", "Nimble", - "SnapshotTesting", + .product(name: "SnapshotTesting", package: "swift-snapshot-testing"), ], exclude: ["__Snapshots__"]), ]