Skip to content

Commit 22c92e1

Browse files
Merge branch 'release/6.0.0'
2 parents 89e8d10 + 9188a8d commit 22c92e1

File tree

11 files changed

+383
-198
lines changed

11 files changed

+383
-198
lines changed

.setup/Setup/main.swift

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ print("--- BEGIN of '\(Executable.name)' script ---")
1111

1212
// MARK: Parameters
1313

14-
Spec.BuildSettings.swiftVersion.value = "5.3"
14+
Spec.BuildSettings.swiftVersion.value = "5.9"
1515

1616
let localRepo = try Spec.LocalRepo.current()
1717

@@ -32,7 +32,7 @@ let company = (
3232

3333
let project = (
3434
name: remoteRepo.name,
35-
summary: "Lightweight HTTP-based API client",
35+
summary: "Lightweight URLSession-based HTTP API client",
3636
copyrightYear: 2016
3737
)
3838

@@ -57,11 +57,6 @@ let targetNames: PerSubSpec = (
5757
productName + subSpecs.tests
5858
)
5959

60-
let sourcesLocations: PerSubSpec = (
61-
Spec.Locations.sources + subSpecs.core,
62-
Spec.Locations.tests + subSpecs.tests
63-
)
64-
6560
// MARK: Parameters - Summary
6661

6762
localRepo.report()
@@ -163,15 +158,13 @@ try CustomTextFile("""
163158
],
164159
targets: [
165160
.target(
166-
name: "\(targetNames.core)",
167-
path: "\(sourcesLocations.core)"
161+
name: "\(targetNames.core)"
168162
),
169163
.testTarget(
170164
name: "\(targetNames.tests)",
171165
dependencies: [
172166
"\(targetNames.core)"
173-
],
174-
path: "\(sourcesLocations.tests)"
167+
]
175168
),
176169
]
177170
)

Package.swift

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.3
1+
// swift-tools-version:5.9
22

33
import PackageDescription
44

@@ -14,15 +14,13 @@ let package = Package(
1414
],
1515
targets: [
1616
.target(
17-
name: "XCEAPIClient",
18-
path: "Sources/Core"
17+
name: "XCEAPIClient"
1918
),
2019
.testTarget(
2120
name: "XCEAPIClientAllTests",
2221
dependencies: [
2322
"XCEAPIClient"
24-
],
25-
path: "Tests/AllTests"
23+
]
2624
),
2725
]
28-
)
26+
)

0 commit comments

Comments
 (0)