From c6c1e5ce0500da6ed94c1ed8357e4b9756c2f012 Mon Sep 17 00:00:00 2001 From: OhKanghoon Date: Sun, 24 Oct 2021 23:08:30 +0900 Subject: [PATCH 1/3] Update quick nimble version --- Package.resolved | 28 +++++++++++++++++++++++----- Package.swift | 6 +++--- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/Package.resolved b/Package.resolved index 65539f7..57457a8 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,22 +1,40 @@ { "object": { "pins": [ + { + "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": "fb7a26374e8570ff5c68142e5c83406d6abae0d8", + "version": "2.0.2" + } + }, { "package": "Nimble", "repositoryURL": "https://github.com/Quick/Nimble.git", "state": { "branch": null, - "revision": "7a46a5fc86cb917f69e3daf79fcb045283d8f008", - "version": "8.1.2" + "revision": "c93f16c25af5770f0d3e6af27c9634640946b068", + "version": "9.2.1" } }, { "package": "Quick", "repositoryURL": "https://github.com/Quick/Quick.git", "state": { - "branch": "quickobjcruntime-umbrella-header", - "revision": "201151b82a7aa8c5b3bf1af79816fb12a4bac03a", - "version": null + "branch": null, + "revision": "bd86ca0141e3cfb333546de5a11ede63f0c4a0e6", + "version": "4.0.0" } } ] diff --git a/Package.swift b/Package.swift index fb9f4b3..c824866 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.2 +// swift-tools-version:5.3 import PackageDescription @@ -9,8 +9,8 @@ let package = Package( ], products: [.library(name: "Pure", targets: ["Pure"])], dependencies: [ - .package(name: "Quick", url: "https://github.com/Quick/Quick.git", .branch("quickobjcruntime-umbrella-header")), - .package(url: "https://github.com/Quick/Nimble.git", .upToNextMajor(from: "8.0.0")), + .package(url: "https://github.com/Quick/Quick.git", .upToNextMajor(from: "4.0.0")), + .package(url: "https://github.com/Quick/Nimble.git", .upToNextMajor(from: "9.2.0")), ], targets: [ .target(name: "Pure", dependencies: []), From 5a5adb099d6e476767fd2f3d2cacc36705933586 Mon Sep 17 00:00:00 2001 From: OhKanghoon Date: Sun, 24 Oct 2021 23:08:45 +0900 Subject: [PATCH 2/3] modify class to AnyObject --- Sources/Pure/ConfiguratorModule.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/Pure/ConfiguratorModule.swift b/Sources/Pure/ConfiguratorModule.swift index 38679f0..1c70c02 100644 --- a/Sources/Pure/ConfiguratorModule.swift +++ b/Sources/Pure/ConfiguratorModule.swift @@ -1,5 +1,5 @@ /// A module that can be configurated with an existing instance. -public protocol ConfiguratorModule: class, Module { +public protocol ConfiguratorModule: AnyObject, Module { /// A configurator for `Self`. associatedtype Configurator = Pure.Configurator From 9f943b68dcc4695dfe3fd3de0cb5afa1a3f68481 Mon Sep 17 00:00:00 2001 From: OhKanghoon Date: Sun, 24 Oct 2021 23:09:31 +0900 Subject: [PATCH 3/3] Remove warning --- Tests/PureTests/PureSpec.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/PureTests/PureSpec.swift b/Tests/PureTests/PureSpec.swift index 2ec91ad..1f4de48 100644 --- a/Tests/PureTests/PureSpec.swift +++ b/Tests/PureTests/PureSpec.swift @@ -239,7 +239,7 @@ final class PureSpec: QuickSpec { let configurator = MyClass.Configurator(dependency: .init()) for _ in 0..<100 { DispatchQueue.global().async { - _ = configurator.configure(MyClass(), payload: .init()) + configurator.configure(MyClass(), payload: .init()) } }