Skip to content

Commit 14af844

Browse files
committed
fix: Remove guard against Swift 6.1: directoryURL doesn't seem to have been added
1 parent eaaed64 commit 14af844

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

Plugins/MetaProtocolCodable/SourceTarget/SwiftPackageTarget.swift

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import Foundation
22
import PackagePlugin
33

4+
45
/// Represents an SwiftPM target.
56
///
67
/// Uses `SourceModuleTarget` to provide conformances.
@@ -12,9 +13,8 @@ struct SwiftPackageTarget {
1213
}
1314

1415
/// This is a workaround because PackageDescription.Target.directoryURL will not be available until version 6.1
15-
/// See: https://github.com/swiftlang/swift-package-manager/blob/735ddd97fa651729921315c8e46bd790429362cb/Sources/PackagePlugin/PackageModel.swift#L184-L186///
16-
#if swift(<6.1)
17-
extension Target {
16+
/// See: https://github.com/swiftlang/swift-package-manager/blob/735ddd97fa651729921315c8e46bd790429362cb/Sources/PackagePlugin/PackageModel.swift#L184-L186
17+
extension PackagePlugin.Target {
1818
var directoryURL: URL {
1919
#if swift(<6)
2020
// No `directoryURL` but `Path` is not deprecated yet
@@ -32,8 +32,6 @@ extension Target {
3232
#endif
3333
}
3434
}
35-
#endif
36-
3735

3836
extension SwiftPackageTarget: MetaProtocolCodableSourceTarget {
3937
/// The name of the module produced
@@ -89,6 +87,7 @@ extension SwiftPackageTarget: MetaProtocolCodableSourceTarget {
8987
func configPath(named name: String) throws -> String? {
9088
let fileManager = FileManager.default
9189
let directory = module.directoryURL
90+
// let directory = URL(string: module.directory.string)!
9291
let contents = try fileManager.contentsOfDirectory(at: directory, includingPropertiesForKeys: nil)
9392
let file = contents.first { file in
9493
return name.lowercased()

0 commit comments

Comments
 (0)