Skip to content

Commit d539e58

Browse files
committed
[PackageDescription] Add proper resources parameter in PackageDescription
The proposal was accepted so we can remove the underscore now. <rdar://problem/56589483>
1 parent 4030940 commit d539e58

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

Fixtures/Resources/Simple/Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ let package = Package(
66
targets: [
77
.target(
88
name: "SwiftyResource",
9-
__resources: [
9+
resources: [
1010
.copy("foo.txt"),
1111
]
1212
),
1313

1414
.target(
1515
name: "SeaResource",
16-
__resources: [
16+
resources: [
1717
.copy("foo.txt"),
1818
]
1919
),

Sources/PackageDescription/Target.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,7 @@ public final class Target {
350350
path: String? = nil,
351351
exclude: [String] = [],
352352
sources: [String]? = nil,
353-
// FIXME: Underscored until the evolution process is finished.
354-
__resources: [Resource]? = nil,
353+
resources: [Resource]? = nil,
355354
publicHeadersPath: String? = nil,
356355
cSettings: [CSetting]? = nil,
357356
cxxSettings: [CXXSetting]? = nil,
@@ -364,7 +363,7 @@ public final class Target {
364363
path: path,
365364
exclude: exclude,
366365
sources: sources,
367-
resources: __resources,
366+
resources: resources,
368367
publicHeadersPath: publicHeadersPath,
369368
type: .regular,
370369
cSettings: cSettings,

Tests/PackageLoadingTests/PD5LoadingTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ class PackageDescription5LoadingTests: PackageDescriptionLoadingTests {
395395
targets: [
396396
.target(
397397
name: "Foo",
398-
__resources: [
398+
resources: [
399399
.copy("foo.txt"),
400400
.process("bar.txt"),
401401
]

0 commit comments

Comments
 (0)