Linting

tuist · Nov 21, 2023 · 9d1d96b · 9d1d96b
1 parent 3d1731f
commit 9d1d96b
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 36 deletions.
diff --git a/Sources/ProjectDescription/Target.swift b/Sources/ProjectDescription/Target.swift
@@ -7,7 +7,7 @@ public struct Target: Codable, Equatable {
 
     /// The destinations this target supports
     public let destinations: Destinations
-    
+
     /// The type of build product this target will output.
     public let product: Product
 
@@ -19,7 +19,7 @@ public struct Target: Codable, Equatable {
 
     /// The minimum deployment target your product will support.
     public let deploymentTargets: DeploymentTargets?
-    
+
     /// The Info.plist representation.
     public let infoPlist: InfoPlist?
 
@@ -144,7 +144,7 @@ public struct Target: Codable, Equatable {
         mergeable: Bool = false
     ) {
         self.name = name
-        self.destinations = Destinations.from(platform: platform, deploymentTarget: deploymentTarget)
+        destinations = Destinations.from(platform: platform, deploymentTarget: deploymentTarget)
         self.bundleId = bundleId
         self.productName = productName
         self.product = product
@@ -160,7 +160,7 @@ public struct Target: Codable, Equatable {
         self.coreDataModels = coreDataModels
         self.environmentVariables = environmentVariables
         self.launchArguments = launchArguments
-        self.deploymentTargets = DeploymentTargets.from(manifest: deploymentTarget)
+        deploymentTargets = DeploymentTargets.from(manifest: deploymentTarget)
         self.additionalFiles = additionalFiles
         self.buildRules = buildRules
         self.mergedBinaryType = mergedBinaryType
@@ -193,7 +193,7 @@ public struct Target: Codable, Equatable {
         mergeable: Bool = false
     ) {
         self.name = name
-        self.destinations = Destinations.from(platform: platform, deploymentTarget: deploymentTarget)
+        destinations = Destinations.from(platform: platform, deploymentTarget: deploymentTarget)
         self.bundleId = bundleId
         self.productName = productName
         self.product = product
@@ -211,45 +211,53 @@ public struct Target: Codable, Equatable {
             EnvironmentVariable(value: value, isEnabled: true)
         }
         self.launchArguments = launchArguments
-        self.deploymentTargets = DeploymentTargets.from(manifest: deploymentTarget)
+        deploymentTargets = DeploymentTargets.from(manifest: deploymentTarget)
         self.additionalFiles = additionalFiles
         self.buildRules = buildRules
         self.mergedBinaryType = mergedBinaryType
         self.mergeable = mergeable
     }
 }
 
-
 extension Target {
     @available(*, deprecated, renamed: "Destinations", message: "Targets are no longer constrained to a single platform")
     var platform: Platform {
         destinations.platforms.first ?? .iOS
     }
 
-    @available(*, deprecated, renamed: "DeploymentTargets", message: "Device support is now defined in Destinations. Minimum Deployment Version is defined in DeploymentTargets")
+    @available(
+        *,
+        deprecated,
+        renamed: "DeploymentTargets",
+        message: "Device support is now defined in Destinations. Minimum Deployment Version is defined in DeploymentTargets"
+    )
     var deploymentTarget: DeploymentTarget? {
         switch platform {
         case .iOS:
             guard let version = deploymentTargets?.iOS else { return nil }
             var devices = DeploymentDevice()
-            
+
             if destinations.contains(.iPhone) {
                 devices.insert(.iphone)
             }
-            
+
             if destinations.contains(.iPad) {
                 devices.insert(.ipad)
             }
-            
+
             if destinations.contains(.macCatalyst) {
                 devices.insert(.mac)
             }
-            
+
             if destinations.contains(.appleVisionWithiPadDesign) {
                 devices.insert(.vision)
             }
-
-            return .iOS(targetVersion: version, devices: devices, supportsMacDesignedForIOS: destinations.contains(.macWithiPadDesign))
+
+            return .iOS(
+                targetVersion: version,
+                devices: devices,
+                supportsMacDesignedForIOS: destinations.contains(.macWithiPadDesign)
+            )
         case .macOS:
             guard let version = deploymentTargets?.macOS else { return nil }
             return .macOS(targetVersion: version)
@@ -266,9 +274,7 @@ extension Target {
     }
 }
 
-
 extension Destinations {
-
     /// Maps a ProjectDescription.Package instance into a TuistGraph.Package model.
     /// - Parameters:
     ///   - manifest: Manifest representation of Package.
@@ -282,27 +288,27 @@ extension Destinations {
             return [.mac]
         case let (.iOS, .some(.iOS(_, devices, supportsMacDesignedForIOS: supportsMacDesignedForIOS))):
             var destinations: [Destination] = []
-            
+
             if devices.contains(.iphone) {
                 destinations.append(.iPhone)
             }
-            
+
             if devices.contains(.ipad) {
                 destinations.append(.iPad)
             }
-            
+
             if devices.contains(.mac) {
                 destinations.append(.macCatalyst)
             }
-            
+
             if devices.contains(.vision) {
                 destinations.append(.appleVisionWithiPadDesign)
             }
-            
+
             if supportsMacDesignedForIOS {
                 destinations.append(.macWithiPadDesign)
             }
-            
+
             return Set(destinations)
         case (.iOS, _): // an iOS platform, but `nil` deployment target.
             return .iOS

diff --git a/Sources/TuistDependencies/SwiftPackageManager/Utils/PackageInfoMapper.swift b/Sources/TuistDependencies/SwiftPackageManager/Utils/PackageInfoMapper.swift
@@ -255,7 +255,11 @@ public final class PackageInfoMapper: PackageInfoMapping {
                             case let .xcframework(path, platformFilters):
                                 return .xcframework(path: path, platformFilters: platformFilters)
                             case let .target(name, filters):
-                                return .project(target: name, path: Path(packageToFolder[packageInfo.key]!.pathString), platformFilters: filters)
+                                return .project(
+                                    target: name,
+                                    path: Path(packageToFolder[packageInfo.key]!.pathString),
+                                    platformFilters: filters
+                                )
                             case .externalTarget:
                                 throw PackageInfoMapperError.unknownProductTarget(
                                     package: packageInfo.key,

diff --git a/Sources/TuistGenerator/Generator/InfoPlistContentProvider.swift b/Sources/TuistGenerator/Generator/InfoPlistContentProvider.swift
@@ -231,7 +231,7 @@ final class InfoPlistContentProvider: InfoPlistContentProviding {
             "WKExtensionDelegateClassName": "$(PRODUCT_MODULE_NAME).ExtensionDelegate",
         ]
     }
-    
+
     /// Given a dictionary, it extends it with another dictionary.
     ///
     /// - Parameters:
@@ -240,7 +240,7 @@ final class InfoPlistContentProvider: InfoPlistContentProviding {
     fileprivate func extend(_ base: inout [String: Any], with: [String: Any]) {
         with.forEach { base[$0.key] = $0.value }
     }
-    
+
     private func hostTarget(for target: Target, in project: Project) -> Target? {
         project.targets.first {
             $0.dependencies.contains(where: { dependency in

diff --git a/Tests/TuistDependenciesTests/SwiftPackageManager/Utils/PackageInfoMapperTests.swift b/Tests/TuistDependenciesTests/SwiftPackageManager/Utils/PackageInfoMapperTests.swift
@@ -2988,7 +2988,7 @@ final class PackageInfoMapperTests: TuistUnitTestCase {
                 .test(
                     "Dependency1",
                     basePath: basePath,
-                    destinations:  [.iPhone, .iPad, .macWithiPadDesign, .appleVisionWithiPadDesign, .appleTv],
+                    destinations: [.iPhone, .iPad, .macWithiPadDesign, .appleVisionWithiPadDesign, .appleTv],
                     customProductName: "Dependency1",
                     customBundleID: "Dependency1",
                     deploymentTargets: .init(iOS: "11.0", tvOS: "11.0"),
@@ -3070,7 +3070,7 @@ final class PackageInfoMapperTests: TuistUnitTestCase {
                 .test(
                     "Target1",
                     basePath: basePath,
-                    destinations:  [.iPhone, .iPad, .macWithiPadDesign, .appleVisionWithiPadDesign, .appleTv],
+                    destinations: [.iPhone, .iPad, .macWithiPadDesign, .appleVisionWithiPadDesign, .appleTv],
                     customProductName: "Target1",
                     customBundleID: "Target1",
                     deploymentTargets: .init(iOS: "11.0", tvOS: "11.0"),

diff --git a/Tests/TuistGeneratorTests/ProjectMappers/ResourcesProjectMapperTests.swift b/Tests/TuistGeneratorTests/ProjectMappers/ResourcesProjectMapperTests.swift
@@ -65,7 +65,10 @@ final class ResourcesProjectMapperTests: TuistUnitTestCase {
         XCTAssertEqual(gotTarget.sources.first?.path, expectedPath)
         XCTAssertNotNil(gotTarget.sources.first?.contentHash)
         XCTAssertEqual(gotTarget.dependencies.count, 1)
-        XCTAssertEqual(gotTarget.dependencies.first, TargetDependency.target(name: "\(project.name)_\(target.name)", platformFilters: [.ios]))
+        XCTAssertEqual(
+            gotTarget.dependencies.first,
+            TargetDependency.target(name: "\(project.name)_\(target.name)", platformFilters: [.ios])
+        )
 
         let resourcesTarget = try XCTUnwrap(gotProject.targets.last)
         XCTAssertEqual(resourcesTarget.name, "\(project.name)_\(target.name)")
@@ -136,7 +139,10 @@ final class ResourcesProjectMapperTests: TuistUnitTestCase {
         XCTAssertEqual(gotTarget.sources.first?.path, expectedPath)
         XCTAssertNotNil(gotTarget.sources.first?.contentHash)
         XCTAssertEqual(gotTarget.dependencies.count, 1)
-        XCTAssertEqual(gotTarget.dependencies.first, TargetDependency.target(name: "\(project.name)_\(target.name)", platformFilters: [.ios]))
+        XCTAssertEqual(
+            gotTarget.dependencies.first,
+            TargetDependency.target(name: "\(project.name)_\(target.name)", platformFilters: [.ios])
+        )
 
         let resourcesTarget = try XCTUnwrap(gotProject.targets.last)
         XCTAssertEqual(resourcesTarget.name, "\(project.name)_\(target.name)")

diff --git a/Tests/TuistGraphTests/Models/TargetDependencyTests.swift b/Tests/TuistGraphTests/Models/TargetDependencyTests.swift
@@ -35,24 +35,24 @@ final class TargetDependencyTests: TuistUnitTestCase {
         // Then
         XCTAssertCodable(subject)
     }
-    
+
     func test_filtering() {
         let expected: PlatformFilters = [.macos]
-        
+
         let subjects: [TargetDependency] = [
             .framework(path: "/", status: .required, platformFilters: expected),
             .library(path: "/", publicHeaders: "/", swiftModuleMap: "/", platformFilters: expected),
             .sdk(name: "", status: .required, platformFilters: expected),
             .package(product: "", type: .plugin, platformFilters: expected),
             .target(name: "", platformFilters: expected),
             .xcframework(path: "/", status: .required, platformFilters: expected),
-            .project(target: "", path: "/", platformFilters: expected)
+            .project(target: "", path: "/", platformFilters: expected),
         ]
-        
+
         for subject in subjects {
             XCTAssertEqual(subject.platformFilters, expected)
             XCTAssertEqual(subject.withFilters([.catalyst]).platformFilters, Set([.catalyst]))
-        }  
+        }
     }
 
     func test_xctest_platformFilters_alwaysReturnAll() {

diff --git a/Tests/TuistLoaderTests/Extensions/TuistTestCase+ManifestMappers.swift b/Tests/TuistLoaderTests/Extensions/TuistTestCase+ManifestMappers.swift
@@ -265,7 +265,7 @@ private func == (
     _ lhs: TuistGraph.Destinations,
     _ rhs: ProjectDescription.Destinations
 ) -> Bool {
-    return lhs.map(\.rawValue).sorted() == rhs.map(\.rawValue).sorted()
+    lhs.map(\.rawValue).sorted() == rhs.map(\.rawValue).sorted()
 }
 
 private func == (

diff --git a/Tests/TuistLoaderTests/Models+ManifestMappers/DeploymentTargets+ManifestMapperTests.swift b/Tests/TuistLoaderTests/Models+ManifestMappers/DeploymentTargets+ManifestMapperTests.swift
@@ -6,9 +6,9 @@ import TuistGraphTesting
 import TuistSupport
 import XCTest
 
+@testable import ProjectDescription
 @testable import TuistLoader
 @testable import TuistSupportTesting
-@testable import ProjectDescription
 
 final class DeploymentTargetsManifestMapperTests: TuistUnitTestCase {
     func test_deploymentTarget() throws {