Skip to content

Commit 430cbd1

Browse files
authored
Bump Swift version, dependencies (#166)
Notably: - Build xtool with Swift 6.2 - Resolve GHSA-xvr7-p2c6-j83w. That advisory shouldn't really affect us since we don't use NIO as a server but good hygiene anyway.
1 parent c303e27 commit 430cbd1

8 files changed

Lines changed: 101 additions & 77 deletions

File tree

.github/workflows/build.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,18 @@ jobs:
2222
uses: actions/checkout@v4
2323
- name: Build
2424
run: |
25-
docker compose run --build --rm xtool swift build --product xtool
25+
docker compose run --build --rm xtool bash -c \
26+
"swift build --product xtool && .build/debug/xtool --help"
2627
build-macos:
27-
runs-on: macos-15
28+
runs-on: macos-26
2829
steps:
2930
- name: Checkout
3031
uses: actions/checkout@v4
3132
- name: Build
3233
run: |
33-
swift build --product xtool
34+
swift build --product xtool && .build/debug/xtool --help
3435
build-ios:
35-
runs-on: macos-15
36+
runs-on: macos-26
3637
steps:
3738
- name: Checkout
3839
uses: actions/checkout@v4

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
Linux/packages/xtool-${{ matrix.host.arch }}.AppImage
3333
Linux/packages/xtool-${{ matrix.host.arch }}.AppImage.zsync
3434
build-mac:
35-
runs-on: macos-15
35+
runs-on: macos-26
3636
permissions:
3737
contents: write
3838
steps:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Note: We use 22.04 since AppImage recommends building on the
22
# oldest configuration that you support
33

4-
FROM swift:6.1-jammy AS build-base
4+
FROM swift:6.2-jammy AS build-base
55

66
RUN apt-get update \
77
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \

Documentation/xtool.docc/Installation-Linux.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ Once you install WSL, you'll also need to set up USB passthrough. See Microsoft'
1616

1717
### Swift
1818

19-
Install the Swift 6.1 toolchain for your Linux distribution from <https://swift.org/install/linux>.
19+
Install the Swift 6.2 toolchain for your Linux distribution from <https://swift.org/install/linux>.
2020

2121
After following the steps there, confirm that Swift is installed correctly:
2222

2323
```bash
2424
swift --version
2525
# should say something like:
26-
# Swift version 6.1 (swift-6.1-RELEASE)
26+
# Swift version 6.2 (swift-6.2-RELEASE)
2727
```
2828

2929
### usbmuxd
@@ -62,7 +62,7 @@ sudo apt-get install usbmuxd
6262
6363
### Xcode.xip
6464
65-
Download **Xcode 16.3** from <https://developer.apple.com/services-account/download?path=/Developer_Tools/Xcode_16.3/Xcode_16.3.xip>. Note the path where `Xcode_16.3.xip` is saved.
65+
Download **Xcode 26** from <https://download.developer.apple.com/Developer_Tools/Xcode_26.0.1/Xcode_26.0.1_Apple_silicon.xip>. Note the path where `Xcode_26.0.1_Apple_silicon.xip` is saved.
6666
6767
> Note:
6868
>

0 commit comments

Comments
 (0)