Skip to content

Commit d1d04e8

Browse files
0111byonaskolb
andauthored
Update package version (#1489)
* Require swift tools version 5.9 * Update changelog * Use github workflow --------- Co-authored-by: Yonas Kolb <yonaskolb@users.noreply.github.com>
1 parent 05c36c3 commit d1d04e8

3 files changed

Lines changed: 48 additions & 44 deletions

File tree

.github/workflows/ci.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,26 @@ jobs:
88
name: Xcode ${{ matrix.xcode }}
99
strategy:
1010
matrix:
11-
xcode: ["14.3.1"]
11+
xcode: ["15.3"]
1212
include:
13-
- xcode: "14.3.1"
14-
macos: macos-13
13+
- xcode: "15.3"
14+
macos: macos-14
1515
env:
1616
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
1717
steps:
18-
- uses: actions/checkout@master
19-
- name: Resolve
20-
run: swift package resolve
21-
- name: Build
22-
run: swift build
23-
- name: Test
24-
run: set -o pipefail && swift test 2>&1 | xcpretty
25-
- name: Gen fixtures
26-
run: scripts/gen-fixtures.sh
27-
- name: Check fixtures
28-
run: scripts/diff-fixtures.sh
29-
- name: Build fixtures
30-
run: scripts/build-fixtures.sh
18+
- uses: actions/checkout@master
19+
- name: Resolve
20+
run: swift package resolve
21+
- name: Build
22+
run: swift build
23+
- name: Test
24+
run: set -o pipefail && swift test 2>&1 | xcpretty
25+
- name: Gen fixtures
26+
run: scripts/gen-fixtures.sh
27+
- name: Check fixtures
28+
run: scripts/diff-fixtures.sh
29+
- name: Build fixtures
30+
run: scripts/build-fixtures.sh
3131
run-linux:
3232
runs-on: ubuntu-latest
3333
name: Linux

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## Next Version
44

5+
### Fixed
6+
7+
- Require swift-tools-version 5.9. #1489 @0111b
8+
59
## 2.42.0
610

711
### Added

Package.swift

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

33
import PackageDescription
44

@@ -24,69 +24,69 @@ let package = Package(
2424
targets: [
2525
.executableTarget(name: "XcodeGen", dependencies: [
2626
"XcodeGenCLI",
27-
"Version",
27+
.product(name: "Version", package: "Version"),
2828
]),
2929
.target(name: "XcodeGenCLI", dependencies: [
3030
"XcodeGenKit",
3131
"ProjectSpec",
32-
"SwiftCLI",
33-
"Rainbow",
34-
"PathKit",
35-
"Version",
32+
.product(name: "SwiftCLI", package: "SwiftCLI"),
33+
.product(name: "Rainbow", package: "Rainbow"),
34+
.product(name: "PathKit", package: "PathKit"),
35+
.product(name: "Version", package: "Version"),
3636
]),
3737
.target(name: "XcodeGenKit", dependencies: [
3838
"ProjectSpec",
39-
"JSONUtilities",
40-
"XcodeProj",
41-
"PathKit",
39+
.product(name: "JSONUtilities", package: "JSONUtilities"),
40+
.product(name: "XcodeProj", package: "XcodeProj"),
41+
.product(name: "PathKit", package: "PathKit"),
4242
"XcodeGenCore",
4343
], resources: [
4444
.copy("SettingPresets")
4545
]),
4646
.target(name: "ProjectSpec", dependencies: [
47-
"JSONUtilities",
48-
"XcodeProj",
49-
"Yams",
47+
.product(name: "JSONUtilities", package: "JSONUtilities"),
48+
.product(name: "XcodeProj", package: "XcodeProj"),
49+
.product(name: "Yams", package: "yams"),
5050
"XcodeGenCore",
51-
"Version",
51+
.product(name: "Version", package: "Version"),
5252
]),
5353
.target(name: "XcodeGenCore", dependencies: [
54-
"PathKit",
55-
"Yams",
54+
.product(name: "PathKit", package: "PathKit"),
55+
.product(name: "Yams", package: "yams"),
5656
]),
5757
.target(name: "TestSupport", dependencies: [
58-
"XcodeProj",
59-
"Spectre",
60-
"PathKit",
58+
.product(name: "XcodeProj", package: "XcodeProj"),
59+
.product(name: "Spectre", package: "Spectre"),
60+
.product(name: "PathKit", package: "PathKit"),
6161
]),
6262
.testTarget(name: "XcodeGenKitTests", dependencies: [
6363
"XcodeGenKit",
64-
"Spectre",
65-
"PathKit",
64+
.product(name: "Spectre", package: "Spectre"),
65+
.product(name: "PathKit", package: "PathKit"),
6666
"TestSupport",
6767
]),
6868
.testTarget(name: "FixtureTests", dependencies: [
6969
"XcodeGenKit",
70-
"Spectre",
71-
"PathKit",
70+
.product(name: "Spectre", package: "Spectre"),
71+
.product(name: "PathKit", package: "PathKit"),
7272
"TestSupport",
7373
]),
7474
.testTarget(name: "XcodeGenCoreTests", dependencies: [
7575
"XcodeGenCore",
76-
"Spectre",
77-
"PathKit",
76+
.product(name: "Spectre", package: "Spectre"),
77+
.product(name: "PathKit", package: "PathKit"),
7878
"TestSupport",
7979
]),
8080
.testTarget(name: "ProjectSpecTests", dependencies: [
8181
"ProjectSpec",
82-
"Spectre",
83-
"PathKit",
82+
.product(name: "Spectre", package: "Spectre"),
83+
.product(name: "PathKit", package: "PathKit"),
8484
"TestSupport",
8585
]),
8686
.testTarget(name: "PerformanceTests", dependencies: [
8787
"XcodeGenKit",
88-
"Spectre",
89-
"PathKit",
88+
.product(name: "Spectre", package: "Spectre"),
89+
.product(name: "PathKit", package: "PathKit"),
9090
"TestSupport",
9191
]),
9292
]

0 commit comments

Comments
 (0)