diff --git a/Package.resolved b/Package.resolved index b4c109c85..5833d11af 100644 --- a/Package.resolved +++ b/Package.resolved @@ -24,7 +24,7 @@ "repositoryURL": "https://github.com/avito-tech/CommandLineToolkit.git", "state": { "branch": null, - "revision": "90e0bfa7749c3bd7614f2a5584a427a651c9ea5a", + "revision": "ecc14634fdca2eea60f4dcda98c82c2d36da96c5", "version": null } }, diff --git a/Package.swift b/Package.swift index 7d2bd42f4..82e797e97 100644 --- a/Package.swift +++ b/Package.swift @@ -13,7 +13,7 @@ let package = Package( .library(name: "EmceeInterfaces", targets: ["BuildArtifacts", "DeveloperDirModels", "EmceeVersion", "PluginSupport", "QueueModels", "ResourceLocation", "ResourceLocationResolver", "RunnerModels", "SimulatorPoolModels", "SimulatorVideoRecorder", "TestArgFile", "TestDiscovery", "TestsWorkingDirectorySupport", "TypedResourceLocation", "WorkerAlivenessModels", "WorkerCapabilitiesModels"]), ], dependencies: [ - .package(name: "CommandLineToolkit", url: "https://github.com/avito-tech/CommandLineToolkit.git", .revision("90e0bfa7749c3bd7614f2a5584a427a651c9ea5a")), + .package(name: "CommandLineToolkit", url: "https://github.com/avito-tech/CommandLineToolkit.git", .revision("ecc14634fdca2eea60f4dcda98c82c2d36da96c5")), .package(name: "CountedSet", url: "https://github.com/0x7fs/CountedSet", .branch("master")), .package(name: "OrderedSet", url: "https://github.com/Weebly/OrderedSet", .exact("5.0.0")), .package(name: "Shout", url: "https://github.com/jakeheis/Shout.git", .exact("0.5.4")), diff --git a/Sources/Runner/Runner.swift b/Sources/Runner/Runner.swift index a1d41f637..5ecaafd8a 100755 --- a/Sources/Runner/Runner.swift +++ b/Sources/Runner/Runner.swift @@ -261,7 +261,10 @@ public final class Runner { ).startExecutingTests() } testRunnerRunningInvocationContainer.set(runningInvocation) - + defer { + // since we refer this in closures, we must clean up to ensure no retain cycles will occur + testRunnerRunningInvocationContainer.set(nil) + } try streamClosedCallback.wait(timeout: .infinity, description: "Test Runner Stream Close") let result = Runner.prepareResults( diff --git a/package.json b/package.json index 4d367a8ab..10e46acdc 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "CommandLineToolkit": { "url": "https://github.com/avito-tech/CommandLineToolkit.git", "version": { - "revision": "90e0bfa7749c3bd7614f2a5584a427a651c9ea5a" + "revision": "ecc14634fdca2eea60f4dcda98c82c2d36da96c5" }, "targetNames": [ "AtomicModels",