Skip to content

Commit 34fe73f

Browse files
jkmasselclaude
andcommitted
Fix type-checker timeout in Modules/Package.swift
Add explicit `as [Target.Dependency]` annotations to the larger dependency arrays. This helps the Swift compiler type-check the Package() expression within its time limit after the addition of WordPressSharedUI and WordPressSharedObjCUI targets. Co-Authored-By: Claude Opus 4.6 <[email protected]>
1 parent 5f8f440 commit 34fe73f

File tree

108 files changed

+137
-16
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+137
-16
lines changed

Modules/Package.resolved

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Modules/Package.swift

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ let package = Package(
7474
"WordPressSharedUI",
7575
.product(name: "Gridicons", package: "Gridicons-iOS"),
7676
.product(name: "Aztec", package: "AztecEditor-iOS"),
77-
], swiftSettings: [.swiftLanguageMode(.v5)]),
77+
] as [Target.Dependency], swiftSettings: [.swiftLanguageMode(.v5)]),
7878
.target(name: "BuildSettingsKit"),
7979
.target(
8080
name: "DesignSystem",
@@ -94,7 +94,7 @@ let package = Package(
9494
// TODO: Remove — It's here just for a NSMutableParagraphStyle init helper
9595
"WordPressKit",
9696
.product(name: "Gridicons", package: "Gridicons-iOS"),
97-
],
97+
] as [Target.Dependency],
9898
// Set to v5 to avoid @Sendable warnings and errors
9999
swiftSettings: [.swiftLanguageMode(.v5)]
100100
),
@@ -126,7 +126,7 @@ let package = Package(
126126
// in SharedCoreDataStack.o
127127
.product(name: "CocoaLumberjack", package: "CocoaLumberjack"),
128128
.product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
129-
],
129+
] as [Target.Dependency],
130130
resources: [.process("Resources/Extensions.xcdatamodeld")]
131131
),
132132
.target(
@@ -176,8 +176,8 @@ let package = Package(
176176
.target(
177177
name: "WordPressSharedObjCUI",
178178
dependencies: ["WordPressSharedObjC"],
179-
publicHeadersPath: "include",
180179
resources: [.process("Resources")],
180+
publicHeadersPath: "include",
181181
swiftSettings: [.swiftLanguageMode(.v5)]
182182
),
183183
.target(
@@ -187,7 +187,8 @@ let package = Package(
187187
.product(name: "SwiftSoup", package: "SwiftSoup"),
188188
.target(name: "SFHFKeychainUtils"),
189189
.target(name: "WordPressSharedObjC"),
190-
],
190+
.target(name: "WordPressSharedObjCUI"),
191+
] as [Target.Dependency],
191192
resources: [.process("Resources")],
192193
swiftSettings: [.swiftLanguageMode(.v5)]
193194
),
@@ -209,7 +210,7 @@ let package = Package(
209210
"WordPressLegacy",
210211
.product(name: "ColorStudio", package: "color-studio"),
211212
.product(name: "Reachability", package: "Reachability"),
212-
],
213+
] as [Target.Dependency],
213214
resources: [.process("Resources")],
214215
swiftSettings: [.swiftLanguageMode(.v5)]
215216
),
@@ -233,11 +234,11 @@ let package = Package(
233234
"wpxmlrpc",
234235
"WordPressKitModels",
235236
"WordPressKitObjCUtils",
236-
],
237+
] as [Target.Dependency],
237238
publicHeadersPath: "include",
238239
cSettings: [
239240
.define("NS_BLOCK_ASSERTIONS", to: "1", .when(configuration: .release))
240-
],
241+
]
241242
),
242243
.target(
243244
name: "WordPressKit",
@@ -248,7 +249,7 @@ let package = Package(
248249
"NSObject-SafeExpectations",
249250
"WordPressShared",
250251
"wpxmlrpc",
251-
],
252+
] as [Target.Dependency],
252253
swiftSettings: [.swiftLanguageMode(.v5)]
253254
),
254255
.target(
@@ -270,9 +271,9 @@ let package = Package(
270271
.target(name: "WordPressTesting"),
271272
.product(name: "OHHTTPStubsSwift", package: "OHHTTPStubs")
272273
]),
273-
.testTarget(name: "WordPressSharedTests", dependencies: [.target(name: "WordPressShared")], swiftSettings: [.swiftLanguageMode(.v5)]),
274-
.testTarget(name: "WordPressSharedObjCTests", dependencies: [.target(name: "WordPressShared"), .target(name: "WordPressTesting")], swiftSettings: [.swiftLanguageMode(.v5)]),
275-
.testTarget(name: "WordPressUIUnitTests", dependencies: [.target(name: "WordPressUI")], swiftSettings: [.swiftLanguageMode(.v5)]),
274+
.testTarget(name: "WordPressSharedTests", dependencies: [.target(name: "WordPressShared"), .target(name: "WordPressSharedUI")], swiftSettings: [.swiftLanguageMode(.v5)]),
275+
.testTarget(name: "WordPressSharedObjCTests", dependencies: [.target(name: "WordPressShared"), .target(name: "WordPressSharedObjCUI"), .target(name: "WordPressTesting")], swiftSettings: [.swiftLanguageMode(.v5)]),
276+
.testTarget(name: "WordPressUIUnitTests", dependencies: [.target(name: "WordPressUI"), .target(name: "WordPressSharedUI")], swiftSettings: [.swiftLanguageMode(.v5)]),
276277
.testTarget(name: "WordPressCoreTests", dependencies: [.target(name: "WordPressCore")]),
277278
.testTarget(name: "WordPressIntelligenceTests", dependencies: [.target(name: "WordPressIntelligence")])
278279
]

Modules/Sources/WordPressKit/GravatarServiceRemote.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
import Foundation
2+
#if canImport(UIKit)
3+
import UIKit
4+
#endif
25

36
/// This ServiceRemote encapsulates all of the interaction with the Gravatar endpoint.
47
///

Modules/Sources/WordPressShared/Reachability/ReachabilityUtils.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ public class ReachabilityUtils: NSObject {
2323
)
2424
}
2525

26-
2726
public static func configure(
2827
notificationCenter: NotificationCenter = .default,
2928
reachability: Reachability? = .forInternetConnection()

Modules/Sources/WordPressShared/Utility/Double+Stats.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
import Foundation
2+
#if canImport(UIKit)
3+
import UIKit
4+
#endif
25

36
fileprivate struct Unit {
47
let abbreviationFormat: String
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
@_exported import WordPressSharedObjC
2+
#if canImport(UIKit)
3+
@_exported import WordPressSharedObjCUI
4+
#endif

Modules/Tests/WordPressSharedObjCTests/PhotonImageURLHelperTest.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#import <XCTest/XCTest.h>
2-
#import "PhotonImageURLHelper.h"
2+
@import WordPressSharedObjCUI;
33

44
@interface PhotonImageURLHelperTest : XCTestCase
55

Modules/Tests/WordPressSharedTests/RichContentFormatterTests.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import XCTest
22
@testable import WordPressShared
3+
@testable import WordPressSharedUI
34

45
class RichContentFormatterTests: XCTestCase {
56

Modules/Tests/WordPressSharedTests/WPUserAgentTests.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import Foundation
22
import Testing
33
import WebKit
44
import WordPressShared
5+
import WordPressSharedUI
56

67
class WPWPUserAgentTests {
78

Modules/Tests/WordPressUIUnitTests/Extensions/UIImage+ScaleTests.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import Testing
22
import WordPressUI
3+
import WordPressSharedUI
34

45
struct UIImageScaleTests {
56

0 commit comments

Comments
 (0)