Update CommandLineToolkit

avito-tech · May 14, 2021 · 2d07ee2 · 2d07ee2
1 parent 1cdf02a
commit 2d07ee2
Show file tree

Hide file tree

Showing 21 changed files with 12 additions and 1,523 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -24,7 +24,7 @@
         "repositoryURL": "https://github.com/avito-tech/CommandLineToolkit.git",
         "state": {
           "branch": null,
-          "revision": "ecc14634fdca2eea60f4dcda98c82c2d36da96c5",
+          "revision": "95d7af1ccaacd2904def3d261a749905f90d3796",
           "version": null
         }
       },

diff --git 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("ecc14634fdca2eea60f4dcda98c82c2d36da96c5")),
+        .package(name: "CommandLineToolkit", url: "https://github.com/avito-tech/CommandLineToolkit.git", .revision("95d7af1ccaacd2904def3d261a749905f90d3796")),
         .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")),
@@ -342,7 +342,7 @@ let package = Package(
             dependencies: [
                 "Deployer",
                 "EmceeLogging",
-                "LaunchdUtils",
+                .product(name: "LaunchdUtils", package: "CommandLineToolkit"),
                 .product(name: "PathLib", package: "CommandLineToolkit"),
                 .product(name: "ProcessController", package: "CommandLineToolkit"),
                 "QueueModels",
@@ -672,20 +672,6 @@ let package = Package(
             ],
             path: "Tests/FileLockTests"
         ),
-        .target(
-            name: "JSONStream",
-            dependencies: [
-                .product(name: "AtomicModels", package: "CommandLineToolkit"),
-            ],
-            path: "Sources/JSONStream"
-        ),
-        .testTarget(
-            name: "JSONStreamTests",
-            dependencies: [
-                "JSONStream",
-            ],
-            path: "Tests/JSONStreamTests"
-        ),
         .target(
             name: "JunitReporting",
             dependencies: [
@@ -720,19 +706,6 @@ let package = Package(
             ],
             path: "Tests/KibanaTests"
         ),
-        .target(
-            name: "LaunchdUtils",
-            dependencies: [
-            ],
-            path: "Sources/LaunchdUtils"
-        ),
-        .testTarget(
-            name: "LaunchdUtilsTests",
-            dependencies: [
-                "LaunchdUtils",
-            ],
-            path: "Tests/LaunchdUtilsTests"
-        ),
         .target(
             name: "ListeningSemaphore",
             dependencies: [
@@ -882,7 +855,7 @@ let package = Package(
                 "EmceeLogging",
                 "EventBus",
                 .product(name: "FileSystem", package: "CommandLineToolkit"),
-                "JSONStream",
+                .product(name: "JSONStream", package: "CommandLineToolkit"),
                 "LoggingSetup",
                 "PluginSupport",
                 .product(name: "Starscream", package: "Starscream"),
@@ -1387,7 +1360,7 @@ let package = Package(
             dependencies: [
                 .product(name: "DateProvider", package: "CommandLineToolkit"),
                 "EmceeLogging",
-                "JSONStream",
+                .product(name: "JSONStream", package: "CommandLineToolkit"),
                 .product(name: "PathLib", package: "CommandLineToolkit"),
                 "ResultStreamModels",
                 "Runner",

diff --git a/Sources/DistDeployer/RemoteQueueLaunchdPlist.swift b/Sources/DistDeployer/RemoteQueueLaunchdPlist.swift
@@ -51,6 +51,8 @@ public final class RemoteQueueLaunchdPlist {
         let launchdPlist = LaunchdPlist(
             job: LaunchdJob(
                 label: jobLabel,
+                username: nil,
+                groupname: nil,
                 programArguments: [
                     remoteQueueServerBinaryPath.pathString, "startLocalQueueServer",
                     "--emcee-version", emceeVersion.value,

diff --git a/Sources/DistDeployer/RemoteWorkerLaunchdPlist.swift b/Sources/DistDeployer/RemoteWorkerLaunchdPlist.swift
@@ -41,6 +41,8 @@ public final class RemoteWorkerLaunchdPlist {
         let launchdPlist = LaunchdPlist(
             job: LaunchdJob(
                 label: jobLabel,
+                username: nil,
+                groupname: nil,
                 programArguments: [
                     workerBinaryRemotePath.pathString, "distWork",
                     "--emcee-version", emceeVersion.value,

diff --git a/Sources/JSONStream/AppendableJSONStream.swift b/Sources/JSONStream/AppendableJSONStream.swift
diff --git a/Sources/JSONStream/BlockingArrayBasedJSONStream.swift b/Sources/JSONStream/BlockingArrayBasedJSONStream.swift