[] Apply changes from bitrise-step-select-tests/XcodeSelectiveTesting

Author: RyARoemer

Package.resolved

@@ -1,4 +1,4 @@
-// swift-tools-version: 6.0
+// swift-tools-version: 5.6
 
 import PackageDescription
 
@@ -11,65 +11,41 @@ let products: [PackageDescription.Product] = [
         name: "XcodeSelectiveTest",
         targets: ["SelectiveTestingPlugin"]
     ),
-    .library(
-        name: "XcodeSelectiveTestCore",
-        targets: ["SelectiveTestingCore"]
-    )
 ]
 
-let flags: [PackageDescription.SwiftSetting] = [.enableExperimentalFeature("StrictConcurrency")]
-
 let targets: [PackageDescription.Target] = [
     .executableTarget(
         name: "xcode-selective-test",
         dependencies: ["SelectiveTestingCore",
-                       .product(name: "ArgumentParser", package: "swift-argument-parser")],
-        swiftSettings: flags
+                       .product(name: "ArgumentParser", package: "swift-argument-parser")]
     ),
     .target(name: "SelectiveTestingCore",
             dependencies: ["DependencyCalculator",
                            "TestConfigurator",
                            "Git",
                            "PathKit",
-                           "Yams",
-                           .product(name: "ArgumentParser", package: "swift-argument-parser")],
-            swiftSettings: flags
-    ),
+                           "Rainbow",
+                           "Yams"]),
     .target(name: "DependencyCalculator",
-            dependencies: ["Workspace", "PathKit", "Git", .product(name: "Logging", package: "swift-log")],
-            swiftSettings: flags
-    ),
+            dependencies: ["Workspace", "PathKit", "SelectiveTestLogger", "Git"]),
     .target(name: "TestConfigurator",
-            dependencies: [
-                "Workspace",
-                "PathKit",
-                .product(name: "Logging", package: "swift-log"),
-                .product(name: "ArgumentParser", package: "swift-argument-parser")
-            ],
-            swiftSettings: flags
-    ),
+            dependencies: ["Workspace", "PathKit", "SelectiveTestLogger"]),
     .target(name: "Workspace",
-            dependencies: ["XcodeProj", .product(name: "Logging", package: "swift-log")],
-            swiftSettings: flags
-    ),
+            dependencies: ["XcodeProj", "SelectiveTestLogger"]),
     .target(name: "Git",
-            dependencies: ["SelectiveTestShell", "PathKit", .product(name: "Logging", package: "swift-log")],
-            swiftSettings: flags
-    ),
-    .target(name: "SelectiveTestShell",
-            swiftSettings: flags
-    ),
+            dependencies: ["SelectiveTestShell", "SelectiveTestLogger", "PathKit"]),
+    .target(name: "SelectiveTestLogger",
+            dependencies: ["Rainbow"]),
+    .target(name: "SelectiveTestShell"),
     .testTarget(
         name: "SelectiveTestingTests",
-        dependencies: ["xcode-selective-test", "PathKit", "Workspace"],
-        resources: [.copy("ExampleProject")],
-        swiftSettings: flags
+        dependencies: ["xcode-selective-test", "PathKit"],
+        resources: [.copy("ExampleProject")]
     ),
     .testTarget(
         name: "DependencyCalculatorTests",
         dependencies: ["DependencyCalculator", "Workspace", "PathKit", "SelectiveTestingCore"],
-        resources: [.copy("ExamplePackages")],
-        swiftSettings: flags
+        resources: [.copy("ExamplePackages")]
     ),
     .plugin(
         name: "SelectiveTestingPlugin",
@@ -83,7 +59,7 @@ let targets: [PackageDescription.Target] = [
             ]
         ),
         dependencies: ["xcode-selective-test"]
-    )
+    ),
 ]
 
 let package = Package(
@@ -93,11 +69,11 @@ let package = Package(
     ],
     products: products,
     dependencies: [
-        .package(url: "https://github.com/tuist/XcodeProj.git", .upToNextMajor(from: "9.0.2")),
+        .package(url: "https://github.com/tuist/XcodeProj.git", .upToNextMajor(from: "8.24.1")),
         .package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMajor(from: "1.2.0")),
         .package(url: "https://github.com/kylef/PathKit.git", .upToNextMinor(from: "1.0.0")),
+        .package(url: "https://github.com/onevcat/Rainbow", .upToNextMajor(from: "4.0.0")),
         .package(url: "https://github.com/jpsim/Yams.git", from: "5.0.5"),
-        .package(url: "https://github.com/apple/swift-log", from: "1.6.0")
     ],
     targets: targets
 )

Package.swift

@@ -7,10 +7,11 @@ import PackagePlugin
 
 @main
 struct SelectiveTestingPlugin: CommandPlugin {
-    private func run(_ executable: URL, arguments: [String] = []) throws {
+    private func run(_ executable: String, arguments: [String] = []) throws {
+        let executableURL = URL(fileURLWithPath: executable)
 
         let process = Process()
-        process.executableURL = executable
+        process.executableURL = executableURL
         process.arguments = arguments
 
         try process.run()
@@ -23,10 +24,10 @@ struct SelectiveTestingPlugin: CommandPlugin {
     }
 
     func performCommand(context: PluginContext, arguments: [String]) async throws {
-        FileManager.default.changeCurrentDirectoryPath(context.package.directoryURL.path)
+        FileManager().changeCurrentDirectoryPath(context.package.directory.string)
         let tool = try context.tool(named: "xcode-selective-test")
 
-        try run(tool.url, arguments: arguments)
+        try run(tool.path.string, arguments: arguments)
     }
 }
 
@@ -35,7 +36,7 @@ struct SelectiveTestingPlugin: CommandPlugin {
 
     extension SelectiveTestingPlugin: XcodeCommandPlugin {
         func performCommand(context: XcodePluginContext, arguments: [String]) throws {
-            FileManager.default.changeCurrentDirectoryPath(context.xcodeProject.directoryURL.path)
+            FileManager().changeCurrentDirectoryPath(context.xcodeProject.directory.string)
 
             let tool = try context.tool(named: "xcode-selective-test")
 
@@ -47,29 +48,16 @@ struct SelectiveTestingPlugin: CommandPlugin {
                 toolArguments.remove(at: indexOfTarget)
             }
 
-            if !toolArguments.contains(where: { $0 == "--test-plan" }) {
-                let allFiles = context.xcodeProject.targets.reduce([]) { partialResult, target in
-                    partialResult + target.inputFiles
-                }
-                
-                let testPlans = allFiles.filter {
-                    $0.url.pathExtension == "xctestplan"
-                }
-
-                if !testPlans.isEmpty {
-                    if testPlans.count == 1 {
-                        print("Using \(testPlans[0].url.path()) test plan")
-                    } else {
-                        print("Using \(testPlans.count) test plans")
-                    }
-
-                    for testPlan in testPlans {
-                        toolArguments.append(contentsOf: ["--test-plan", testPlan.url.path()])
-                    }
-                }
+            if !toolArguments.contains(where: { $0 == "--test-plan" }),
+               let testPlan = context.xcodeProject.filePaths.first(where: {
+                   $0.extension == "xctestplan"
+               })
+            {
+                print("Using \(testPlan.string) test plan")
+                toolArguments.append(contentsOf: ["--test-plan", testPlan.string])
             }
 
-            try run(tool.url, arguments: toolArguments)
+            try run(tool.path.string, arguments: toolArguments)
         }
     }
 #endif

Plugins/SelectiveTestingPlugin/SelectiveTestingPlugin.swift

@@ -2,7 +2,7 @@
 
 Run only tests relevant to the changeset.
 
-[Watch my talk from Swift Connection 2025](https://www.youtube.com/watch?v=U1fJQRbq-TY)
+[Watch Video](https://www.youtube.com/watch?v=0JOX1czraGA)
 
 [![Swift](https://github.com/mikeger/SelectiveTesting/actions/workflows/test.yml/badge.svg)](https://github.com/mikeger/SelectiveTesting/actions/workflows/test.yml)
 
@@ -48,15 +48,15 @@ Alternatively, you can use a prebuilt binary release of the tool distributed und
 
 ### Using Swift Package Manager
 
-Add `.package(url: "git@github.com:mikeger/XcodeSelectiveTesting", .upToNextMajor(from: "0.14.2"))` to your `Package.swift`'s `dependencies` section.
+Add `.package(url: "git@github.com:mikeger/XcodeSelectiveTesting", .upToNextMajor(from: "0.11.3"))` to your `Package.swift`'s `dependencies` section.
 
 Use SPM to run the command: `swift run xcode-selective-test`.
 
 Alternatively, you can use a prebuilt binary release of the tool distributed under [releases](https://github.com/mikeger/XcodeSelectiveTesting/releases) section.
 
 ### Using [Mint](https://github.com/yonaskolb/Mint)
 
-`mint install mikeger/XcodeSelectiveTesting@0.14.2`
+`mint install mikeger/XcodeSelectiveTesting@0.11.3`
 
 ### Manually
 
@@ -83,15 +83,8 @@ NB: This command assumes you have [jq](https://jqlang.github.io/jq/) tool instal
 
 Alternatively, you can use CLI to achieve the same result:
 
-1. Run `mint run mikeger/XcodeSelectiveTesting@0.14.2 YourWorkspace.xcworkspace --test-plan YourTestPlan.xctestplan`
-2. Run tests normally, XcodeSelectiveTesting would modify your test plan according to the local changes
-
-To process multiple test plans, specify the `--test-plan` option multiple times:
-```bash
-mint run mikeger/XcodeSelectiveTesting@0.14.2 YourWorkspace.xcworkspace \
-  --test-plan TestPlan1.xctestplan \
-  --test-plan TestPlan2.xctestplan
-```
+1. Run `mint run mikeger/XcodeSelectiveTesting@0.11.3 YourWorkspace.xcworkspace --test-plan YourTestPlan.xctestplan`
+2. Run tests normally, XcodeSelectiveTesting would modify your test plan according to the local changes 
 
 ### Use case: Xcode-based project, execute tests on the CI, no test plan
 
@@ -103,17 +96,9 @@ mint run mikeger/XcodeSelectiveTesting@0.14.2 YourWorkspace.xcworkspace \
 ### Use case: Xcode-based project, execute tests on the CI, with test plan
 
 1. Add code to install the tool
-2. Add a CI step before you execute your tests: `mint run mikeger/XcodeSelectiveTesting@0.14.2 YourWorkspace.xcworkspace --test-plan YourTestPlan.xctestplan --base-branch $PR_BASE_BRANCH`
+2. Add a CI step before you execute your tests: `mint run mikeger/XcodeSelectiveTesting@0.11.3 YourWorkspace.xcworkspace --test-plan YourTestPlan.xctestplan --base-branch $PR_BASE_BRANCH`
 3. Execute your tests
 
-To process multiple test plans on CI:
-```bash
-mint run mikeger/XcodeSelectiveTesting@0.14.2 YourWorkspace.xcworkspace \
-  --test-plan TestPlan1.xctestplan \
-  --test-plan TestPlan2.xctestplan \
-  --base-branch $PR_BASE_BRANCH
-```
-
 ### Use case: GitHub Actions, other cases when the git repo is not in the shape to provide the changeset out of the box
 
 1. Add code to install the tool
@@ -129,7 +114,7 @@ Git allows us to find what files were touched in the changeset.
 ```bash
 Root
 ├── Dependencies
-│   ├── Login
+│   └── Login
 │   ├── ❗️LoginAssembly.swift
 │   └── ...
 ├── MyProject.xcodeproj
@@ -160,7 +145,7 @@ This is the hardest part: dealing with obscure Xcode formats. But if we get that
 
 - `--help`: Display all command line options
 - `--base-branch`: Branch to compare against to find the relevant changes. If emitted, a local changeset is used (development mode).
-- `--test-plan`: Path to the test plan. If not given, tool would try to infer the path. Can be specified multiple times to process multiple test plans.
+- `--test-plan`: Path to the test plan. If not given, tool would try to infer the path.
 - `--json`: Provide output in JSON format (STDOUT).
 - `--dependency-graph`: Opens Safari with a dependency graph visualization. Attention: if you don't trust Javascript ecosystem prefer using `--dot` option. More info [here](https://github.com/mikeger/XcodeSelectiveTesting/wiki/How-to-visualize-your-dependency-structure).
 - `--dot`: Output dependency graph in Dot (Graphviz) format. To be used with Graphviz: `brew install graphviz`, then `xcode-selective-test --dot | dot -Tsvg > output.svg && open output.svg`
@@ -175,8 +160,7 @@ It is possible to define the configuration in a separate file. The tool would lo
 Options available are (see `selective-testing-config-example.yml` for an example):
 
 - `basePath`: Relative or absolute path to the project. If set, the command line option can be emitted.
-- `testPlan`: Relative or absolute path to the test plan to configure. For backwards compatibility.
-- `testPlans`: Array of relative or absolute paths to test plans to configure. Use this to process multiple test plans.
+- `testPlan`: Relative or absolute path to the test plan to configure.
 - `exclude`: List of relative paths to exclude when looking for Swift packages.
 - `extra/dependencies`: Options allowing to hint tool about dependencies between targets or packages.
 - `extra/targetsFiles`: Options allowing to hint tool about the files affecting targets or packages.
@@ -208,6 +192,5 @@ See LICENSE
 - [Bruno Guidolim](https://github.com/bguidolim)
 - [Alex Deem](https://github.com/alexdeem)
 - [Steffen Matthischke](https://github.com/HeEAaD)
-- [Econa77](https://github.com/Econa77)
 
 If you like this product, consider donating to my hometown's charity project [Monsters Corporation](https://monstrov.org) 🤝

README.md

@@ -4,7 +4,7 @@
 
 import Foundation
 
-final class ThreadSafe<A: Sendable>: @unchecked Sendable {
+final class ThreadSafe<A> {
     private var _value: A
     private let queue = DispatchQueue(label: "ThreadSafe")
     init(_ value: A) {
@@ -22,8 +22,8 @@ final class ThreadSafe<A: Sendable>: @unchecked Sendable {
     }
 }
 
-extension Array where Element: Sendable {
-    func concurrentMap<B: Sendable>(_ transform: @escaping @Sendable (Element) -> B) -> [B] {
+extension Array {
+    func concurrentMap<B>(_ transform: @escaping (Element) -> B) -> [B] {
         let result = ThreadSafe([B?](repeating: nil, count: count))
         DispatchQueue.concurrentPerform(iterations: count) { idx in
             let element = self[idx]

Sources/DependencyCalculator/ConcurrentMap.swift

@@ -4,7 +4,7 @@
 
 import Foundation
 import PathKit
-import Logging
+import SelectiveTestLogger
 import Workspace
 
 public extension WorkspaceInfo {
@@ -18,7 +18,7 @@ public extension WorkspaceInfo {
             } else if let targetFromFolder = targetForFolder(path) {
                 result.insert(targetFromFolder)
             } else {
-                logger.info("Changed file at \(path) appears not to belong to any target")
+                Logger.message("Changed file at \(path) appears not to belong to any target")
             }
         }
         if incldueIndirectlyAffected {
@@ -32,7 +32,7 @@ public extension WorkspaceInfo {
 
     internal func targetForFolder(_ path: Path) -> TargetIdentity? {
         return folders.first { folder, _ in
-            path.string.contains(folder.string + "/")
+            path.string.hasPrefix(folder.string)
         }?.value
     }