Skip to content

Commit 20c28c6

Browse files
mateuszmackowiak1ec5
authored andcommitted
SPM 5.3 resource support
1 parent 27e03e4 commit 20c28c6

File tree

5 files changed

+1446
-1455
lines changed

5 files changed

+1446
-1455
lines changed

.swiftpm/xcode/xcshareddata/xcschemes/Solar.xcscheme

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,6 @@
2020
ReferencedContainer = "container:">
2121
</BuildableReference>
2222
</BuildActionEntry>
23-
<BuildActionEntry
24-
buildForTesting = "YES"
25-
buildForRunning = "YES"
26-
buildForProfiling = "NO"
27-
buildForArchiving = "NO"
28-
buildForAnalyzing = "YES">
29-
<BuildableReference
30-
BuildableIdentifier = "primary"
31-
BlueprintIdentifier = "Solar Tests"
32-
BuildableName = "Solar Tests"
33-
BlueprintName = "Solar Tests"
34-
ReferencedContainer = "container:">
35-
</BuildableReference>
36-
</BuildActionEntry>
3723
</BuildActionEntries>
3824
</BuildAction>
3925
<TestAction
@@ -46,9 +32,9 @@
4632
skipped = "NO">
4733
<BuildableReference
4834
BuildableIdentifier = "primary"
49-
BlueprintIdentifier = "Solar Tests"
50-
BuildableName = "Solar Tests"
51-
BlueprintName = "Solar Tests"
35+
BlueprintIdentifier = "SolarTests"
36+
BuildableName = "SolarTests"
37+
BlueprintName = "SolarTests"
5238
ReferencedContainer = "container:">
5339
</BuildableReference>
5440
</TestableReference>

Package.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.2
1+
// swift-tools-version:5.3
22
// The swift-tools-version declares the minimum version of Swift required to build this package.
33

44
import PackageDescription
@@ -11,7 +11,7 @@ let package = Package(
1111
],
1212
dependencies: [],
1313
targets: [
14-
.target(name: "Solar", path: "Solar"),
15-
.testTarget(name: "Solar Tests", dependencies: ["Solar"], path: "Solar iOSTests"),
14+
.target(name: "Solar", path: "Solar", exclude: ["Info-iOS.plist", "Info-watchOS.plist"]),
15+
.testTarget(name: "SolarTests", dependencies: ["Solar"], path: "Solar iOSTests", exclude: ["Info.plist"], resources: [.copy("CorrectResults.json")]),
1616
]
1717
)

Solar.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
14456B821EF96AA500D76A4D /* Resources */ = {
143143
isa = PBXGroup;
144144
children = (
145-
4F334845248D905B00BAAD4E /* CorrectResults.swift */,
145+
4F1E608F25631120003F4E68 /* CorrectResults.json */,
146146
14456B8A1EF96AD900D76A4D /* Info.plist */,
147147
);
148148
name = Resources;
@@ -430,6 +430,7 @@
430430
isa = PBXResourcesBuildPhase;
431431
buildActionMask = 2147483647;
432432
files = (
433+
4F1E609025631120003F4E68 /* CorrectResults.json in Resources */,
433434
);
434435
runOnlyForDeploymentPostprocessing = 0;
435436
};
@@ -515,7 +516,6 @@
515516
buildActionMask = 2147483647;
516517
files = (
517518
F7FC5B661D469B4E00C4D3EB /* Solar.swift in Sources */,
518-
4F334846248D905C00BAAD4E /* CorrectResults.swift in Sources */,
519519
);
520520
runOnlyForDeploymentPostprocessing = 0;
521521
};

0 commit comments

Comments
 (0)