mirror of
https://github.com/xtool-org/xtool.git
synced 2026-11-21 02:41:46 +03:00
Compare commits
2 Commits
@@ -1,8 +0,0 @@
|
||||
*
|
||||
!/Package.swift
|
||||
!/Package.resolved
|
||||
!/Sources
|
||||
!/Tests
|
||||
!/Linux
|
||||
/Linux/packages
|
||||
/Linux/staging
|
||||
@@ -1,17 +0,0 @@
|
||||
## What does this PR do?
|
||||
|
||||
<!-- Focus on *what* the PR does in essence. The *how* should come second, if it's relevant. -->
|
||||
|
||||
## How was it tested?
|
||||
|
||||
<!-- e.g. Ran locally on macOS and added unit tests -->
|
||||
|
||||
## AI tool usage
|
||||
|
||||
How much of this PR was AI-assisted? (check one)
|
||||
|
||||
- [ ] **0** - No AI was used to write code
|
||||
- [ ] **1** - I was assisted by AI. I reviewed the finished result.
|
||||
- [ ] **2** - I set the AI going and left it to it; nobody has read the result - no review, or AI review only
|
||||
|
||||
<!-- If an AI agent is filling this in: declare the level honestly, and open as a draft if it is #2. Do not lower the declared level to get the PR reviewed. -->
|
||||
@@ -1,9 +0,0 @@
|
||||
name: 'Configure Xcode'
|
||||
description: 'Set up Xcode version'
|
||||
runs:
|
||||
using: composite
|
||||
steps:
|
||||
- name: Set up Xcode
|
||||
shell: bash
|
||||
run: |
|
||||
sudo xcode-select -s /Applications/Xcode_27.1.0.app
|
||||
+13
-21
@@ -6,8 +6,6 @@ on:
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
env:
|
||||
XTL_CI: "1"
|
||||
jobs:
|
||||
build-linux:
|
||||
strategy:
|
||||
@@ -21,29 +19,23 @@ jobs:
|
||||
runs-on: ${{ matrix.host.runner }}
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6
|
||||
- name: Build and test
|
||||
run: |
|
||||
docker compose run --build -e XTL_CI=1 xtool bash -c \
|
||||
"swift build --product xtool && .build/debug/xtool --help && swift test"
|
||||
build-macos:
|
||||
runs-on: xcode-27
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6
|
||||
- uses: ./.github/actions/configure-xcode
|
||||
uses: actions/checkout@v4
|
||||
- name: Build
|
||||
run: |
|
||||
swift build --product xtool && .build/debug/xtool --help
|
||||
- name: Run tests
|
||||
run: |
|
||||
swift test
|
||||
build-ios:
|
||||
runs-on: xcode-27
|
||||
docker compose run --build --rm xtool swift build --product xtool
|
||||
build-macos:
|
||||
runs-on: macos-15
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6
|
||||
- uses: ./.github/actions/configure-xcode
|
||||
uses: actions/checkout@v4
|
||||
- name: Build
|
||||
run: |
|
||||
swift build --product xtool
|
||||
build-ios:
|
||||
runs-on: macos-15
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
- name: Build
|
||||
run: |
|
||||
set -o pipefail \
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
pull_request:
|
||||
concurrency:
|
||||
group: integration-${{ github.workflow }}-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
jobs:
|
||||
integration-test-linux:
|
||||
# https://github.com/xtool-org/mac-actions-runner
|
||||
runs-on: ubuntu-on-macos
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6
|
||||
- name: Run integration tests
|
||||
run: |
|
||||
./integration-tests/run.sh
|
||||
@@ -3,9 +3,6 @@ on:
|
||||
tags:
|
||||
- "*"
|
||||
|
||||
env:
|
||||
XTL_CI: "1"
|
||||
|
||||
jobs:
|
||||
build-linux:
|
||||
strategy:
|
||||
@@ -21,28 +18,26 @@ jobs:
|
||||
contents: write
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6
|
||||
uses: actions/checkout@v4
|
||||
- name: Build
|
||||
run: |
|
||||
docker compose run --build \
|
||||
-e XTOOL_VERSION=${{ github.ref_name }} \
|
||||
-e XTL_CI=1 \
|
||||
--rm xtool Linux/build.sh
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v7
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: xtool-${{ matrix.host.arch }}
|
||||
path: |
|
||||
Linux/packages/xtool-${{ matrix.host.arch }}.AppImage
|
||||
Linux/packages/xtool-${{ matrix.host.arch }}.AppImage.zsync
|
||||
build-mac:
|
||||
runs-on: xcode-27
|
||||
runs-on: macos-15
|
||||
permissions:
|
||||
contents: write
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6
|
||||
- uses: ./.github/actions/configure-xcode
|
||||
uses: actions/checkout@v4
|
||||
- name: Setup Ruby
|
||||
uses: ruby/setup-ruby@v1
|
||||
with:
|
||||
@@ -57,11 +52,10 @@ jobs:
|
||||
DEVELOPMENT_TEAM: ${{ secrets.DEVELOPMENT_TEAM }}
|
||||
XTOOL_VERSION: ${{ github.ref_name }}
|
||||
run: |
|
||||
brew install -y xcodegen
|
||||
cd macOS
|
||||
bundle exec fastlane package
|
||||
- name: Upload artifacts
|
||||
uses: actions/upload-artifact@v7
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: xtool-mac
|
||||
path: |
|
||||
@@ -75,9 +69,9 @@ jobs:
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
- uses: actions/checkout@v4
|
||||
- name: Download artifact
|
||||
uses: actions/download-artifact@v8
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
pattern: xtool-*
|
||||
path: output
|
||||
@@ -86,24 +80,3 @@ jobs:
|
||||
TAG="${{ github.ref_name }}"
|
||||
gh release create "$TAG" --draft --title "v$TAG"
|
||||
gh release upload "$TAG" output/**/*.{AppImage,AppImage.zsync,app.zip,app.dSYM.zip}
|
||||
docker:
|
||||
uses: docker/github-builder/.github/workflows/build.yml@v1
|
||||
permissions:
|
||||
contents: read # to fetch the repository content
|
||||
id-token: write # for signing attestations and cache entries with GitHub OIDC
|
||||
packages: write # to push built images to GitHub Container Registry
|
||||
with:
|
||||
build-args: |
|
||||
XTL_CI=1
|
||||
output: image
|
||||
push: true
|
||||
platforms: linux/amd64,linux/arm64
|
||||
meta-images: |
|
||||
ghcr.io/xtool-org/xtool
|
||||
meta-tags: |
|
||||
type=semver,pattern={{version}}
|
||||
secrets:
|
||||
registry-auths: |
|
||||
- registry: ghcr.io
|
||||
username: ${{ github.actor }}
|
||||
password: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
@@ -11,7 +11,7 @@ jobs:
|
||||
swiftlint:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
- uses: actions/checkout@v4
|
||||
- name: Lint
|
||||
run: |
|
||||
make lint SWIFTLINT_FLAGS='--reporter=github-actions-logging' | tee swiftlint.log
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
{
|
||||
"swiftPM": {
|
||||
"buildSystem": "swiftbuild",
|
||||
"scratchPath": ".build/index-build"
|
||||
},
|
||||
"backgroundIndexing": true
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
swiftlint_version: 0.65.1
|
||||
swiftlint_version: 0.59.1
|
||||
disabled_rules:
|
||||
- trailing_comma
|
||||
- nesting
|
||||
|
||||
Vendored
-10
@@ -1,13 +1,3 @@
|
||||
{
|
||||
"swiftlint.path": "./.tmp/swiftlint/swiftlint",
|
||||
"files.watcherExclude":{
|
||||
"*/.git/**": true,
|
||||
"*/.build/**": true,
|
||||
"*/.tmp/**": true,
|
||||
},
|
||||
"search.exclude": {
|
||||
"*/.git/**": true,
|
||||
"*/.build/**": true,
|
||||
"*/.tmp/**": true,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
# About
|
||||
|
||||
xtool is a cross-platform replacement for Xcode (including build system, provisioning, deployment).
|
||||
|
||||
The `xtool` CLI supports macOS, Linux, WSL. The lower-level XKit (provisioning and device interaction) library additionally supports iOS.
|
||||
|
||||
## Development
|
||||
|
||||
- The majority of the code is in the Swift Package. You can use `swift build` / `swift test` / etc for iteration.
|
||||
- Caveat: on macOS, xtool is distributed as an app bundle (allows entitlements like Keychain). To build the Mac app, use `make mac`. You can then invoke the CLI at `./macOS/Build/xtool`.
|
||||
- Make sure to run `make lint` (swiftlint) when you're done
|
||||
|
||||
## Conventions
|
||||
|
||||
- Use modern Swift 6. Strict concurrency is enabled.
|
||||
- Use swift-dependencies for Dependency Injection. Passing dependencies around as arguments is an anti-pattern.
|
||||
+21
-8
@@ -4,15 +4,28 @@
|
||||
|
||||
We welcome all bug reports and feature requests! Please create a [new issue](https://github.com/xtool-org/xtool/issues/new/choose) via GitHub.
|
||||
|
||||
## Code and documentation
|
||||
## Documentation
|
||||
|
||||
External contributions are very welcome. Take a look at [/Documentation/Contributing/README.md](/Documentation/Contributing/README.md) for details regarding the development process.
|
||||
The xtool documentation at <https://xtool.sh> is built with [swift-docc](https://github.com/swiftlang/swift-docc) and resides at [Documentation/xtool.docc](/Documentation/xtool.docc). It's hosted on Netlify, the configuration for which is in [netlify.toml](/netlify.toml).
|
||||
|
||||
## AI tool usage
|
||||
When editing the DocC bundle, you can preview it with `make docs-preview`.
|
||||
|
||||
You may use AI tools to assist your contributions. You are fully responsible
|
||||
for everything you submit.
|
||||
Once you make a pull request with your changes, we'll also generate a [Netlify Deploy Preview](https://docs.netlify.com/site-deploys/deploy-previews/) under your pull request. You can open this preview to see how the changes will look in production.
|
||||
|
||||
- **Understand it**: You must be able to explain every line of your code.
|
||||
- **Disclose it**: Pick an AI assistance level (0/1/2) in the PR template.
|
||||
- **Own it**: You are the author. If a reviewer asks "why?", you answer - not the AI. [Don't be a meat proxy.](https://dontbeameatproxy.com)
|
||||
## Code
|
||||
|
||||
When making code changes, please make sure to test them on both macOS and Linux if possible. If you can also test on Windows with WSL, that is ideal.
|
||||
|
||||
To build xtool for debugging, run `make` in the project directory. There are a few considerations depending on your host OS:
|
||||
|
||||
### macOS
|
||||
|
||||
On macOS, you'll firstly need to have Xcode set up.
|
||||
|
||||
The first time you run `make`, we'll try to detect your codesigning identity. If you have multiple, you'll see an interactive prompt to select the team you want to use. The team ID is saved to `./macOS/Support/Private-Team.xcconfig`. You can run `make team` to update it (or do so by hand).
|
||||
|
||||
After building, a symlink to the product will be created at `./macOS/Build/xtool`. We generate an Xcode project at `./macOS/XToolMac.xcodeproj` that you can open in order to work in Xcode.
|
||||
|
||||
### Linux
|
||||
|
||||
You need to have a few dependencies on Linux; see [Dockerfile](/Dockerfile) for specifics. It's often easiest to develop within Docker itself: see [Linux/README.md](/Linux/README.md) for details.
|
||||
|
||||
+18
-34
@@ -1,9 +1,7 @@
|
||||
# Note: We use 22.04 since AppImage recommends building on the
|
||||
# oldest configuration that you support
|
||||
|
||||
ARG SWIFT_VERSION=6.4.1
|
||||
|
||||
FROM swift:${SWIFT_VERSION}-jammy AS build-base
|
||||
FROM swift:6.1-jammy AS build-base
|
||||
|
||||
RUN apt-get update \
|
||||
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
|
||||
@@ -68,13 +66,23 @@ RUN cd libimobiledevice \
|
||||
&& make install DESTDIR=/prefix
|
||||
|
||||
|
||||
FROM build-base AS build-xtool-base
|
||||
FROM build-base AS build-xadi
|
||||
|
||||
RUN mkdir -p /prefix/usr/lib
|
||||
|
||||
RUN curl -fsS https://dlang.org/install.sh | bash -s ldc
|
||||
|
||||
ADD https://github.com/xtool-org/xadi.git#main /xadi
|
||||
|
||||
RUN cd xadi \
|
||||
&& /bin/bash -c 'source $(/root/dlang/install.sh ldc -a) && dub build --build=release' \
|
||||
&& cp -r bin/libxadi.so /prefix/usr/lib/libxadi.so
|
||||
|
||||
|
||||
FROM build-base
|
||||
|
||||
COPY --from=build-limd /prefix/usr /usr
|
||||
|
||||
WORKDIR /xtool
|
||||
|
||||
FROM build-xtool-base AS dev
|
||||
COPY --from=build-xadi /prefix/usr /usr
|
||||
|
||||
# Docker doesn't support FUSE
|
||||
ENV APPIMAGE_EXTRACT_AND_RUN=1
|
||||
@@ -84,30 +92,6 @@ ENV APPIMAGE_EXTRACT_AND_RUN=1
|
||||
# socat -dd TCP-LISTEN:27015,range=127.0.0.1/32,reuseaddr,fork UNIX-CLIENT:/var/run/usbmuxd
|
||||
ENV USBMUXD_SOCKET_ADDRESS=host.docker.internal:27015
|
||||
|
||||
WORKDIR /xtool
|
||||
|
||||
CMD [ "/bin/bash" ]
|
||||
|
||||
FROM dev AS dev-test
|
||||
|
||||
ENV XTL_TEST_ENV=1
|
||||
|
||||
COPY --from=bats/bats:latest /opt/bats /opt/bats
|
||||
COPY --from=bats/bats:latest /usr/lib/bats /usr/lib/bats
|
||||
RUN ln -s /opt/bats/bin/bats /usr/local/bin/bats
|
||||
|
||||
FROM build-xtool-base AS build-xtool
|
||||
|
||||
ARG XTL_CI
|
||||
|
||||
ADD Package.swift Package.resolved /xtool/
|
||||
RUN swift package resolve
|
||||
|
||||
ADD . /xtool
|
||||
RUN ./Linux/build.sh
|
||||
|
||||
FROM swift:${SWIFT_VERSION} AS xtool
|
||||
|
||||
COPY --from=build-xtool /xtool/Linux/packages/xtool-*.AppImage /xtool/xtool.AppImage
|
||||
RUN (cd /xtool && ./xtool.AppImage --appimage-extract) \
|
||||
&& mv /xtool/squashfs-root /usr/local/xtool \
|
||||
&& rm -rf /xtool \
|
||||
&& ln -s /usr/local/xtool/AppRun /usr/local/bin/xtool
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
# Debugging
|
||||
|
||||
## Environment variables
|
||||
|
||||
Some environment variables that help with debugging. Use these as e.g. `XTL_FOO=1 xtool ...`
|
||||
|
||||
### General
|
||||
|
||||
- `XTL_DEBUG_ERRORS`: If xtool terminates with an error, it normally prints a user-friendly error description. Set `XTL_DEBUG_ERRORS=1` for more verbose error logging.
|
||||
|
||||
### Disk
|
||||
|
||||
- `XTL_DEBUG_TMP`: Set to `1` to log details when xtool creates/destroys temporary directories.
|
||||
- `XTL_TMPDIR`: Control the location where xtool stores temporary directories. We also respect `TMPDIR` and (on Linux) `XDG_CACHE_HOME`.
|
||||
|
||||
### Networking
|
||||
|
||||
- `XTL_DEV_LOG`: Regex. When making AppStoreConnect API requests, operation IDs that match the regex will log their response status and body. Set `XTL_DEV_LOG='.*'` to match all.
|
||||
- `XTL_DISABLE_TLS_VALIDATION`: Set to `1` to disable all TLS validation on HTTP requests. Useful when using an MITM proxy to inspect API requests. Use sparingly, since disabling TLS is generally unsafe.
|
||||
- `XTL_HTTP_PROXY`: non-Darwin only. Set to `<host>:<port>` to point the HTTP client to a proxy. e.g. `XTL_HTTP_PROXY=localhost:8080`. On Darwin (macOS/iOS), we instead use the system proxy configuration.
|
||||
@@ -1,31 +0,0 @@
|
||||
# Contributing to xtool
|
||||
|
||||
## Code
|
||||
|
||||
When making code changes, please make sure to test them on both macOS and Linux if possible. If you can also test on Windows with WSL, that is ideal.
|
||||
|
||||
To build xtool for debugging, run `make` in the project directory. There are a few considerations depending on your host OS:
|
||||
|
||||
### macOS
|
||||
|
||||
On macOS, you'll firstly need to have Xcode set up.
|
||||
|
||||
The first time you run `make`, we'll try to detect your codesigning identity. If you have multiple, you'll see an interactive prompt to select the team you want to use. The team ID is saved to `./macOS/Support/Private-Team.xcconfig`. You can run `make team` to update it (or do so by hand).
|
||||
|
||||
After building, a symlink to the product will be created at `./macOS/Build/xtool`. We generate an Xcode project at `./macOS/XToolMac.xcodeproj` that you can open in order to work in Xcode.
|
||||
|
||||
### Linux
|
||||
|
||||
You need to have a few dependencies on Linux; see [Dockerfile](/Dockerfile) for specifics. It's often easiest to develop within Docker itself: see [Linux/README.md](/Linux/README.md) for details.
|
||||
|
||||
## Debugging
|
||||
|
||||
Check out [./Debugging.md](./Debugging.md) for help with debugging xtool issues during development.
|
||||
|
||||
## Updating Documentation
|
||||
|
||||
The xtool documentation at <https://xtool.sh> is built with [swift-docc](https://github.com/swiftlang/swift-docc) and resides at [Documentation/xtool.docc](/Documentation/xtool.docc). It's hosted on Netlify, the configuration for which is in [netlify.toml](/netlify.toml).
|
||||
|
||||
When editing the DocC bundle, you can preview it with `make docs-preview`.
|
||||
|
||||
Once you make a pull request with your changes, we'll also generate a [Netlify Deploy Preview](https://docs.netlify.com/site-deploys/deploy-previews/) under your pull request. You can open this preview to see how the changes will look in production.
|
||||
@@ -22,5 +22,4 @@ else
|
||||
fi
|
||||
|
||||
"$docc" "$command" xtool.docc \
|
||||
--enable-experimental-code-block-annotations \
|
||||
--experimental-enable-custom-templates
|
||||
|
||||
@@ -3,7 +3,7 @@ Creating package: Hello
|
||||
Creating Package.swift
|
||||
Creating xtool.yml
|
||||
Creating .gitignore
|
||||
Creating .bsp/xtool.json
|
||||
Creating .sourcekit-lsp/config.json
|
||||
Creating Sources/Hello/HelloApp.swift
|
||||
Creating Sources/Hello/ContentView.swift
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ Creating package: Hello
|
||||
Creating Package.swift
|
||||
Creating xtool.yml
|
||||
Creating .gitignore
|
||||
Creating .bsp/xtool.json
|
||||
Creating .sourcekit-lsp/config.json
|
||||
Creating Sources/Hello/HelloApp.swift
|
||||
Creating Sources/Hello/ContentView.swift
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ Creating package: Hello
|
||||
Creating Package.swift
|
||||
Creating xtool.yml
|
||||
Creating .gitignore
|
||||
Creating .bsp/xtool.json
|
||||
Creating .sourcekit-lsp/config.json
|
||||
Creating Sources/Hello/HelloApp.swift
|
||||
Creating Sources/Hello/ContentView.swift
|
||||
|
||||
@@ -12,7 +12,7 @@ Finished generating project Hello.
|
||||
Developer$
|
||||
Hello$
|
||||
-rw-rw-r-- 1 user user 187 .gitignore
|
||||
drwxrwxr-x 2 user user 4096 .bsp
|
||||
drwxrwxr-x 2 user user 4096 .sourcekit-lsp
|
||||
-rw-rw-r-- 1 user user 463 Package.swift
|
||||
drwxrwxr-x 3 user user 4096 Sources
|
||||
-rw-rw-r-- 1 user user 39 xtool.yml
|
||||
|
||||
@@ -3,7 +3,7 @@ Creating package: Hello
|
||||
Creating Package.swift
|
||||
Creating xtool.yml
|
||||
Creating .gitignore
|
||||
Creating .bsp/xtool.json
|
||||
Creating .sourcekit-lsp/config.json
|
||||
Creating Sources/Hello/HelloApp.swift
|
||||
Creating Sources/Hello/ContentView.swift
|
||||
|
||||
@@ -12,7 +12,7 @@ Finished generating project Hello.
|
||||
Developer$ cd Hello
|
||||
Hello$ ls -la
|
||||
-rw-rw-r-- 1 user user 187 .gitignore
|
||||
drwxrwxr-x 2 user user 4096 .bsp
|
||||
drwxrwxr-x 2 user user 4096 .sourcekit-lsp
|
||||
-rw-rw-r-- 1 user user 463 Package.swift
|
||||
drwxrwxr-x 3 user user 4096 Sources
|
||||
-rw-rw-r-- 1 user user 39 xtool.yml
|
||||
|
||||
@@ -3,7 +3,7 @@ Creating package: Hello
|
||||
Creating Package.swift
|
||||
Creating xtool.yml
|
||||
Creating .gitignore
|
||||
Creating .bsp/xtool.json
|
||||
Creating .sourcekit-lsp/config.json
|
||||
Creating Sources/Hello/HelloApp.swift
|
||||
Creating Sources/Hello/ContentView.swift
|
||||
|
||||
@@ -12,7 +12,7 @@ Finished generating project Hello.
|
||||
Developer$ cd Hello
|
||||
Hello$ ls -la
|
||||
-rw-rw-r-- 1 user user 187 .gitignore
|
||||
drwxrwxr-x 2 user user 4096 .bsp
|
||||
drwxrwxr-x 2 user user 4096 .sourcekit-lsp
|
||||
-rw-rw-r-- 1 user user 463 Package.swift
|
||||
drwxrwxr-x 3 user user 4096 Sources
|
||||
-rw-rw-r-- 1 user user 39 xtool.yml
|
||||
|
||||
@@ -3,7 +3,7 @@ Creating package: Hello
|
||||
Creating Package.swift
|
||||
Creating xtool.yml
|
||||
Creating .gitignore
|
||||
Creating .bsp/xtool.json
|
||||
Creating .sourcekit-lsp/config.json
|
||||
Creating Sources/Hello/HelloApp.swift
|
||||
Creating Sources/Hello/ContentView.swift
|
||||
|
||||
@@ -12,7 +12,7 @@ Finished generating project Hello.
|
||||
Developer$ cd Hello
|
||||
Hello$ ls -la
|
||||
-rw-rw-r-- 1 user user 187 .gitignore
|
||||
drwxrwxr-x 2 user user 4096 .bsp
|
||||
drwxrwxr-x 2 user user 4096 .sourcekit-lsp
|
||||
-rw-rw-r-- 1 user user 463 Package.swift
|
||||
drwxrwxr-x 3 user user 4096 Sources
|
||||
-rw-rw-r-- 1 user user 39 xtool.yml
|
||||
|
||||
@@ -3,7 +3,7 @@ Creating package: Hello
|
||||
Creating Package.swift
|
||||
Creating xtool.yml
|
||||
Creating .gitignore
|
||||
Creating .bsp/xtool.json
|
||||
Creating .sourcekit-lsp/config.json
|
||||
Creating Sources/Hello/HelloApp.swift
|
||||
Creating Sources/Hello/ContentView.swift
|
||||
|
||||
@@ -12,7 +12,7 @@ Finished generating project Hello.
|
||||
Developer$ cd Hello
|
||||
Hello$ ls -la
|
||||
-rw-rw-r-- 1 user user 187 .gitignore
|
||||
drwxrwxr-x 2 user user 4096 .bsp
|
||||
drwxrwxr-x 2 user user 4096 .sourcekit-lsp
|
||||
-rw-rw-r-- 1 user user 463 Package.swift
|
||||
drwxrwxr-x 3 user user 4096 Sources
|
||||
-rw-rw-r-- 1 user user 39 xtool.yml
|
||||
|
||||
@@ -3,7 +3,7 @@ Creating package: Hello
|
||||
Creating Package.swift
|
||||
Creating xtool.yml
|
||||
Creating .gitignore
|
||||
Creating .bsp/xtool.json
|
||||
Creating .sourcekit-lsp/config.json
|
||||
Creating Sources/Hello/HelloApp.swift
|
||||
Creating Sources/Hello/ContentView.swift
|
||||
|
||||
@@ -12,7 +12,7 @@ Finished generating project Hello.
|
||||
Developer$ cd Hello
|
||||
Hello$ ls -la
|
||||
-rw-rw-r-- 1 user user 187 .gitignore
|
||||
drwxrwxr-x 2 user user 4096 .bsp
|
||||
drwxrwxr-x 2 user user 4096 .sourcekit-lsp
|
||||
-rw-rw-r-- 1 user user 463 Package.swift
|
||||
drwxrwxr-x 3 user user 4096 Sources
|
||||
-rw-rw-r-- 1 user user 39 xtool.yml
|
||||
@@ -21,9 +21,5 @@ Hello$ cat xtool.yml
|
||||
version: 1
|
||||
bundleID: com.example.Hello
|
||||
|
||||
Hello$ cat .bsp/xtool.json
|
||||
{
|
||||
"name": "xtool",
|
||||
...
|
||||
"argv": ["/usr/bin/env", "xtool", "dev", "build-server"]
|
||||
}
|
||||
Hello$ cat .sourcekit-lsp/config.json
|
||||
{ "swiftPM": { "swiftSDK": "arm64-apple-ios" } }
|
||||
|
||||
@@ -30,9 +30,9 @@
|
||||
}
|
||||
|
||||
@Step {
|
||||
Read `.bsp/xtool.json`.
|
||||
Read `.sourcekit-lsp/config.json`.
|
||||
|
||||
This file tells your IDE to ask xtool for build information (via the Build Server Protocol). It enables features like syntax highlighting and documentation lookup.
|
||||
This file tells SourceKit to build for the `arm64-apple-ios` system defined in `darwin.artifactbundle`. This is the [Swift SDK](https://github.com/swiftlang/swift-evolution/blob/main/proposals/0387-cross-compilation-destinations.md) that we built during the setup process. It contains the necessary modules for building iOS apps, such as UIKit and SwiftUI, as well as tools for building and manipulating iOS binaries. Under the hood, xtool also calls `swift build` with `--swift-sdk arm64-apple-ios` for the same reason.
|
||||
|
||||
@Code(name: "Terminal", file: "template-4b.sh", previousFile: "template-4a.sh") {}
|
||||
}
|
||||
|
||||
@@ -14,22 +14,16 @@ If you're on Windows, you can use xtool via [Windows Subsystem for Linux](https:
|
||||
|
||||
Once you install WSL, you'll also need to set up USB passthrough. See Microsoft's instructions on [installing USBIPD](https://learn.microsoft.com/en-us/windows/wsl/connect-usb). Make sure you're able to bind your iOS device to WSL via USB.
|
||||
|
||||
> Note:
|
||||
>
|
||||
> If you encounter `Error: AFCClient.Error.muxError`, follow the steps described in [this issue comment](https://github.com/xtool-org/xtool/issues/19#issuecomment-2898986718) from user rena2019.
|
||||
>
|
||||
> This relays the device connection from iTunes on Windows, instead of relying on USBIPD.
|
||||
|
||||
### Swift
|
||||
|
||||
Install the Swift 6.4 toolchain for your Linux distribution from <https://swift.org/install/linux>.
|
||||
Install the Swift 6.1 toolchain for your Linux distribution from <https://swift.org/install/linux>.
|
||||
|
||||
After following the steps there, confirm that Swift is installed correctly:
|
||||
|
||||
```bash
|
||||
swift --version
|
||||
# should say something like:
|
||||
# Swift version 6.4 (swift-6.4-RELEASE)
|
||||
# Swift version 6.1 (swift-6.1-RELEASE)
|
||||
```
|
||||
|
||||
### usbmuxd
|
||||
@@ -68,7 +62,7 @@ sudo apt-get install usbmuxd
|
||||
|
||||
### Xcode.xip
|
||||
|
||||
Download **Xcode 27.1** from <https://developer.apple.com/download/all/?q=Xcode>. Note the path where `Xcode.xip` is saved.
|
||||
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.
|
||||
|
||||
> Note:
|
||||
>
|
||||
@@ -131,7 +125,7 @@ Choice (0-1): 0
|
||||
Path to Xcode.xip:
|
||||
```
|
||||
|
||||
Enter the path (for example `~/Downloads/Xcode_27.1.xip`) and hit enter. xtool will extract the Xcode XIP to generate and install an iOS Swift SDK for you.
|
||||
Enter the path (for example `~/Downloads/Xcode_16.3.xip`) and hit enter. xtool will extract the Xcode XIP to generate and install an iOS Swift SDK for you.
|
||||
|
||||
Confirm that it worked:
|
||||
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
.DS_Store
|
||||
.build
|
||||
.swiftpm
|
||||
*/xtool
|
||||
*/.bsp
|
||||
/out
|
||||
@@ -1,29 +0,0 @@
|
||||
// swift-tools-version: 6.0
|
||||
|
||||
import PackageDescription
|
||||
|
||||
let package = Package(
|
||||
name: "DemoDynamic",
|
||||
platforms: [
|
||||
.iOS(.v17),
|
||||
.macOS(.v14),
|
||||
],
|
||||
products: [
|
||||
.library(
|
||||
name: "DemoDynamic",
|
||||
targets: ["DemoDynamic"]
|
||||
),
|
||||
],
|
||||
dependencies: [
|
||||
.package(path: "../ExampleSupport"),
|
||||
],
|
||||
targets: [
|
||||
.target(
|
||||
name: "DemoDynamic",
|
||||
dependencies: [
|
||||
"ExampleSupport",
|
||||
.product(name: "ExampleDynamicLibrary", package: "ExampleSupport"),
|
||||
]
|
||||
),
|
||||
]
|
||||
)
|
||||
@@ -1,12 +0,0 @@
|
||||
import ExampleDynamicLibrary
|
||||
import ExampleSupport
|
||||
import SwiftUI
|
||||
|
||||
@main struct DemoApp: ExampleApp {
|
||||
init() {
|
||||
let message = exampleDynamicLibraryFunction()
|
||||
guard message == "Hello from the dynamic library\n" else {
|
||||
fatalError("Unexpected message from dynamic library: \(message)")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,2 +0,0 @@
|
||||
version: 1
|
||||
bundleID: sh.xtool.examples.DemoDynamic
|
||||
@@ -1,33 +0,0 @@
|
||||
// swift-tools-version: 6.0
|
||||
|
||||
import PackageDescription
|
||||
|
||||
let package = Package(
|
||||
name: "DemoExtensions",
|
||||
platforms: [
|
||||
.iOS(.v17),
|
||||
.macOS(.v14),
|
||||
],
|
||||
products: [
|
||||
.library(
|
||||
name: "DemoExtensions",
|
||||
targets: ["DemoExtensions"]
|
||||
),
|
||||
.library(
|
||||
name: "DemoExtensionsWidget",
|
||||
targets: ["DemoExtensionsWidget"]
|
||||
),
|
||||
],
|
||||
dependencies: [
|
||||
.package(path: "../ExampleSupport"),
|
||||
],
|
||||
targets: [
|
||||
.target(
|
||||
name: "DemoExtensions",
|
||||
dependencies: [
|
||||
"ExampleSupport",
|
||||
]
|
||||
),
|
||||
.target(name: "DemoExtensionsWidget"),
|
||||
]
|
||||
)
|
||||
@@ -1,4 +0,0 @@
|
||||
import SwiftUI
|
||||
import ExampleSupport
|
||||
|
||||
@main struct DemoApp: ExampleApp {}
|
||||
@@ -1,51 +0,0 @@
|
||||
import WidgetKit
|
||||
import SwiftUI
|
||||
|
||||
@main struct Bundle: WidgetBundle {
|
||||
var body: some Widget {
|
||||
DemoWidget()
|
||||
}
|
||||
}
|
||||
|
||||
struct DemoWidget: Widget {
|
||||
var body: some WidgetConfiguration {
|
||||
StaticConfiguration(
|
||||
kind: "DemoWidget",
|
||||
provider: Provider()
|
||||
) { entry in
|
||||
VStack {
|
||||
Text(entry.date, style: .date)
|
||||
}
|
||||
.containerBackground(.fill.tertiary, for: .widget)
|
||||
}
|
||||
.configurationDisplayName("DemoWidget")
|
||||
.description("This is an example widget.")
|
||||
}
|
||||
|
||||
struct Entry: TimelineEntry {
|
||||
var date = Date()
|
||||
}
|
||||
|
||||
struct Provider: TimelineProvider {
|
||||
func placeholder(in context: Context) -> Entry {
|
||||
Entry()
|
||||
}
|
||||
|
||||
func getSnapshot(
|
||||
in context: Context,
|
||||
completion: @escaping (Entry) -> Void
|
||||
) {
|
||||
completion(Entry())
|
||||
}
|
||||
|
||||
func getTimeline(
|
||||
in context: Context,
|
||||
completion: @escaping (Timeline<Entry>) -> Void
|
||||
) {
|
||||
completion(Timeline(
|
||||
entries: [Entry()],
|
||||
policy: .after(.now + 3600)
|
||||
))
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>NSExtension</key>
|
||||
<dict>
|
||||
<key>NSExtensionPointIdentifier</key>
|
||||
<string>com.apple.widgetkit-extension</string>
|
||||
</dict>
|
||||
</dict>
|
||||
</plist>
|
||||
@@ -1,6 +0,0 @@
|
||||
version: 1
|
||||
bundleID: sh.xtool.examples.DemoExtensions
|
||||
product: DemoExtensions
|
||||
extensions:
|
||||
- product: DemoExtensionsWidget
|
||||
infoPath: Support/DemoExtensionsWidget-Info.plist
|
||||
@@ -1,31 +0,0 @@
|
||||
// swift-tools-version: 6.0
|
||||
|
||||
import PackageDescription
|
||||
|
||||
let package = Package(
|
||||
name: "DemoResources",
|
||||
platforms: [
|
||||
.iOS(.v17),
|
||||
.macOS(.v14),
|
||||
],
|
||||
products: [
|
||||
.library(
|
||||
name: "DemoResources",
|
||||
targets: ["DemoResources"]
|
||||
),
|
||||
],
|
||||
dependencies: [
|
||||
.package(path: "../ExampleSupport"),
|
||||
],
|
||||
targets: [
|
||||
.target(
|
||||
name: "DemoResources",
|
||||
dependencies: [
|
||||
"ExampleSupport",
|
||||
],
|
||||
resources: [
|
||||
.process("bundled.txt"),
|
||||
]
|
||||
),
|
||||
]
|
||||
)
|
||||
@@ -1 +0,0 @@
|
||||
Top level resource
|
||||
@@ -1,34 +0,0 @@
|
||||
import ExampleSupport
|
||||
import SwiftUI
|
||||
|
||||
@main struct DemoApp: App {
|
||||
var body: some Scene {
|
||||
WindowGroup {
|
||||
Text("Hello, world!")
|
||||
.task {
|
||||
guard let bundled = #bundle.url(forResource: "bundled", withExtension: "txt")
|
||||
else { fatalError("Missing bundled.txt resource") }
|
||||
assertContents(of: bundled, equal: "Bundled resource\n")
|
||||
|
||||
guard let top = Bundle.main.url(forResource: "top", withExtension: "txt")
|
||||
else { fatalError("Missing top.txt resource") }
|
||||
assertContents(of: top, equal: "Top level resource\n")
|
||||
|
||||
Example.pass()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func assertContents(of url: URL, equal value: String) {
|
||||
let name = url.lastPathComponent
|
||||
let contents: String
|
||||
do {
|
||||
contents = try String(contentsOf: url, encoding: .utf8)
|
||||
} catch {
|
||||
fatalError("Failed to read \(name): \(error)")
|
||||
}
|
||||
guard contents == value else {
|
||||
fatalError("\(name) had unexpected contents: \(contents)")
|
||||
}
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
Bundled resource
|
||||
@@ -1,4 +0,0 @@
|
||||
version: 1
|
||||
bundleID: sh.xtool.examples.DemoResources
|
||||
resources:
|
||||
- Resources/top.txt
|
||||
@@ -1,28 +0,0 @@
|
||||
// swift-tools-version: 6.0
|
||||
|
||||
import PackageDescription
|
||||
|
||||
let package = Package(
|
||||
name: "DemoSimple",
|
||||
platforms: [
|
||||
.iOS(.v17),
|
||||
.macOS(.v14),
|
||||
],
|
||||
products: [
|
||||
.library(
|
||||
name: "DemoSimple",
|
||||
targets: ["DemoSimple"]
|
||||
),
|
||||
],
|
||||
dependencies: [
|
||||
.package(path: "../ExampleSupport"),
|
||||
],
|
||||
targets: [
|
||||
.target(
|
||||
name: "DemoSimple",
|
||||
dependencies: [
|
||||
"ExampleSupport",
|
||||
]
|
||||
),
|
||||
]
|
||||
)
|
||||
@@ -1,26 +0,0 @@
|
||||
import ExampleSupport
|
||||
import SwiftUI
|
||||
|
||||
@main struct DemoApp: App {
|
||||
public var body: some Scene {
|
||||
WindowGroup {
|
||||
ContentView()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private struct ContentView: View {
|
||||
@State var counter = 0
|
||||
|
||||
var body: some View {
|
||||
VStack {
|
||||
Button("Counter = \(counter)") {
|
||||
counter += 1
|
||||
}
|
||||
}
|
||||
.padding()
|
||||
.task {
|
||||
Example.pass()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,2 +0,0 @@
|
||||
version: 1
|
||||
bundleID: sh.xtool.examples.DemoSimple
|
||||
@@ -1,141 +0,0 @@
|
||||
{
|
||||
"originHash" : "87792a9d5953dfe62ed2edf7c4f142774813bd3ea31882cbf6659b62fb2827ab",
|
||||
"pins" : [
|
||||
{
|
||||
"identity" : "combine-schedulers",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/combine-schedulers",
|
||||
"state" : {
|
||||
"revision" : "114354e8c1667a2edc4993700fb9fa4f90157b56",
|
||||
"version" : "1.2.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "opencombine",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/OpenCombine/OpenCombine.git",
|
||||
"state" : {
|
||||
"revision" : "8576f0d579b27020beccbccc3ea6844f3ddfc2c2",
|
||||
"version" : "0.14.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-case-paths",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-case-paths",
|
||||
"state" : {
|
||||
"revision" : "cb4cba6a8a46a86db0d37dbe09935ead6b24c91a",
|
||||
"version" : "1.10.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-clocks",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-clocks",
|
||||
"state" : {
|
||||
"revision" : "82440fa0a8b1c381a6d1e8e0fc7bbba53ec63204",
|
||||
"version" : "1.1.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-collections",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-collections",
|
||||
"state" : {
|
||||
"revision" : "98ef3c98609a1e31b7e157b5b619579001a789d6",
|
||||
"version" : "1.7.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-composable-architecture",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-composable-architecture.git",
|
||||
"state" : {
|
||||
"revision" : "377da4061db10d26337a71bb279c506bb951f50f",
|
||||
"version" : "1.26.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-concurrency-extras",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-concurrency-extras",
|
||||
"state" : {
|
||||
"revision" : "5fa253428866f2360c3754e88537f700ed2656b5",
|
||||
"version" : "1.4.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-custom-dump",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-custom-dump",
|
||||
"state" : {
|
||||
"revision" : "4fb9e7cbb4b8f5a7354005db39447f570d6b3e19",
|
||||
"version" : "1.7.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-dependencies",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-dependencies",
|
||||
"state" : {
|
||||
"revision" : "b476cc5761057d8d857de063fe7ac8daecf5c06b",
|
||||
"version" : "1.17.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-identified-collections",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-identified-collections",
|
||||
"state" : {
|
||||
"revision" : "322d9ffeeba85c9f7c4984b39422ec7cc3c56597",
|
||||
"version" : "1.1.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-issue-reporting",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-issue-reporting",
|
||||
"state" : {
|
||||
"revision" : "75b000cea2ca6d7527a57e1b9cc0bdf21a9abe9f",
|
||||
"version" : "2.1.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-navigation",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-navigation",
|
||||
"state" : {
|
||||
"revision" : "7e95e5e9ff0a64f6ad8bca59083f8d6ba381b6ff",
|
||||
"version" : "2.11.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-perception",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-perception",
|
||||
"state" : {
|
||||
"revision" : "597afd46249f4a71885b95d26b26cc5b893daf32",
|
||||
"version" : "2.0.12"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-sharing",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-sharing",
|
||||
"state" : {
|
||||
"revision" : "3552faf8a6c18ce896ec5a72bd8c34755f0f03e0",
|
||||
"version" : "2.10.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-syntax",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/swiftlang/swift-syntax",
|
||||
"state" : {
|
||||
"revision" : "050f1a346fbbac0ca2cfb15a95274f7bd1cf0ccf",
|
||||
"version" : "604.0.0"
|
||||
}
|
||||
}
|
||||
],
|
||||
"version" : 3
|
||||
}
|
||||
@@ -1,33 +0,0 @@
|
||||
// swift-tools-version: 6.0
|
||||
|
||||
import PackageDescription
|
||||
|
||||
let package = Package(
|
||||
name: "DemoTCA",
|
||||
platforms: [
|
||||
.iOS(.v17),
|
||||
.macOS(.v14),
|
||||
],
|
||||
products: [
|
||||
.library(
|
||||
name: "DemoTCA",
|
||||
targets: ["DemoTCA"]
|
||||
),
|
||||
],
|
||||
dependencies: [
|
||||
.package(path: "../ExampleSupport"),
|
||||
.package(url: "https://github.com/pointfreeco/swift-composable-architecture.git", from: "1.0.0"),
|
||||
// we don't use this but need the explicit dependency to keep the lockfile stable.
|
||||
// TODO: remove once https://github.com/pointfreeco/combine-schedulers/issues/120 is fixed
|
||||
.package(url: "https://github.com/OpenCombine/OpenCombine.git", from: "0.14.0"),
|
||||
],
|
||||
targets: [
|
||||
.target(
|
||||
name: "DemoTCA",
|
||||
dependencies: [
|
||||
"ExampleSupport",
|
||||
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
|
||||
],
|
||||
),
|
||||
]
|
||||
)
|
||||
@@ -1,24 +0,0 @@
|
||||
import SwiftUI
|
||||
import ComposableArchitecture
|
||||
import ExampleSupport
|
||||
|
||||
struct ContentView: View {
|
||||
let store: StoreOf<CounterFeature>
|
||||
|
||||
var body: some View {
|
||||
VStack {
|
||||
Image(systemName: "globe")
|
||||
.imageScale(.large)
|
||||
.foregroundStyle(.tint)
|
||||
Text("Count: \(store.count)")
|
||||
}
|
||||
.padding()
|
||||
.onAppear {
|
||||
store.send(.appear)
|
||||
}
|
||||
.onChange(of: store.count) { _, count in
|
||||
guard count == 1 else { return }
|
||||
Example.pass()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,31 +0,0 @@
|
||||
import ComposableArchitecture
|
||||
|
||||
@Reducer
|
||||
struct CounterFeature {
|
||||
@ObservableState
|
||||
struct State {
|
||||
var count = 0
|
||||
}
|
||||
|
||||
enum Action {
|
||||
case appear
|
||||
case timerElapsed
|
||||
}
|
||||
|
||||
@Dependency(\.continuousClock) var continuousClock
|
||||
|
||||
var body: some Reducer<State, Action> {
|
||||
Reduce { state, action in
|
||||
switch action {
|
||||
case .appear:
|
||||
return .run { [continuousClock] send in
|
||||
try await continuousClock.sleep(for: .seconds(1))
|
||||
await send(.timerElapsed)
|
||||
}
|
||||
case .timerElapsed:
|
||||
state.count += 1
|
||||
return .none
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
import SwiftUI
|
||||
import ComposableArchitecture
|
||||
|
||||
@main
|
||||
struct DemoTCAApp: App {
|
||||
private let store = Store(initialState: CounterFeature.State()) {
|
||||
CounterFeature()
|
||||
}
|
||||
|
||||
var body: some Scene {
|
||||
WindowGroup {
|
||||
ContentView(store: store)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,2 +0,0 @@
|
||||
version: 1
|
||||
bundleID: sh.xtool.examples.DemoTCA
|
||||
@@ -1,31 +0,0 @@
|
||||
// swift-tools-version: 6.4
|
||||
|
||||
import PackageDescription
|
||||
|
||||
let package = Package(
|
||||
name: "ExampleSupport",
|
||||
platforms: [
|
||||
.iOS(.v17),
|
||||
.macOS(.v14),
|
||||
],
|
||||
products: [
|
||||
.library(
|
||||
name: "ExampleSupport",
|
||||
targets: ["ExampleSupport"]
|
||||
),
|
||||
.library(
|
||||
name: "ExampleDynamicLibrary",
|
||||
type: .dynamic,
|
||||
targets: ["ExampleDynamicLibrary"]
|
||||
),
|
||||
],
|
||||
targets: [
|
||||
.target(name: "ExampleSupport"),
|
||||
.target(
|
||||
name: "ExampleDynamicLibrary",
|
||||
resources: [
|
||||
.process("response.txt"),
|
||||
]
|
||||
),
|
||||
]
|
||||
)
|
||||
@@ -1,9 +0,0 @@
|
||||
import Foundation
|
||||
|
||||
public func exampleDynamicLibraryFunction() -> String {
|
||||
guard let bundled = #bundle.url(forResource: "response", withExtension: "txt")
|
||||
else { fatalError("Missing bundled.txt resource") }
|
||||
// swiftlint:disable:next force_try
|
||||
let contents = try! String(contentsOf: bundled, encoding: .utf8)
|
||||
return "Hello \(contents)"
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
from the dynamic library
|
||||
@@ -1,25 +0,0 @@
|
||||
import SwiftUI
|
||||
|
||||
public protocol ExampleApp: App {}
|
||||
extension ExampleApp {
|
||||
public var body: some Scene {
|
||||
WindowGroup {
|
||||
ContentView()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private struct ContentView: View {
|
||||
var body: some View {
|
||||
VStack {
|
||||
Image(systemName: "globe")
|
||||
.imageScale(.large)
|
||||
.foregroundStyle(.tint)
|
||||
Text("Hello, world!")
|
||||
}
|
||||
.padding()
|
||||
.task {
|
||||
Example.pass()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
import Foundation
|
||||
|
||||
public enum Example {}
|
||||
extension Example {
|
||||
public static func pass() {
|
||||
Task {
|
||||
try? await Task.sleep(for: .seconds(1))
|
||||
print("xtool test succeeded")
|
||||
exit(0)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
# Examples
|
||||
|
||||
These primarily exist as fixtures for integration tests, but also double as snippets of sample code.
|
||||
|
||||
Each demo is designed to make some assertions shortly after launching, and then exit. On success, stdout will include the message "xtool test succeeded".
|
||||
|
||||
## Testing
|
||||
|
||||
```
|
||||
./Examples/test.sh [--build | --run] [DemoName]
|
||||
```
|
||||
|
||||
- Omit `--build`/`--run` to build _and_ run
|
||||
- Omit the demo name to loop through all demos
|
||||
@@ -1,118 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -euo pipefail
|
||||
shopt -s nullglob
|
||||
|
||||
usage() {
|
||||
echo "Usage: $0 [--build | --run] [DemoName]"
|
||||
}
|
||||
|
||||
mode=both
|
||||
case "${1:-}" in
|
||||
--build) mode=build; shift ;;
|
||||
--run) mode=run; shift ;;
|
||||
-h|--help) usage; exit 0 ;;
|
||||
esac
|
||||
|
||||
if [[ $# -gt 1 || (${1:-} != "" && (${1:-} != Demo* || ${1:-} == */*)) ]]; then
|
||||
usage >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
cd "$(dirname "$0")"
|
||||
examples_dir="$PWD"
|
||||
out_dir="$examples_dir/out"
|
||||
|
||||
if [[ -n "${1:-}" ]]; then
|
||||
demos=("$1")
|
||||
elif [[ "$mode" == run ]]; then
|
||||
demos=()
|
||||
for app in "$out_dir"/*.app; do
|
||||
name="${app##*/}"
|
||||
demos+=("${name%.app}")
|
||||
done
|
||||
else
|
||||
demos=()
|
||||
for demo in "$examples_dir"/Demo*/; do
|
||||
[[ -f "$demo/Package.swift" ]] || continue
|
||||
demo="${demo%/}"
|
||||
demos+=("${demo##*/}")
|
||||
done
|
||||
fi
|
||||
|
||||
if [[ ${#demos[@]} -eq 0 ]]; then
|
||||
echo "No demos found. Run $0 --build first if using --run." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
logs_dir="$(mktemp -d)"
|
||||
trap 'rm -rf "$logs_dir"' EXIT
|
||||
trap 'exit 130' INT
|
||||
trap 'exit 143' TERM
|
||||
|
||||
build_demo() {
|
||||
local demo="$1"
|
||||
echo "Building $demo..."
|
||||
mkdir -p "$out_dir" || return 1
|
||||
# Do not leave an older successful build available after a failed rebuild.
|
||||
rm -rf "$out_dir/$demo.app" || return 1
|
||||
(cd "$examples_dir/$demo" && xtool dev build --triple arm64-apple-ios-simulator) || return 1
|
||||
cp -R "$examples_dir/$demo/xtool/$demo.app" "$out_dir/$demo.app"
|
||||
}
|
||||
|
||||
run_demo() (
|
||||
demo="$1"
|
||||
app="$out_dir/$demo.app"
|
||||
log="$logs_dir/$demo-run.log"
|
||||
if [[ ! -d "$app" ]]; then
|
||||
echo "Missing $app. Run $0 --build $demo first." >&2
|
||||
exit 1
|
||||
fi
|
||||
bundle_id=$(/usr/libexec/PlistBuddy -c 'Print :CFBundleIdentifier' "$app/Info.plist") || exit 1
|
||||
echo "Running $demo..."
|
||||
xcrun simctl install booted "$app" || exit 1
|
||||
xcrun simctl launch --terminate-running-process --console booted "$bundle_id" >"$log" 2>&1 &
|
||||
launch_pid=$!
|
||||
# A demo should exit shortly after launch. Bound failures that hang instead.
|
||||
(
|
||||
sleep_pid=""
|
||||
trap '[[ -z "$sleep_pid" ]] || kill "$sleep_pid" 2>/dev/null || true' EXIT
|
||||
sleep 60 &
|
||||
sleep_pid=$!
|
||||
wait "$sleep_pid"
|
||||
sleep_pid=""
|
||||
touch "$log.timeout"
|
||||
kill -TERM "$launch_pid" 2>/dev/null || exit 0
|
||||
sleep 5 &
|
||||
sleep_pid=$!
|
||||
wait "$sleep_pid"
|
||||
sleep_pid=""
|
||||
kill -KILL "$launch_pid" 2>/dev/null || true
|
||||
) >/dev/null 2>&1 &
|
||||
timeout_pid=$!
|
||||
trap 'kill "$timeout_pid" "$launch_pid" 2>/dev/null || true' EXIT
|
||||
status=0
|
||||
wait "$launch_pid" || status=$?
|
||||
kill "$timeout_pid" 2>/dev/null || true
|
||||
wait "$timeout_pid" 2>/dev/null || true
|
||||
cat "$log"
|
||||
if [[ -f "$log.timeout" ]]; then
|
||||
echo "$demo did not terminate within 60 seconds." >&2
|
||||
exit 1
|
||||
fi
|
||||
[[ "$status" -eq 0 ]] && grep -Fxq 'xtool test succeeded' "$log"
|
||||
)
|
||||
|
||||
status=0
|
||||
for demo in "${demos[@]}"; do
|
||||
if [[ "$mode" != run ]] && ! build_demo "$demo"; then
|
||||
echo "Build failed: $demo" >&2
|
||||
status=1
|
||||
continue
|
||||
fi
|
||||
if [[ "$mode" != build ]] && ! run_demo "$demo"; then
|
||||
echo "Test failed: $demo" >&2
|
||||
status=1
|
||||
fi
|
||||
done
|
||||
exit "$status"
|
||||
+2
-2
@@ -13,7 +13,7 @@ fi
|
||||
rm -rf staging/tmp
|
||||
mkdir -p staging/tmp staging/linuxdeploy
|
||||
|
||||
swift build --package-path .. -c release --product xtool
|
||||
swift build --package-path .. -c release --product xtool --static-swift-stdlib
|
||||
bin="$(swift build --package-path .. -c release --show-bin-path)"
|
||||
strip "${bin}/xtool"
|
||||
|
||||
@@ -38,7 +38,7 @@ if [[ ! -f staging/linuxdeploy/linuxdeploy.AppImage ]]; then
|
||||
fi
|
||||
|
||||
mkdir -p staging/tmp/AppDir/usr/bin
|
||||
find "${bin}"/ -name '*.resources' -or -name '*.bundle' -print0 | xargs -0 -I {} cp -a {} "${PWD}/staging/tmp/AppDir/usr/bin/"
|
||||
find "${bin}"/ -name '*.resources' -print0 | xargs -0 -I {} cp -a {} "${PWD}/staging/tmp/AppDir/usr/bin/"
|
||||
|
||||
export LINUXDEPLOY_OUTPUT_VERSION="${XTOOL_VERSION:-unversioned}"
|
||||
export LDAI_OUTPUT="staging/tmp/xtool-${curr_arch}.AppImage"
|
||||
|
||||
@@ -56,10 +56,6 @@ linux-clean:
|
||||
linux-dist:
|
||||
docker compose run --build --rm xtool Linux/build.sh
|
||||
|
||||
.PHONY: docker
|
||||
docker:
|
||||
docker build . -t ghcr.io/xtool-org/xtool:latest
|
||||
|
||||
.PHONY: mac
|
||||
# dev build for macOS
|
||||
mac: project
|
||||
@@ -132,8 +128,7 @@ docs-preview:
|
||||
|
||||
SWIFTLINT_VERSION = $(shell head -1 .swiftlint.yml | cut -d' ' -f2)
|
||||
SWIFTLINT_BIN = .tmp/swiftlint/swiftlint-$(SWIFTLINT_VERSION)
|
||||
SWIFTLINT_ARCH = $(subst aarch64,arm64,$(subst x86_64,amd64,$(shell uname -m)))
|
||||
SWIFTLINT_URL = https://github.com/realm/SwiftLint/releases/download/$(SWIFTLINT_VERSION)/$(if $(IS_MAC),portable_swiftlint,swiftlint_linux_$(SWIFTLINT_ARCH)).zip
|
||||
SWIFTLINT_URL = https://github.com/realm/SwiftLint/releases/download/$(SWIFTLINT_VERSION)/$(if $(IS_MAC),portable_swiftlint,swiftlint_linux).zip
|
||||
|
||||
.PHONY: lint
|
||||
lint: $(SWIFTLINT_BIN)
|
||||
@@ -171,7 +166,4 @@ openapi/openapi.json: openapi/base.json Sources/DeveloperAPI/patch.js
|
||||
|
||||
openapi/base.json:
|
||||
@mkdir -p openapi
|
||||
# piping curl|bsdtar concatenates xattrs into the JSON :thonk:
|
||||
curl -fsSL "$(SPEC_URL)" -o openapi/spec.zip
|
||||
bsdtar -xO -f openapi/spec.zip > openapi/base.json
|
||||
rm -f openapi/spec.zip
|
||||
curl -fsSL "$(SPEC_URL)" | bsdtar -xOf- > openapi/base.json
|
||||
|
||||
+128
-155
@@ -1,13 +1,13 @@
|
||||
{
|
||||
"originHash" : "df62267a8ffd060087e903a9d112d24562a959d43a0819a6511367da533c5594",
|
||||
"originHash" : "30ba8b3b894def5b779d979643d77deb698479066658be3b18dad2fb6a193579",
|
||||
"pins" : [
|
||||
{
|
||||
"identity" : "aexml",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/tadija/AEXML.git",
|
||||
"state" : {
|
||||
"revision" : "dd9206de0717d658daec6a064992894fdab8ae17",
|
||||
"version" : "4.7.3"
|
||||
"revision" : "38f7d00b23ecd891e1ee656fa6aeebd6ba04ecc3",
|
||||
"version" : "4.6.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -15,8 +15,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/swift-server/async-http-client.git",
|
||||
"state" : {
|
||||
"revision" : "4c005f955e83f888d5616e579717a36d2dfc6301",
|
||||
"version" : "1.36.2"
|
||||
"revision" : "333f51104b75d1a5b94cb3b99e4c58a3b442c9f7",
|
||||
"version" : "1.25.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -24,8 +24,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/attaswift/BigInt",
|
||||
"state" : {
|
||||
"revision" : "63feef7820abb1a8fb08587d7da56bb0b7db8751",
|
||||
"version" : "6.0.1"
|
||||
"revision" : "114343a705df4725dfe7ab8a2a326b8883cfd79c",
|
||||
"version" : "5.5.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -33,8 +33,17 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/combine-schedulers",
|
||||
"state" : {
|
||||
"revision" : "114354e8c1667a2edc4993700fb9fa4f90157b56",
|
||||
"version" : "1.2.2"
|
||||
"revision" : "5928286acce13def418ec36d05a001a9641086f2",
|
||||
"version" : "1.0.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "jsonutilities",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/yonaskolb/JSONUtilities.git",
|
||||
"state" : {
|
||||
"revision" : "128d2ffc22467f69569ef8ff971683e2393191a0",
|
||||
"version" : "4.2.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -42,17 +51,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/mattpolzin/OpenAPIKit",
|
||||
"state" : {
|
||||
"revision" : "5b72eb9a6b23b1fec439d9a0bf38f115400421f9",
|
||||
"version" : "6.4.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "opencombine",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/OpenCombine/OpenCombine.git",
|
||||
"state" : {
|
||||
"revision" : "8576f0d579b27020beccbccc3ea6844f3ddfc2c2",
|
||||
"version" : "0.14.0"
|
||||
"revision" : "da7d3a5ddff0dd8e5e9fdb5585d186d645bcc21b",
|
||||
"version" : "3.5.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -64,6 +64,15 @@
|
||||
"version" : "1.0.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "rainbow",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/onevcat/Rainbow.git",
|
||||
"state" : {
|
||||
"revision" : "0c627a4f8a39ef37eadec1ceec02e4a7f55561ac",
|
||||
"version" : "4.1.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "spectre",
|
||||
"kind" : "remoteSourceControl",
|
||||
@@ -85,10 +94,10 @@
|
||||
{
|
||||
"identity" : "swift-argument-parser",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-argument-parser.git",
|
||||
"location" : "https://github.com/apple/swift-argument-parser",
|
||||
"state" : {
|
||||
"revision" : "6a52f3251125d74daf04fcbd5e6f08a75d074382",
|
||||
"version" : "1.8.2"
|
||||
"revision" : "41982a3656a71c768319979febd796c6fd111d5c",
|
||||
"version" : "1.5.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -96,17 +105,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-asn1.git",
|
||||
"state" : {
|
||||
"revision" : "3b6410f7dee09eb33cdd26260c5fd47fda19b0e2",
|
||||
"version" : "1.7.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-async-algorithms",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-async-algorithms.git",
|
||||
"state" : {
|
||||
"revision" : "13713a4ffdee8abd929f92568ee9462a46ae26e0",
|
||||
"version" : "1.1.7"
|
||||
"revision" : "a54383ada6cecde007d374f58f864e29370ba5c3",
|
||||
"version" : "1.3.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -114,8 +114,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-atomics.git",
|
||||
"state" : {
|
||||
"revision" : "0442cb5a3f98ab802acb777929fdb446bda11a34",
|
||||
"version" : "1.3.1"
|
||||
"revision" : "cd142fd2f64be2100422d658e7411e39489da985",
|
||||
"version" : "1.2.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -123,8 +123,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-certificates",
|
||||
"state" : {
|
||||
"revision" : "ff86b924ead66f853b8baf91f3c41926a8f36177",
|
||||
"version" : "1.21.0"
|
||||
"revision" : "999fd70c7803da89f3904d635a6815a2a7cd7585",
|
||||
"version" : "1.10.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -132,17 +132,17 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-clocks",
|
||||
"state" : {
|
||||
"revision" : "82440fa0a8b1c381a6d1e8e0fc7bbba53ec63204",
|
||||
"version" : "1.1.1"
|
||||
"revision" : "cc46202b53476d64e824e0b6612da09d84ffde8e",
|
||||
"version" : "1.0.6"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-collections",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-collections",
|
||||
"location" : "https://github.com/apple/swift-collections.git",
|
||||
"state" : {
|
||||
"revision" : "35a1edcb8ebd2bfe251d587f0b69e62af28f508c",
|
||||
"version" : "1.7.3"
|
||||
"revision" : "671108c96644956dddcd89dd59c203dcdb36cec7",
|
||||
"version" : "1.1.4"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -150,17 +150,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-concurrency-extras",
|
||||
"state" : {
|
||||
"revision" : "8a4260f7373493435bd21194585c95b72bfdd401",
|
||||
"version" : "1.4.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-configuration",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-configuration.git",
|
||||
"state" : {
|
||||
"revision" : "8bae88f79dbddec793390c5bf3e2abb4ac2ece42",
|
||||
"version" : "1.2.2"
|
||||
"revision" : "82a4ae7170d98d8538ec77238b7eb8e7199ef2e8",
|
||||
"version" : "1.3.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -168,8 +159,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-crypto",
|
||||
"state" : {
|
||||
"revision" : "c2cbadd7263439d8015189668f96ff5b5be565ce",
|
||||
"version" : "5.0.3"
|
||||
"revision" : "e8d6eba1fef23ae5b359c46b03f7d94be2f41fed",
|
||||
"version" : "3.12.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -177,26 +168,17 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-dependencies",
|
||||
"state" : {
|
||||
"revision" : "b476cc5761057d8d857de063fe7ac8daecf5c06b",
|
||||
"version" : "1.17.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-distributed-tracing",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-distributed-tracing.git",
|
||||
"state" : {
|
||||
"revision" : "297b5b9c82a5631e3199ce3ec0993a3cfb0fbb84",
|
||||
"version" : "1.7.2"
|
||||
"revision" : "4c90d6b2b9bf0911af87b103bb40f41771891596",
|
||||
"version" : "1.9.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-docc-plugin",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/swiftlang/swift-docc-plugin",
|
||||
"location" : "https://github.com/apple/swift-docc-plugin",
|
||||
"state" : {
|
||||
"revision" : "647c708be89f834fa6a6d4945442793a77ddf5b6",
|
||||
"version" : "1.5.0"
|
||||
"revision" : "85e4bb4e1cd62cec64a4b8e769dcefdf0c5b9d64",
|
||||
"version" : "1.4.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -213,8 +195,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-http-structured-headers.git",
|
||||
"state" : {
|
||||
"revision" : "933538faa42c432d385f02e07df0ace7c5ecfc47",
|
||||
"version" : "1.7.0"
|
||||
"revision" : "f280fc7676b9940ff2c6598642751ea333c6544f",
|
||||
"version" : "1.2.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -222,17 +204,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-http-types",
|
||||
"state" : {
|
||||
"revision" : "bff4b6903cdc99dda49649dd52f46c11cfd3ed50",
|
||||
"version" : "1.8.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-issue-reporting",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-issue-reporting",
|
||||
"state" : {
|
||||
"revision" : "b23bb4493c439d3e05152bc167014235ba3d47fc",
|
||||
"version" : "2.1.2"
|
||||
"revision" : "a0a57e949a8903563aba4615869310c0ebf14c03",
|
||||
"version" : "1.4.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -240,8 +213,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-log.git",
|
||||
"state" : {
|
||||
"revision" : "4038b6a4f74a1426f47eb1dd5b4bb5628a15d597",
|
||||
"version" : "1.16.1"
|
||||
"revision" : "3d8596ed08bd13520157f0355e35caed215ffbfa",
|
||||
"version" : "1.6.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -249,8 +222,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-nio",
|
||||
"state" : {
|
||||
"revision" : "6db9d9abd92ad7399b8a564cafbb87d3507245fa",
|
||||
"version" : "2.104.0"
|
||||
"revision" : "0f54d58bb5db9e064f332e8524150de379d1e51c",
|
||||
"version" : "2.82.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -258,8 +231,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-nio-extras.git",
|
||||
"state" : {
|
||||
"revision" : "41449336c8ecfadac6b4b5be75f9c3c306e61ced",
|
||||
"version" : "1.35.1"
|
||||
"revision" : "f1f6f772198bee35d99dd145f1513d8581a54f2c",
|
||||
"version" : "1.26.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -267,8 +240,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-nio-http2.git",
|
||||
"state" : {
|
||||
"revision" : "0f3e54e29c944c2e835ad52159da7d9e1c94ac69",
|
||||
"version" : "1.46.0"
|
||||
"revision" : "4281466512f63d1bd530e33f4aa6993ee7864be0",
|
||||
"version" : "1.36.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -276,8 +249,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-nio-ssl.git",
|
||||
"state" : {
|
||||
"revision" : "322f3c2a4a21df31c84ca416bf65ee5e9059e440",
|
||||
"version" : "2.37.5"
|
||||
"revision" : "6df102a39c8da5fdc2eae29a0f63546d660866fc",
|
||||
"version" : "2.30.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -285,8 +258,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-nio-transport-services.git",
|
||||
"state" : {
|
||||
"revision" : "67787bb645a5e67d2edcdfbe48a216cc549222d5",
|
||||
"version" : "1.28.0"
|
||||
"revision" : "cd1e89816d345d2523b11c55654570acd5cd4c56",
|
||||
"version" : "1.24.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -294,8 +267,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-numerics.git",
|
||||
"state" : {
|
||||
"revision" : "0c0290ff6b24942dadb83a929ffaaa1481df04a2",
|
||||
"version" : "1.1.1"
|
||||
"revision" : "e0ec0f5f3af6f3e4d5e7a19d2af26b481acb6ba8",
|
||||
"version" : "1.0.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -303,8 +276,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/swift-server/swift-openapi-async-http-client",
|
||||
"state" : {
|
||||
"revision" : "3681f659d9417652b8119f0adbdf57c04b6cb292",
|
||||
"version" : "1.5.0"
|
||||
"revision" : "915aeff168625b0f88a5810ee7ab8e9c00af671b",
|
||||
"version" : "1.1.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -312,8 +285,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-openapi-generator",
|
||||
"state" : {
|
||||
"revision" : "164dfbcf1f78e2ddc719ab9d85c50d1157fa8d7d",
|
||||
"version" : "1.14.2"
|
||||
"revision" : "02cab48b66b4b412013827c2938adaf0eb67dc8d",
|
||||
"version" : "1.7.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -321,8 +294,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-openapi-runtime",
|
||||
"state" : {
|
||||
"revision" : "ad7a252e215870ea2de9cf8605ff9336b004183a",
|
||||
"version" : "1.13.1"
|
||||
"revision" : "8f33cc5dfe81169fb167da73584b9c72c3e8bc23",
|
||||
"version" : "1.8.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -330,35 +303,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-openapi-urlsession",
|
||||
"state" : {
|
||||
"revision" : "c97e0f0187d95542b4a254f5bb4dc67f43bf73c9",
|
||||
"version" : "1.4.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-service-context",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-service-context.git",
|
||||
"state" : {
|
||||
"revision" : "853ba3d9ce78851b9cc20108e8bd4f13f7fa546c",
|
||||
"version" : "1.5.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-service-lifecycle",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/swift-server/swift-service-lifecycle",
|
||||
"state" : {
|
||||
"revision" : "a18ee16b8039866fd919bdb4e8e906882d4ecc75",
|
||||
"version" : "2.13.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-subprocess",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/swiftlang/swift-subprocess",
|
||||
"state" : {
|
||||
"revision" : "dbe21bd7dfd4ffef8c32588918542a8abfa1b54c",
|
||||
"version" : "1.0.2"
|
||||
"revision" : "6fac6f7c428d5feea2639b5f5c8b06ddfb79434b",
|
||||
"version" : "1.1.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -366,17 +312,26 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/swiftlang/swift-syntax",
|
||||
"state" : {
|
||||
"revision" : "050f1a346fbbac0ca2cfb15a95274f7bd1cf0ccf",
|
||||
"version" : "604.0.0"
|
||||
"revision" : "f99ae8aa18f0cf0d53481901f88a0991dc3bd4a2",
|
||||
"version" : "601.0.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-system",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-system.git",
|
||||
"location" : "https://github.com/apple/swift-system",
|
||||
"state" : {
|
||||
"revision" : "869129b7bf4ecc57b97d0193ad29690ca2134750",
|
||||
"version" : "1.8.1"
|
||||
"revision" : "a34201439c74b53f0fd71ef11741af7e7caf01e1",
|
||||
"version" : "1.4.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swiftcli",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/jakeheis/SwiftCLI.git",
|
||||
"state" : {
|
||||
"revision" : "2e949055d9797c1a6bddcda0e58dada16cc8e970",
|
||||
"version" : "6.0.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -384,8 +339,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/xtool-org/SwiftyMobileDevice",
|
||||
"state" : {
|
||||
"revision" : "1f6e4cc614a31953bda5d1092a747cfdea90916f",
|
||||
"version" : "1.7.0"
|
||||
"revision" : "280d0dc8153469944491aee2f19af29e9c7a77f0",
|
||||
"version" : "1.5.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -393,8 +348,17 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/saagarjha/unxip",
|
||||
"state" : {
|
||||
"revision" : "6c3990517fcc4c1db6952fccf4c562fb14097601",
|
||||
"version" : "3.3.0"
|
||||
"revision" : "03c32d6b4e7d8a9fb58747e5f8b83397da8bf5ba",
|
||||
"version" : "3.2.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "version",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/mxcl/Version",
|
||||
"state" : {
|
||||
"revision" : "303a0f916772545e1e8667d3104f83be708a723c",
|
||||
"version" : "2.1.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -402,17 +366,17 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/vapor/websocket-kit.git",
|
||||
"state" : {
|
||||
"revision" : "90bbbdab3ede12c803cfbe91646f291c092517a3",
|
||||
"version" : "2.16.2"
|
||||
"revision" : "014ccd52891b8c098d7e1033d5e72ed76fef7a86",
|
||||
"version" : "2.16.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "xcode-project-format",
|
||||
"identity" : "xcodegen",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/xcode-project-format.git",
|
||||
"location" : "https://github.com/yonaskolb/XcodeGen",
|
||||
"state" : {
|
||||
"revision" : "c132630aabf40f6d6c3f7bb004595d2e5a28ea42",
|
||||
"version" : "0.1.0"
|
||||
"revision" : "7193eb447a6f60061f069e07bc1efd32d73c0e19",
|
||||
"version" : "2.43.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -420,8 +384,17 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/tuist/XcodeProj.git",
|
||||
"state" : {
|
||||
"revision" : "b505c06bb190b9306b29d5d96e3284e139af3cc8",
|
||||
"version" : "9.17.6"
|
||||
"revision" : "dc3b87a4e69f9cd06c6cb16199f5d0472e57ef6b",
|
||||
"version" : "8.24.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "xctest-dynamic-overlay",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
|
||||
"state" : {
|
||||
"revision" : "39de59b2d47f7ef3ca88a039dff3084688fe27f4",
|
||||
"version" : "1.5.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -429,8 +402,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/xtool-org/xtool-core",
|
||||
"state" : {
|
||||
"revision" : "154d7213c12e3f21d50793f50ec7bfb89cfd3918",
|
||||
"version" : "1.5.1"
|
||||
"revision" : "d412ac768d1e73d16ad7ccc6805f12fc701709f6",
|
||||
"version" : "1.4.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -438,8 +411,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/jpsim/Yams",
|
||||
"state" : {
|
||||
"revision" : "a27b21e0c81c5bf42049b897a62aaf387e80f279",
|
||||
"version" : "6.2.2"
|
||||
"revision" : "b4b8042411dc7bbb696300a34a4bf3ba1b7ad19b",
|
||||
"version" : "5.3.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -447,8 +420,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/xtool-org/zsign",
|
||||
"state" : {
|
||||
"revision" : "f6158be9e62a5ce2a53d72b1a6d880880da956c8",
|
||||
"version" : "1.9.0"
|
||||
"revision" : "fb10d47dd24bb84886532497bac149232e67f07a",
|
||||
"version" : "1.6.0"
|
||||
}
|
||||
}
|
||||
],
|
||||
|
||||
+37
-68
@@ -1,4 +1,4 @@
|
||||
// swift-tools-version:6.2
|
||||
// swift-tools-version:6.0
|
||||
|
||||
import PackageDescription
|
||||
|
||||
@@ -19,19 +19,11 @@ let cSettings: [CSetting] = [
|
||||
.define("_GNU_SOURCE", .when(platforms: [.linux])),
|
||||
]
|
||||
|
||||
let swiftSettings: [SwiftSetting] = {
|
||||
var settings: [SwiftSetting] = []
|
||||
if Context.environment["XTL_CI"] == "1" {
|
||||
settings.append(.treatAllWarnings(as: .error))
|
||||
}
|
||||
return settings
|
||||
}()
|
||||
|
||||
let package = Package(
|
||||
name: "xtool",
|
||||
platforms: [
|
||||
.iOS(.v17),
|
||||
.macOS(.v14),
|
||||
.iOS(.v15),
|
||||
.macOS(.v12),
|
||||
],
|
||||
products: [
|
||||
.library(
|
||||
@@ -48,24 +40,20 @@ let package = Package(
|
||||
),
|
||||
],
|
||||
dependencies: [
|
||||
.package(url: "https://github.com/xtool-org/xtool-core", .upToNextMinor(from: "1.5.1")),
|
||||
.package(url: "https://github.com/xtool-org/SwiftyMobileDevice", .upToNextMinor(from: "1.7.0")),
|
||||
.package(url: "https://github.com/xtool-org/zsign", .upToNextMinor(from: "1.9.0")),
|
||||
.package(url: "https://github.com/xtool-org/xtool-core", .upToNextMinor(from: "1.4.0")),
|
||||
.package(url: "https://github.com/xtool-org/SwiftyMobileDevice", .upToNextMinor(from: "1.5.0")),
|
||||
.package(url: "https://github.com/xtool-org/zsign", .upToNextMinor(from: "1.6.0")),
|
||||
|
||||
.package(url: "https://github.com/apple/swift-system", from: "1.4.0"),
|
||||
.package(url: "https://github.com/apple/swift-http-types", from: "1.3.1"),
|
||||
.package(url: "https://github.com/apple/swift-certificates", from: "1.0.0"),
|
||||
.package(url: "https://github.com/apple/swift-crypto", from: "5.0.0"),
|
||||
.package(url: "https://github.com/apple/swift-crypto", from: "3.9.1"),
|
||||
.package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"),
|
||||
.package(url: "https://github.com/apple/swift-openapi-generator", from: "1.6.0"),
|
||||
.package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.0.0"),
|
||||
.package(url: "https://github.com/apple/swift-openapi-urlsession", from: "1.0.0"),
|
||||
.package(url: "https://github.com/apple/swift-nio", from: "2.77.0"),
|
||||
.package(url: "https://github.com/apple/swift-collections", from: "1.7.1"),
|
||||
.package(url: "https://github.com/apple/xcode-project-format.git", .upToNextMinor(from: "0.1.0")),
|
||||
|
||||
.package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.0.0"),
|
||||
.package(url: "https://github.com/swiftlang/swift-subprocess", from: "1.0.0"),
|
||||
.package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"),
|
||||
|
||||
.package(url: "https://github.com/swift-server/async-http-client.git", from: "1.23.0"),
|
||||
.package(url: "https://github.com/swift-server/swift-openapi-async-http-client", from: "1.0.0"),
|
||||
@@ -73,18 +61,17 @@ let package = Package(
|
||||
|
||||
.package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.3.0"),
|
||||
.package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.6.2"),
|
||||
// we don't use this but need the explicit dependency to keep the lockfile stable.
|
||||
// TODO: remove once https://github.com/pointfreeco/combine-schedulers/issues/120 is fixed
|
||||
.package(url: "https://github.com/OpenCombine/OpenCombine.git", from: "0.14.0"),
|
||||
|
||||
.package(url: "https://github.com/attaswift/BigInt", from: "6.0.0"),
|
||||
.package(url: "https://github.com/jpsim/Yams", from: "6.0.0"),
|
||||
.package(url: "https://github.com/attaswift/BigInt", from: "5.5.0"),
|
||||
.package(url: "https://github.com/mxcl/Version", from: "2.1.0"),
|
||||
.package(url: "https://github.com/jpsim/Yams", from: "5.1.3"),
|
||||
.package(url: "https://github.com/saagarjha/unxip", from: "3.2.0"),
|
||||
|
||||
// NB: this should only be imported from XcodeProjects
|
||||
.package(url: "https://github.com/tuist/XcodeProj.git", from: "9.17.5"),
|
||||
// TODO: just depend on tuist/XcodeProj instead
|
||||
.package(url: "https://github.com/yonaskolb/XcodeGen", from: "2.43.0"),
|
||||
],
|
||||
targets: [
|
||||
.systemLibrary(name: "XADI"),
|
||||
.target(
|
||||
name: "CXKit",
|
||||
dependencies: [
|
||||
@@ -101,28 +88,14 @@ let package = Package(
|
||||
dependencies: [
|
||||
.product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"),
|
||||
],
|
||||
exclude: ["openapi-generator-config.yaml", "patch.js"],
|
||||
swiftSettings: swiftSettings,
|
||||
),
|
||||
// common utilities shared across xtool targets
|
||||
.target(
|
||||
name: "XUtils",
|
||||
dependencies: [
|
||||
.product(name: "SystemPackage", package: "swift-system"),
|
||||
.product(
|
||||
name: "Subprocess",
|
||||
package: "swift-subprocess",
|
||||
condition: .when(platforms: [.linux, .macOS])
|
||||
),
|
||||
],
|
||||
swiftSettings: swiftSettings,
|
||||
exclude: ["openapi-generator-config.yaml", "patch.js"]
|
||||
),
|
||||
.target(
|
||||
name: "XKit",
|
||||
dependencies: [
|
||||
"DeveloperAPI",
|
||||
"CXKit",
|
||||
"XUtils",
|
||||
.byName(name: "XADI", condition: .when(platforms: [.linux])),
|
||||
.product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
|
||||
.product(name: "Dependencies", package: "swift-dependencies"),
|
||||
.product(name: "SwiftyMobileDevice", package: "SwiftyMobileDevice"),
|
||||
@@ -131,7 +104,7 @@ let package = Package(
|
||||
.product(name: "ProtoCodable", package: "xtool-core"),
|
||||
.product(name: "Superutils", package: "xtool-core"),
|
||||
.product(name: "Crypto", package: "swift-crypto"),
|
||||
.product(name: "CryptoExtras", package: "swift-crypto"),
|
||||
.product(name: "_CryptoExtras", package: "swift-crypto"),
|
||||
.product(name: "X509", package: "swift-certificates"),
|
||||
.product(name: "BigInt", package: "BigInt"),
|
||||
.product(name: "HTTPTypes", package: "swift-http-types"),
|
||||
@@ -153,19 +126,27 @@ let package = Package(
|
||||
condition: .when(platforms: [.linux])
|
||||
),
|
||||
],
|
||||
cSettings: cSettings,
|
||||
swiftSettings: swiftSettings,
|
||||
cSettings: cSettings
|
||||
),
|
||||
.testTarget(
|
||||
name: "XToolTests",
|
||||
dependencies: [
|
||||
"XKit",
|
||||
"XToolSupport",
|
||||
"PackLib",
|
||||
.product(name: "Crypto", package: "swift-crypto"),
|
||||
.product(name: "X509", package: "swift-certificates"),
|
||||
]
|
||||
),
|
||||
.testTarget(
|
||||
name: "XKitTests",
|
||||
dependencies: [
|
||||
"XKit",
|
||||
.product(name: "SuperutilsTestSupport", package: "xtool-core")
|
||||
],
|
||||
swiftSettings: swiftSettings,
|
||||
exclude: [
|
||||
"config/config-template.json",
|
||||
],
|
||||
resources: [
|
||||
.copy("config/config.json"),
|
||||
.copy("config/test.app"),
|
||||
]
|
||||
),
|
||||
.target(
|
||||
name: "XToolSupport",
|
||||
@@ -176,28 +157,17 @@ let package = Package(
|
||||
.product(name: "ArgumentParser", package: "swift-argument-parser"),
|
||||
.product(name: "SystemPackage", package: "swift-system"),
|
||||
.product(name: "NIOPosix", package: "swift-nio"),
|
||||
.product(name: "Version", package: "Version"),
|
||||
.product(name: "libunxip", package: "unxip"),
|
||||
],
|
||||
cSettings: cSettings,
|
||||
swiftSettings: swiftSettings,
|
||||
),
|
||||
.target(
|
||||
name: "XcodeProjects",
|
||||
dependencies: [
|
||||
.product(name: "XcodeProj", package: "XcodeProj"),
|
||||
.product(name: "XcodeProjectFormat", package: "xcode-project-format"),
|
||||
],
|
||||
cSettings: cSettings
|
||||
),
|
||||
.target(
|
||||
name: "PackLib",
|
||||
dependencies: [
|
||||
"XUtils",
|
||||
"XcodeProjects",
|
||||
.product(name: "Superutils", package: "xtool-core"),
|
||||
.product(name: "Yams", package: "Yams"),
|
||||
.product(name: "XcodeProjectFormat", package: "xcode-project-format"),
|
||||
],
|
||||
swiftSettings: swiftSettings,
|
||||
.product(name: "XcodeGenKit", package: "XcodeGen", condition: .when(platforms: [.macOS])),
|
||||
]
|
||||
),
|
||||
.executableTarget(
|
||||
name: "xtool",
|
||||
@@ -206,8 +176,7 @@ let package = Package(
|
||||
"XKit",
|
||||
"XToolSupport",
|
||||
],
|
||||
cSettings: cSettings,
|
||||
swiftSettings: swiftSettings,
|
||||
cSettings: cSettings
|
||||
),
|
||||
]
|
||||
)
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -65,7 +65,7 @@ function openAll(schema, path = []) {
|
||||
function patch(schema) {
|
||||
const schemas = schema.components.schemas;
|
||||
|
||||
// this field is required iff using the private Xcode API
|
||||
// this field is required when using the private Xcode API
|
||||
update(schemas.BundleIdCapabilityCreateRequest.properties.data.properties.relationships, {
|
||||
properties: {
|
||||
capability: {
|
||||
@@ -86,6 +86,7 @@ function patch(schema) {
|
||||
required: ['data'],
|
||||
}
|
||||
},
|
||||
required: ['capability'],
|
||||
})
|
||||
|
||||
// we don't use this but it triggers a deprecation warning. see:
|
||||
|
||||
@@ -1,126 +1,64 @@
|
||||
import Foundation
|
||||
import Subprocess
|
||||
import XUtils
|
||||
import Superutils
|
||||
|
||||
public struct BuildSettings: Sendable {
|
||||
private static let customBinDir =
|
||||
// this is the same option used by SwiftPM itself for dev builds
|
||||
ProcessInfo.processInfo.environment["SWIFTPM_CUSTOM_BIN_DIR"].map { FilePath($0) }
|
||||
ProcessInfo.processInfo.environment["SWIFTPM_CUSTOM_BIN_DIR"].map { URL(fileURLWithPath: $0) }
|
||||
|
||||
public var packagePath: String
|
||||
private static let envURL = URL(fileURLWithPath: "/usr/bin/env")
|
||||
|
||||
public let packagePath: String
|
||||
public let configuration: BuildConfiguration
|
||||
public let triple: String
|
||||
public let buildSystem: BuildSystem
|
||||
public let customOptions: [String]
|
||||
|
||||
public var sdkOptions: [String]
|
||||
public var sdkEnvironment: [Environment.Key: String?]
|
||||
|
||||
private var configOptions: [String] {
|
||||
return [
|
||||
"--configuration", configuration.rawValue,
|
||||
"--build-system", buildSystem.pmName,
|
||||
"--package-path", packagePath,
|
||||
]
|
||||
}
|
||||
|
||||
private var resolvedBaseOptions: [String] {
|
||||
configOptions + sdkOptions + customOptions
|
||||
}
|
||||
public let sdkOptions: [String]
|
||||
public let options: [String]
|
||||
|
||||
public init(
|
||||
configuration: BuildConfiguration,
|
||||
triple: String,
|
||||
buildSystem: BuildSystem? = nil,
|
||||
packagePath: String = ".",
|
||||
options: [String] = []
|
||||
) async throws {
|
||||
self.packagePath = packagePath
|
||||
self.configuration = configuration
|
||||
self.customOptions = options
|
||||
self.options = options
|
||||
self.triple = triple
|
||||
self.buildSystem = if let buildSystem { buildSystem } else { try await .default() }
|
||||
|
||||
self.sdkEnvironment = [
|
||||
// xcrun passes an SDKROOT that messes with our sdk configuration
|
||||
"SDKROOT": nil,
|
||||
]
|
||||
|
||||
switch self.buildSystem {
|
||||
case .swiftPM:
|
||||
// on macOS we don't explicitly install a Swift SDK but
|
||||
// SwiftPM vends "implicit" Darwin SDKs as of Swift 6.1,
|
||||
// i.e. we can pass `--swift-sdk arm64-apple-ios` and it
|
||||
// just works. See:
|
||||
// https://github.com/swiftlang/swift-package-manager/pull/6828
|
||||
self.sdkOptions = ["--swift-sdk", triple]
|
||||
case .swiftBuild:
|
||||
self.sdkOptions = ["--triple", triple]
|
||||
#if !os(macOS)
|
||||
let darwinSDK = try DarwinSDK.current()
|
||||
.orThrow(StringError("No Darwin SDK configured. Please run `xtool setup`."))
|
||||
self.sdkOptions += [
|
||||
"--toolset", "\(darwinSDK.bundle.path)/toolset-swb.json",
|
||||
]
|
||||
self.sdkEnvironment.merge([
|
||||
"XCODE_EXTRA_PLATFORM_FOLDERS": "\(darwinSDK.bundle.path)/Developer/Platforms",
|
||||
// SWB looks for dsymutil in the PATH. Other stuff (lld, libtool) is handled by toolset-swb.json.
|
||||
"PATH": "\(darwinSDK.bundle.path)/toolset/bin:\(ProcessInfo.processInfo.environment["PATH"] ?? "")",
|
||||
]) { $1 }
|
||||
#endif
|
||||
}
|
||||
// on macOS we don't explicitly install a Swift SDK but
|
||||
// SwiftPM vends "implicit" Darwin SDKs as of Swift 6.1,
|
||||
// i.e. we can pass `--swift-sdk arm64-apple-ios` and it
|
||||
// just works. See:
|
||||
// https://github.com/swiftlang/swift-package-manager/pull/6828
|
||||
self.sdkOptions = ["--swift-sdk", triple]
|
||||
}
|
||||
|
||||
#if os(macOS)
|
||||
private static func xcrun(_ arguments: [String]) async throws -> String {
|
||||
let result = try await Subprocess.run(
|
||||
.path("/usr/bin/xcrun"),
|
||||
arguments: .init(arguments),
|
||||
output: .string(limit: .max)
|
||||
).checkSuccess()
|
||||
return result.standardOutput.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
let xcrun = Process()
|
||||
let pipe = Pipe()
|
||||
xcrun.executableURL = URL(fileURLWithPath: "/usr/bin/xcrun")
|
||||
xcrun.arguments = arguments
|
||||
xcrun.standardOutput = pipe
|
||||
try await xcrun.runUntilExit()
|
||||
return String(decoding: pipe.fileHandleForReading.readDataToEndOfFile(), as: UTF8.self)
|
||||
.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
}
|
||||
|
||||
private static let _swiftURL = Task {
|
||||
try await FilePath(xcrun(["-f", "swift"]))
|
||||
}
|
||||
|
||||
public static func swiftURL() async throws -> FilePath {
|
||||
try await _swiftURL.value
|
||||
}
|
||||
|
||||
private static let _swiftcURL = Task {
|
||||
try await FilePath(xcrun(["-f", "swiftc"]))
|
||||
}
|
||||
|
||||
public static func swiftcURL() async throws -> FilePath {
|
||||
try await _swiftcURL.value
|
||||
}
|
||||
#else
|
||||
public static func swiftURL() async throws -> FilePath {
|
||||
try await FilePath(ToolRegistry.locate("swift")).orThrow(StringError("Got bad path for swift executable"))
|
||||
}
|
||||
|
||||
public static func swiftcURL() async throws -> FilePath {
|
||||
try await FilePath(ToolRegistry.locate("swiftc")).orThrow(StringError("Got bad path for swiftc executable"))
|
||||
private static let swiftURL = Task {
|
||||
try await URL(fileURLWithPath: xcrun(["-f", "swift"]))
|
||||
}
|
||||
#endif
|
||||
|
||||
public func withPackagePath(_ path: String) -> Self {
|
||||
var copy = self
|
||||
copy.packagePath = path
|
||||
return copy
|
||||
}
|
||||
|
||||
public func swiftPMInvocation(
|
||||
forTool tool: String,
|
||||
arguments: [String],
|
||||
) async throws -> Subprocess.Configuration {
|
||||
let executable: Executable
|
||||
packagePathOverride: String? = nil
|
||||
) async throws -> Process {
|
||||
let process = Process()
|
||||
|
||||
let baseArguments: [String]
|
||||
if let customBinDir = Self.customBinDir {
|
||||
executable = .path(customBinDir.appending("swift-\(tool)"))
|
||||
process.executableURL = customBinDir.appendingPathComponent("swift-\(tool)")
|
||||
baseArguments = []
|
||||
} else {
|
||||
#if os(macOS)
|
||||
@@ -128,71 +66,28 @@ public struct BuildSettings: Sendable {
|
||||
// to add SDKROOT=.../MacOSX.sdk to our invocations. We avoid this by
|
||||
// 1) invoking the real swift executable (located with `xcrun -f`) and
|
||||
// 2) explicitly removing SDKROOT from the env, as it may be inherited
|
||||
// through a parent process (e.g. `swift run xtool`).
|
||||
executable = .path(try await Self.swiftURL())
|
||||
// through the `swift run pack` invocation.
|
||||
process.executableURL = try await Self.swiftURL.value
|
||||
#else
|
||||
executable = .name("swift")
|
||||
process.executableURL = try await ToolRegistry.locate("swift")
|
||||
#endif
|
||||
baseArguments = [tool]
|
||||
}
|
||||
|
||||
return Configuration(
|
||||
executable: executable,
|
||||
arguments: .init(baseArguments + resolvedBaseOptions + arguments),
|
||||
environment: .inherit.updating(sdkEnvironment),
|
||||
platformOptions: .withGracefulShutDown,
|
||||
)
|
||||
}
|
||||
|
||||
// loosely based on
|
||||
// https://github.com/swiftlang/sourcekit-lsp/blob/c55899a/Sources/BuildServerIntegration/ExternalBuildServerAdapter.swift#L92
|
||||
private var baseBuildServerArguments: [String] {
|
||||
return [
|
||||
"experimental-build-server",
|
||||
"--disable-automatic-resolution",
|
||||
"--scratch-path", ".build/index-build",
|
||||
// this requires Swift 6.4 but we need 6.4 on Linux anyway, for the platform toolset fixes
|
||||
"--experimental-skip-acquiring-lock",
|
||||
let extraArguments: [String] = [
|
||||
"--package-path", packagePathOverride ?? packagePath,
|
||||
"--configuration", configuration.rawValue,
|
||||
]
|
||||
}
|
||||
|
||||
public var buildServerArguments: [String] {
|
||||
["package"] + baseBuildServerArguments + resolvedBaseOptions
|
||||
}
|
||||
|
||||
public func buildServerInvocation() async throws -> Subprocess.Configuration {
|
||||
try await swiftPMInvocation(forTool: "package", arguments: baseBuildServerArguments)
|
||||
var env = ProcessInfo.processInfo.environment
|
||||
env.removeValue(forKey: "SDKROOT")
|
||||
process.environment = env
|
||||
process.arguments = baseArguments + extraArguments + sdkOptions + options + arguments
|
||||
return process
|
||||
}
|
||||
}
|
||||
|
||||
public enum BuildConfiguration: String, CaseIterable, Sendable {
|
||||
case debug
|
||||
case release
|
||||
|
||||
var swiftBuildValue: String {
|
||||
switch self {
|
||||
case .debug: "Debug"
|
||||
case .release: "Release"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public enum BuildSystem: Sendable {
|
||||
case swiftPM
|
||||
case swiftBuild
|
||||
|
||||
public static func `default`() async throws -> Self {
|
||||
if try await SwiftVersion.current.supportsSwiftBuild {
|
||||
return .swiftBuild
|
||||
} else {
|
||||
return .swiftPM
|
||||
}
|
||||
}
|
||||
|
||||
var pmName: String {
|
||||
switch self {
|
||||
case .swiftPM: "native"
|
||||
case .swiftBuild: "swiftbuild"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,132 +0,0 @@
|
||||
import Foundation
|
||||
import XUtils
|
||||
import Subprocess
|
||||
import Superutils
|
||||
|
||||
public struct DarwinSDK {
|
||||
package struct TemporaryBundle: ~Copyable {
|
||||
package let url: URL
|
||||
|
||||
fileprivate init(url: URL) {
|
||||
self.url = url
|
||||
}
|
||||
|
||||
package consuming func install() async throws {
|
||||
guard DarwinSDK(bundle: url) != nil else {
|
||||
throw StringError("Invalid Darwin SDK at '\(url.path)'")
|
||||
}
|
||||
|
||||
try await DarwinSDK.addHostClangResourceDir(to: url)
|
||||
|
||||
let destination = url.deletingLastPathComponent()
|
||||
.appendingPathComponent("darwin.artifactbundle", isDirectory: true)
|
||||
try FileManager.default.moveItem(at: url, to: destination)
|
||||
}
|
||||
|
||||
deinit {
|
||||
try? FileManager.default.removeItem(at: url)
|
||||
}
|
||||
}
|
||||
|
||||
public enum Flavor {
|
||||
// can't be updated in place
|
||||
case slim
|
||||
// can be updated in place, includes a whole copy of Xcode.app
|
||||
case normal
|
||||
// from before the slim/normal split existed (version "develop")
|
||||
case legacy
|
||||
}
|
||||
|
||||
public let bundle: URL
|
||||
public let version: String
|
||||
public let flavor: Flavor
|
||||
|
||||
static func swiftPMDirectory(
|
||||
environment: [String: String] = ProcessInfo.processInfo.environment,
|
||||
homeDirectory: URL = FileManager.default.homeDirectoryForCurrentUser
|
||||
) throws -> URL {
|
||||
if let configurationDirectory = environment["XDG_CONFIG_HOME"] {
|
||||
guard (configurationDirectory as NSString).isAbsolutePath else {
|
||||
throw StringError("XDG_CONFIG_HOME must be an absolute path: '\(configurationDirectory)'")
|
||||
}
|
||||
return URL(fileURLWithPath: configurationDirectory, isDirectory: true)
|
||||
.appendingPathComponent("swiftpm", isDirectory: true)
|
||||
} else {
|
||||
return homeDirectory.appendingPathComponent(".swiftpm", isDirectory: true)
|
||||
}
|
||||
}
|
||||
|
||||
private static func swiftSDKsDirectory(
|
||||
environment: [String: String] = ProcessInfo.processInfo.environment,
|
||||
homeDirectory: URL = FileManager.default.homeDirectoryForCurrentUser
|
||||
) throws -> URL {
|
||||
try swiftPMDirectory(environment: environment, homeDirectory: homeDirectory)
|
||||
.appendingPathComponent("swift-sdks", isDirectory: true)
|
||||
}
|
||||
|
||||
public init?(bundle: URL) {
|
||||
self.bundle = bundle
|
||||
if let version = try? Data(contentsOf: bundle.appendingPathComponent("darwin-sdk-version.txt")) {
|
||||
self.version = String(decoding: version, as: UTF8.self)
|
||||
.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
} else if ["darwin.xtoolsdk", "darwin.artifactbundle", "darwin.artifactbundle.tmp"].contains(bundle.lastPathComponent) {
|
||||
self.version = "develop"
|
||||
} else {
|
||||
return nil
|
||||
}
|
||||
|
||||
if version == "develop" {
|
||||
self.flavor = .legacy
|
||||
} else if bundle.appendingPathComponent("Xcode.app").dirExists {
|
||||
self.flavor = .normal
|
||||
} else {
|
||||
self.flavor = .slim
|
||||
}
|
||||
}
|
||||
|
||||
package static func prepareTemporaryBundle(
|
||||
environment: [String: String] = ProcessInfo.processInfo.environment,
|
||||
homeDirectory: URL = FileManager.default.homeDirectoryForCurrentUser
|
||||
) throws -> TemporaryBundle {
|
||||
let sdksDirectory = try swiftSDKsDirectory(environment: environment, homeDirectory: homeDirectory)
|
||||
try FileManager.default.createDirectory(at: sdksDirectory, withIntermediateDirectories: true)
|
||||
let bundle = sdksDirectory.appendingPathComponent("darwin.artifactbundle.tmp", isDirectory: true)
|
||||
if FileManager.default.fileExists(atPath: bundle.path) {
|
||||
try FileManager.default.removeItem(at: bundle)
|
||||
}
|
||||
return TemporaryBundle(url: bundle)
|
||||
}
|
||||
|
||||
private static func addHostClangResourceDir(to sdk: URL) async throws {
|
||||
struct SwiftTargetInfo: Decodable {
|
||||
struct Paths: Decodable {
|
||||
let runtimeResourcePath: String
|
||||
}
|
||||
let paths: Paths
|
||||
}
|
||||
|
||||
let process = try await Subprocess.run(
|
||||
.path(try await BuildSettings.swiftcURL()),
|
||||
arguments: ["-print-target-info"],
|
||||
output: .data(limit: .max)
|
||||
).checkSuccess()
|
||||
let targetInfo = try JSONDecoder().decode(
|
||||
SwiftTargetInfo.self,
|
||||
from: process.standardOutput
|
||||
)
|
||||
let hostClangResources = URL(filePath: targetInfo.paths.runtimeResourcePath).appending(path: "clang")
|
||||
let hostInclude = hostClangResources.appending(path: "include")
|
||||
let sdkInclude = sdk.appending(path: "Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/clang/include")
|
||||
try await FileManager.default.copyItem(at: hostInclude, to: sdkInclude, preserveOwner: false)
|
||||
}
|
||||
|
||||
public static func current() throws -> DarwinSDK? {
|
||||
let bundle = try swiftSDKsDirectory().appendingPathComponent("darwin.artifactbundle", isDirectory: true)
|
||||
guard bundle.dirExists else { return nil }
|
||||
return DarwinSDK(bundle: bundle)
|
||||
}
|
||||
|
||||
public func remove() throws {
|
||||
try FileManager.default.removeItem(at: bundle)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,56 @@
|
||||
import Foundation
|
||||
|
||||
package struct TemporaryDirectory: ~Copyable {
|
||||
private var shouldDelete = true
|
||||
|
||||
package let url: URL
|
||||
|
||||
package init(name: String) throws {
|
||||
self.url = FileManager.default.temporaryDirectory.appendingPathComponent(name, isDirectory: true)
|
||||
_delete()
|
||||
try FileManager.default.createDirectory(at: url, withIntermediateDirectories: true)
|
||||
}
|
||||
|
||||
private func _delete() {
|
||||
try? FileManager.default.removeItem(at: url)
|
||||
}
|
||||
|
||||
package consuming func persist() -> URL {
|
||||
shouldDelete = false
|
||||
return url
|
||||
}
|
||||
|
||||
package consuming func persist(at location: URL) throws {
|
||||
try FileManager.default.moveItem(at: url, to: location)
|
||||
// we do this after moving, so that if the move fails we clean up
|
||||
shouldDelete = false
|
||||
}
|
||||
|
||||
deinit {
|
||||
if shouldDelete { _delete() }
|
||||
}
|
||||
}
|
||||
|
||||
extension Data {
|
||||
// AsyncBytes is Darwin-only :/
|
||||
|
||||
package init(reading fileHandle: FileHandle) async throws {
|
||||
#if canImport(Darwin)
|
||||
self = try await fileHandle.bytes.reduce(into: Data()) { $0.append($1) }
|
||||
#else
|
||||
self = try fileHandle.readToEnd() ?? Data()
|
||||
#endif
|
||||
}
|
||||
|
||||
package init(reading file: URL) async throws {
|
||||
#if canImport(Darwin)
|
||||
self = try await file.resourceBytes.reduce(into: Data()) { $0.append($1) }
|
||||
#else
|
||||
try self.init(contentsOf: file)
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
package func stderrPrint(_ message: String, terminator: String = "\n") {
|
||||
try? FileHandle.standardError.write(contentsOf: Data("\(message)\(terminator)".utf8))
|
||||
}
|
||||
@@ -1,6 +1,5 @@
|
||||
import Foundation
|
||||
import Yams
|
||||
import XUtils
|
||||
|
||||
public struct PackSchemaBase: Codable, Sendable {
|
||||
public enum Version: Int, Codable, Sendable {
|
||||
@@ -22,9 +21,6 @@ public struct PackSchemaBase: Codable, Sendable {
|
||||
|
||||
public var extensions: [Extension]?
|
||||
|
||||
/// Skip auto-creating the LSP support file if it's missing.
|
||||
public var skipLSP: Bool?
|
||||
|
||||
public struct Extension: Codable, Sendable {
|
||||
public var product: String
|
||||
public var bundleID: String?
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
import Foundation
|
||||
import XUtils
|
||||
import Subprocess
|
||||
|
||||
public struct Packer: Sendable {
|
||||
public let buildSettings: BuildSettings
|
||||
@@ -17,13 +15,6 @@ public struct Packer: Sendable {
|
||||
try? FileManager.default.removeItem(at: packageDir)
|
||||
try FileManager.default.createDirectory(at: packageDir, withIntermediateDirectories: true)
|
||||
|
||||
if URL(fileURLWithPath: "Packages").dirExists {
|
||||
try FileManager.default.createSymbolicLink(
|
||||
atPath: packageDir.appendingPathComponent("Packages").path,
|
||||
withDestinationPath: "../../Packages"
|
||||
)
|
||||
}
|
||||
|
||||
let packageSwift = packageDir.appendingPathComponent("Package.swift")
|
||||
let contents = """
|
||||
// swift-tools-version: 6.0
|
||||
@@ -62,27 +53,22 @@ public struct Packer: Sendable {
|
||||
try Data().write(to: sources.appendingPathComponent("stub.c", isDirectory: false))
|
||||
}
|
||||
|
||||
let buildConfig = try await buildSettings
|
||||
.withPackagePath(packageDir.path)
|
||||
.swiftPMInvocation(
|
||||
forTool: "build",
|
||||
arguments: [
|
||||
"--scratch-path", ".build",
|
||||
// resolving can cause SwiftPM to overwrite the root package deps
|
||||
// with just the deps needed for the builder package (which is to
|
||||
// say, any "dev dependencies" of the root package may be removed.)
|
||||
// fortunately we've already resolved the root package by this point
|
||||
// in order to dump the plan, so we can skip resolution here to skirt
|
||||
// the issue.
|
||||
"--disable-automatic-resolution",
|
||||
],
|
||||
)
|
||||
try await Subprocess.run(
|
||||
buildConfig,
|
||||
output: .currentStandardOutput,
|
||||
error: .currentStandardError,
|
||||
let builder = try await buildSettings.swiftPMInvocation(
|
||||
forTool: "build",
|
||||
arguments: [
|
||||
"--package-path", packageDir.path,
|
||||
"--scratch-path", ".build",
|
||||
// resolving can cause SwiftPM to overwrite the root package deps
|
||||
// with just the deps needed for the builder package (which is to
|
||||
// say, any "dev dependencies" of the root package may be removed.)
|
||||
// fortunately we've already resolved the root package by this point
|
||||
// in order to dump the plan, so we can skip resolution here to skirt
|
||||
// the issue.
|
||||
"--disable-automatic-resolution",
|
||||
]
|
||||
)
|
||||
.checkSuccess()
|
||||
builder.standardOutput = FileHandle.standardError
|
||||
try await builder.runUntilExit()
|
||||
}
|
||||
|
||||
public func pack() async throws -> URL {
|
||||
@@ -92,16 +78,8 @@ public struct Packer: Sendable {
|
||||
|
||||
let outputURL = output.url
|
||||
|
||||
let binPath: String
|
||||
switch buildSettings.buildSystem {
|
||||
case .swiftPM:
|
||||
binPath = "\(buildSettings.triple)/\(buildSettings.configuration.rawValue)"
|
||||
case .swiftBuild:
|
||||
let platformName = buildSettings.triple.contains("simulator") ? "iphonesimulator" : "iphoneos"
|
||||
binPath = "out/Products/\(buildSettings.configuration.swiftBuildValue)-\(platformName)"
|
||||
}
|
||||
let binDir = URL(
|
||||
fileURLWithPath: ".build/\(binPath)",
|
||||
fileURLWithPath: ".build/\(buildSettings.triple)/\(buildSettings.configuration.rawValue)",
|
||||
isDirectory: true
|
||||
)
|
||||
|
||||
@@ -168,11 +146,7 @@ public struct Packer: Sendable {
|
||||
let src = URL(fileURLWithPath: "\(name).framework/\(name)", relativeTo: binDir)
|
||||
let magic = Data("!<arch>\n".utf8)
|
||||
let thinMagic = Data("!<thin>\n".utf8)
|
||||
guard let bytes = try? FileHandle(forReadingFrom: src).read(upToCount: magic.count) else {
|
||||
// if we can't find the binary, it might be a static framework that SwiftPM
|
||||
// did not copy into the .build directory. we don't need to pack it anyway.
|
||||
break
|
||||
}
|
||||
let bytes = try FileHandle(forReadingFrom: src).read(upToCount: magic.count)
|
||||
// if the magic matches one of these it's a static archive; don't embed it.
|
||||
// https://github.com/apple/llvm-project/blob/e716ff14c46490d2da6b240806c04e2beef01f40/llvm/include/llvm/Object/Archive.h#L33
|
||||
// swiftlint:disable:previous line_length
|
||||
@@ -200,7 +174,7 @@ public struct Packer: Sendable {
|
||||
if product.type == .application {
|
||||
info["UIRequiredDeviceCapabilities"] = ["arm64"]
|
||||
info["LSRequiresIPhoneOS"] = true
|
||||
info["CFBundleSupportedPlatforms"] = Packer.cfBundleSupportedPlatforms(for: buildSettings.triple)
|
||||
info["CFBundleSupportedPlatforms"] = ["iPhoneOS"]
|
||||
}
|
||||
|
||||
if let iconPath = product.iconPath {
|
||||
@@ -217,26 +191,6 @@ public struct Packer: Sendable {
|
||||
try encodedPlist.write(to: infoPath)
|
||||
}
|
||||
}
|
||||
|
||||
static func cfBundleSupportedPlatforms(for triple: String) -> [String] {
|
||||
let components = triple.split(separator: "-").map(String.init)
|
||||
guard let appleIndex = components.firstIndex(of: "apple"),
|
||||
components.indices.contains(appleIndex + 1) else {
|
||||
return ["iPhoneOS"]
|
||||
}
|
||||
|
||||
let os = components[appleIndex + 1].prefix { !$0.isNumber }
|
||||
switch os {
|
||||
case "ios" where components.contains("simulator"):
|
||||
return ["iPhoneSimulator"]
|
||||
case "ios":
|
||||
return ["iPhoneOS"]
|
||||
case "macos", "macosx":
|
||||
return ["MacOSX"]
|
||||
default:
|
||||
return ["iPhoneOS"]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extension Plan.Product {
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
import Foundation
|
||||
import XUtils
|
||||
import Subprocess
|
||||
|
||||
public struct Planner: Sendable {
|
||||
public var buildSettings: BuildSettings
|
||||
@@ -137,10 +135,6 @@ public struct Planner: Sendable {
|
||||
throw StringError("Could not find target '\(targetName)' in package '\(targetPackage.name)'")
|
||||
}
|
||||
guard visited.insert(targetName).inserted else { continue }
|
||||
// Macro targets are compiler plugins that run on the host, not code
|
||||
// linked into the iOS app. Skip them to avoid resolving their
|
||||
// host-only dependencies (e.g. SwiftSyntaxMacros).
|
||||
if target.type == "macro" { continue }
|
||||
if target.moduleType == "BinaryTarget" {
|
||||
resources.append(.binaryTarget(name: targetName))
|
||||
}
|
||||
@@ -219,7 +213,7 @@ public struct Planner: Sendable {
|
||||
}
|
||||
|
||||
private func dumpDependencies() async throws -> PackageDependency {
|
||||
let tempDir = try TemporaryDirectory(name: "xtool-dump")
|
||||
let tempDir = try TemporaryDirectory(name: "xtool-dump-\(UUID().uuidString)")
|
||||
let tempFileURL = tempDir.url.appendingPathComponent("dump.json")
|
||||
|
||||
// SwiftPM sometimes prints extraneous data to stdout, so ask
|
||||
@@ -248,17 +242,16 @@ public struct Planner: Sendable {
|
||||
}
|
||||
|
||||
private func _dumpAction(arguments: [String], path: String) async throws -> Data {
|
||||
let dumpConfig = try await buildSettings.withPackagePath(path).swiftPMInvocation(
|
||||
let dump = try await buildSettings.swiftPMInvocation(
|
||||
forTool: "package",
|
||||
arguments: arguments,
|
||||
packagePathOverride: path
|
||||
)
|
||||
return try await Subprocess.run(
|
||||
dumpConfig,
|
||||
output: .data(limit: .max),
|
||||
error: .currentStandardError,
|
||||
)
|
||||
.checkSuccess()
|
||||
.standardOutput
|
||||
let pipe = Pipe()
|
||||
dump.standardOutput = pipe
|
||||
async let task = Data(reading: pipe.fileHandleForReading)
|
||||
try await dump.runUntilExit()
|
||||
return try await task
|
||||
}
|
||||
|
||||
private func selectLibrary(
|
||||
@@ -412,7 +405,6 @@ private struct PackageDump: Decodable {
|
||||
struct Target: Decodable {
|
||||
let name: String
|
||||
let moduleType: String
|
||||
let type: String?
|
||||
let productDependencies: [String]?
|
||||
let targetDependencies: [String]?
|
||||
let resources: [Resource]?
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
import Foundation
|
||||
|
||||
extension Process {
|
||||
/// Launches the process and suspends until the receiver is finished.
|
||||
///
|
||||
/// - Parameter onCancel: The action to take if the current
|
||||
/// task is cancelled.
|
||||
public func runUntilExit(onCancel: TaskCancelAction = .interrupt) async throws {
|
||||
try Task.checkCancellation()
|
||||
|
||||
let (terminationStream, terminationContinuation) = AsyncStream<Never>.makeStream()
|
||||
terminationHandler = { _ in
|
||||
terminationContinuation.finish()
|
||||
}
|
||||
|
||||
do {
|
||||
try run()
|
||||
} catch {
|
||||
terminationContinuation.finish()
|
||||
throw error
|
||||
}
|
||||
|
||||
await withTaskCancellationHandler {
|
||||
for await _ in terminationStream {}
|
||||
} onCancel: {
|
||||
switch onCancel {
|
||||
case .interrupt:
|
||||
interrupt()
|
||||
case .terminate:
|
||||
terminate()
|
||||
case .ignore:
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
try Task.checkCancellation()
|
||||
|
||||
switch terminationReason {
|
||||
case .exit where terminationStatus == 0:
|
||||
break
|
||||
case .exit:
|
||||
throw Failure.exit(terminationStatus)
|
||||
case .uncaughtSignal:
|
||||
throw Failure.uncaughtSignal(terminationStatus)
|
||||
@unknown default:
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
public enum Failure: Error {
|
||||
case exit(CInt)
|
||||
case uncaughtSignal(CInt)
|
||||
}
|
||||
|
||||
public enum TaskCancelAction: Sendable {
|
||||
/// Sends `SIGINT` to the process.
|
||||
case interrupt
|
||||
/// Sends `SIGTERM` to the process.
|
||||
case terminate
|
||||
/// Don't participate in cooperative cancellation.
|
||||
case ignore
|
||||
}
|
||||
}
|
||||
@@ -1,92 +0,0 @@
|
||||
import Subprocess
|
||||
import XUtils
|
||||
|
||||
public struct SwiftVersion: Sendable, Comparable, Hashable {
|
||||
public var major: Int
|
||||
public var minor: Int
|
||||
public var patch: Int
|
||||
|
||||
public init(_ major: Int, _ minor: Int, _ patch: Int = 0) {
|
||||
self.major = major
|
||||
self.minor = minor
|
||||
self.patch = patch
|
||||
}
|
||||
|
||||
public static func < (lhs: Self, rhs: Self) -> Bool {
|
||||
lhs.tuple < rhs.tuple
|
||||
}
|
||||
|
||||
fileprivate var tuple: (Int, Int, Int) {
|
||||
(major, minor, patch)
|
||||
}
|
||||
}
|
||||
|
||||
extension SwiftVersion {
|
||||
public var supportsSwiftBuild: Bool {
|
||||
self >= SwiftVersion(6, 4)
|
||||
}
|
||||
}
|
||||
|
||||
extension SwiftVersion: LosslessStringConvertible, CustomStringConvertible {
|
||||
public var description: String {
|
||||
"\(major).\(minor).\(patch)"
|
||||
}
|
||||
|
||||
public init?(_ description: String) {
|
||||
// inverse of https://github.com/swiftlang/swift/blob/896191b38/lib/Basic/Version.cpp#L266
|
||||
|
||||
var output = description[...]
|
||||
if output.hasPrefix("Apple ") {
|
||||
output = output.dropFirst("Apple ".count)
|
||||
}
|
||||
if output.hasPrefix("Swift version ") {
|
||||
output = output.dropFirst("Swift version ".count)
|
||||
output = output.prefix { !$0.isWhitespace }
|
||||
}
|
||||
let isDev = output.hasSuffix("-dev")
|
||||
if isDev { output = output.dropLast("-dev".count) }
|
||||
|
||||
let parts = output.split(separator: ".")
|
||||
var numericParts = parts.compactMap { Int($0) }
|
||||
guard parts.count == numericParts.count else {
|
||||
return nil
|
||||
}
|
||||
|
||||
switch numericParts.count {
|
||||
case 2: numericParts.append(0)
|
||||
case 3: break
|
||||
default: return nil
|
||||
}
|
||||
|
||||
self.init(numericParts[0], numericParts[1], numericParts[2])
|
||||
}
|
||||
}
|
||||
|
||||
extension SwiftVersion {
|
||||
private static let cached = Task<Self, Error> {
|
||||
let outputString: String?
|
||||
do {
|
||||
outputString = try await Subprocess.run(
|
||||
.path(try await BuildSettings.swiftURL()),
|
||||
arguments: ["--version"],
|
||||
output: .string(limit: .max)
|
||||
)
|
||||
.checkSuccess()
|
||||
.standardOutput
|
||||
} catch {
|
||||
throw StringError("Failed to obtain Swift version")
|
||||
}
|
||||
|
||||
let output = outputString ?? ""
|
||||
guard let version = Self(output) else {
|
||||
throw StringError("Could not parse Swift version: '\(output)'")
|
||||
}
|
||||
return version
|
||||
}
|
||||
|
||||
public static var current: Self {
|
||||
get async throws {
|
||||
try await cached.value
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,4 @@
|
||||
import Foundation
|
||||
import Subprocess
|
||||
|
||||
package enum ToolRegistry {
|
||||
package enum Errors: Error, CustomStringConvertible {
|
||||
@@ -17,6 +16,11 @@ package enum ToolRegistry {
|
||||
|
||||
/// Obtain the full path to a tool in the user's `PATH`.
|
||||
///
|
||||
/// This effectively invokes `/bin/sh -c "command -v '$tool'"`.
|
||||
///
|
||||
/// - Warning: Make sure you trust/sanitize the `tool` parameter. If it
|
||||
/// contains a single quote, it can be used in a shell escape.
|
||||
///
|
||||
/// - Throws: `Errors.toolNotFound` if the tool could not be located.
|
||||
package static func locate(_ tool: String) async throws -> URL {
|
||||
try await cache.locate(tool: tool)
|
||||
@@ -26,10 +30,20 @@ package enum ToolRegistry {
|
||||
private var cache: [String: Task<URL, Error>] = [:]
|
||||
|
||||
private func _locate(tool: String) async throws -> URL {
|
||||
guard let path = try? await Executable.name(tool).resolveExecutablePath(in: .inherit),
|
||||
let url = URL(filePath: path)
|
||||
else { throw Errors.toolNotFound(tool) }
|
||||
return url
|
||||
let pipe = Pipe()
|
||||
let proc = Process()
|
||||
proc.executableURL = URL(fileURLWithPath: "/bin/sh")
|
||||
proc.arguments = ["-c", "command -v '\(tool)'"]
|
||||
proc.standardOutput = pipe
|
||||
async let bytes = pipe.fileHandleForReading.readToEnd()
|
||||
do {
|
||||
try await proc.runUntilExit()
|
||||
} catch is Process.Failure {
|
||||
throw Errors.toolNotFound(tool)
|
||||
}
|
||||
let path = String(decoding: try await bytes ?? Data(), as: UTF8.self)
|
||||
.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
return URL(fileURLWithPath: path)
|
||||
}
|
||||
|
||||
func locate(tool: String) async throws -> URL {
|
||||
|
||||
+127
-255
@@ -1,5 +1,10 @@
|
||||
#if os(macOS)
|
||||
import Foundation
|
||||
import XcodeProjects
|
||||
import PathKit
|
||||
import Version
|
||||
import ProjectSpec
|
||||
import XcodeGenKit
|
||||
import XcodeProj
|
||||
|
||||
public struct XcodePacker {
|
||||
public var plan: Plan
|
||||
@@ -9,284 +14,151 @@ public struct XcodePacker {
|
||||
}
|
||||
|
||||
// swiftlint:disable:next function_body_length
|
||||
public func createProject(
|
||||
at root: URL = URL(fileURLWithPath: FileManager.default.currentDirectoryPath, isDirectory: true)
|
||||
) async throws -> URL {
|
||||
let xtoolDir = root.appendingPathComponent("xtool", isDirectory: true)
|
||||
let projectDir = xtoolDir.appendingPathComponent(".xtool-tmp", isDirectory: true)
|
||||
try? FileManager.default.removeItem(at: projectDir)
|
||||
try FileManager.default.createDirectory(at: projectDir, withIntermediateDirectories: true)
|
||||
public func createProject() async throws -> URL {
|
||||
let xtoolDir: Path = "xtool"
|
||||
|
||||
let fromProjectToRoot = "../.."
|
||||
let projectDir: Path = xtoolDir + ".xtool-tmp"
|
||||
try? xtoolDir.delete()
|
||||
try projectDir.mkpath()
|
||||
|
||||
let emptyText = Data("// leave this file empty".utf8)
|
||||
let products = plan.allProducts
|
||||
let targetIDs = products.map {
|
||||
XCSchema.ObjectID("xtool:\($0.product)")
|
||||
let fromProjectToRoot = try Path(".").relativePath(from: projectDir)
|
||||
|
||||
guard let deploymentTarget = Version(tolerant: plan.app.deploymentTarget) else {
|
||||
throw StringError("Could not parse deployment target '\(plan.app.deploymentTarget)'")
|
||||
}
|
||||
let sourcePhase = XCSchema.BuildPhase.sources(.init(objectID: nil, name: nil))
|
||||
let frameworksPhase = XCSchema.BuildPhase.frameworks(.init(objectID: nil, name: nil))
|
||||
|
||||
var groups: [XCSchema.Reference] = []
|
||||
var productFiles: [XCSchema.Reference] = []
|
||||
var targets: [XCSchema.Target] = []
|
||||
let emptyText = Data("""
|
||||
// leave this file empty
|
||||
""".utf8)
|
||||
|
||||
for (index, product) in products.enumerated() {
|
||||
let productDir = projectDir.appendingPathComponent(product.product, isDirectory: true)
|
||||
try FileManager.default.createDirectory(at: productDir, withIntermediateDirectories: true)
|
||||
try emptyText.write(to: productDir.appendingPathComponent("empty.c"))
|
||||
let targets = try plan.allProducts.map { product in
|
||||
let productDir = projectDir + product.product
|
||||
try productDir.mkpath()
|
||||
|
||||
let emptyFile = productDir + "empty.c"
|
||||
try emptyFile.write(emptyText)
|
||||
|
||||
let infoPath = productDir + "Info.plist"
|
||||
|
||||
var plist = product.infoPlist
|
||||
let families = (plist.removeValue(forKey: "UIDeviceFamily") as? [Int]) ?? [1, 2]
|
||||
plist["CFBundleExecutable"] = product.targetName
|
||||
plist["CFBundleName"] = product.targetName
|
||||
plist["CFBundleDisplayName"] = product.product
|
||||
if let iconPath = product.iconPath {
|
||||
plist["CFBundleIconFile"] = URL(fileURLWithPath: iconPath).deletingPathExtension().lastPathComponent
|
||||
}
|
||||
|
||||
let encodedPlist = try PropertyListSerialization.data(fromPropertyList: plist, format: .xml, options: 0)
|
||||
try encodedPlist.write(to: productDir.appendingPathComponent("Info.plist"))
|
||||
try infoPath.write(encodedPlist)
|
||||
|
||||
var buildSettings: [String: XCSchema.BuildSetting] = [
|
||||
"PRODUCT_BUNDLE_IDENTIFIER": .string(product.bundleID),
|
||||
"PRODUCT_NAME": .string(product.targetName),
|
||||
"TARGETED_DEVICE_FAMILY": .string(families.map(String.init).joined(separator: ",")),
|
||||
"IPHONEOS_DEPLOYMENT_TARGET": .string(product.deploymentTarget),
|
||||
"INFOPLIST_FILE": .string("\(product.product)/Info.plist"),
|
||||
"LD_RUNPATH_SEARCH_PATHS": .array(["$(inherited)", "@executable_path/Frameworks"]),
|
||||
var buildSettings: [String: Any] = [
|
||||
"PRODUCT_BUNDLE_IDENTIFIER": product.bundleID,
|
||||
"TARGETED_DEVICE_FAMILY": families.map { "\($0)" }.joined(separator: ","),
|
||||
]
|
||||
|
||||
if product.type == .appExtension {
|
||||
buildSettings["APPLICATION_EXTENSION_API_ONLY"] = .string("YES")
|
||||
buildSettings["LD_RUNPATH_SEARCH_PATHS"] = .array([
|
||||
"$(inherited)", "@executable_path/Frameworks", "@executable_path/../../Frameworks",
|
||||
])
|
||||
buildSettings["APPLICATION_EXTENSION_API_ONLY"] = true
|
||||
}
|
||||
|
||||
if let entitlementsPath = product.entitlementsPath {
|
||||
let path = (entitlementsPath as NSString).isAbsolutePath
|
||||
? entitlementsPath
|
||||
: (fromProjectToRoot as NSString).appendingPathComponent(entitlementsPath)
|
||||
buildSettings["CODE_SIGN_ENTITLEMENTS"] = .string(path)
|
||||
buildSettings["CODE_SIGN_ENTITLEMENTS"] = fromProjectToRoot + Path(entitlementsPath)
|
||||
}
|
||||
|
||||
let source = XCSchema.FileReference(
|
||||
objectID: nil,
|
||||
path: "empty.c",
|
||||
explicitFileType: nil,
|
||||
expectedSignature: nil,
|
||||
textEncoding: nil,
|
||||
lineEnding: nil,
|
||||
includeInIndex: nil,
|
||||
buildFiles: [.init(
|
||||
objectID: nil,
|
||||
buildPhase: .named(
|
||||
target: .init(targetName: product.targetName),
|
||||
kind: .sources,
|
||||
name: nil
|
||||
),
|
||||
properties: buildFileProperties(),
|
||||
)],
|
||||
)
|
||||
let info = XCSchema.FileReference(
|
||||
objectID: nil,
|
||||
path: "Info.plist",
|
||||
explicitFileType: nil,
|
||||
expectedSignature: nil,
|
||||
textEncoding: nil,
|
||||
lineEnding: nil,
|
||||
includeInIndex: nil,
|
||||
buildFiles: [],
|
||||
)
|
||||
let resources = try resourceReferences(for: product, at: root)
|
||||
groups.append(.group(.init(
|
||||
objectID: nil,
|
||||
name: product.product,
|
||||
path: try .init(base: .group, path: product.product),
|
||||
includeInIndex: nil,
|
||||
children: [.fileReference(source), .fileReference(info)] + resources,
|
||||
)))
|
||||
|
||||
let productFilename = "\(product.targetName).\(product.type == .application ? "app" : "appex")"
|
||||
let productFile = XCSchema.FileReference(
|
||||
objectID: nil,
|
||||
path: try .init(base: .buildProducts, path: productFilename),
|
||||
explicitFileType: .init(fileTypeID: product.type == .application ? "wrapper.application" : "wrapper.app-extension"),
|
||||
expectedSignature: nil,
|
||||
textEncoding: nil,
|
||||
lineEnding: nil,
|
||||
includeInIndex: false,
|
||||
buildFiles: index == 0 ? [] : [.init(
|
||||
objectID: nil,
|
||||
buildPhase: .named(
|
||||
target: .init(targetName: plan.app.targetName),
|
||||
kind: .copy,
|
||||
name: "Embed App Extensions",
|
||||
),
|
||||
properties: buildFileProperties(removeHeadersOnCopy: true),
|
||||
)],
|
||||
)
|
||||
productFiles.append(.fileReference(productFile))
|
||||
|
||||
let packageProduct = XCSchema.SwiftPackageProductReference(
|
||||
objectID: nil,
|
||||
package: nil,
|
||||
productName: product.product,
|
||||
productType: .other,
|
||||
)
|
||||
let packageMember = XCSchema.SwiftPackageProductTargetMember(
|
||||
packageProduct: packageProduct,
|
||||
buildFile: .init(
|
||||
objectID: nil,
|
||||
buildPhase: .named(kind: .frameworks, name: nil),
|
||||
properties: buildFileProperties(),
|
||||
),
|
||||
)
|
||||
var phases = [sourcePhase, frameworksPhase]
|
||||
if !resources.isEmpty {
|
||||
phases.append(.copy(.init(
|
||||
objectID: nil,
|
||||
name: "Copy Root Resources",
|
||||
bundleBasePath: .resourcesDir,
|
||||
relativePath: "",
|
||||
scope: .always,
|
||||
)))
|
||||
}
|
||||
if index == 0 && !plan.extensions.isEmpty {
|
||||
phases.append(.copy(.init(
|
||||
objectID: nil,
|
||||
name: "Embed App Extensions",
|
||||
bundleBasePath: .plugInsDir,
|
||||
relativePath: "",
|
||||
scope: .always,
|
||||
)))
|
||||
}
|
||||
let dependencies: [XCSchema.TargetDependency] = index == 0
|
||||
? plan.extensions.map {
|
||||
.localTarget(XCSchema.LocalTargetReference(targetName: $0.targetName), [])
|
||||
let additionalDependencies: [Dependency] = if product.type == .application {
|
||||
plan.extensions.map {
|
||||
Dependency(
|
||||
type: .target,
|
||||
reference: $0.targetName
|
||||
)
|
||||
}
|
||||
: []
|
||||
targets.append(.native(XCSchema.CommonTargetProperties(
|
||||
} else {
|
||||
[]
|
||||
}
|
||||
return Target(
|
||||
name: product.targetName,
|
||||
objectID: targetIDs[index],
|
||||
configurationListDebugID: nil,
|
||||
dependencies: dependencies,
|
||||
buildPhases: phases,
|
||||
buildRules: [],
|
||||
specializedConfigurations: [],
|
||||
buildSettings: buildSettings,
|
||||
product: .namePath(.init(components: [.child("Products"), .child(productFilename)])),
|
||||
productTypeID: XCSchema.ProductTypeID(
|
||||
abbreviatedRepresentation: product.type == .application
|
||||
? "application"
|
||||
: "app-extension"
|
||||
),
|
||||
testHostTarget: nil,
|
||||
legacyProvisioningStyle: nil,
|
||||
legacyTeamID: nil,
|
||||
lastSwiftUpdateCheck: nil,
|
||||
lastSwiftMigration: nil,
|
||||
packageProductTargetMembers: [packageMember],
|
||||
)))
|
||||
}
|
||||
|
||||
let schema = XCSchema.Project(
|
||||
objectID: nil,
|
||||
rootGroupDebugID: nil,
|
||||
configurationListDebugID: nil,
|
||||
topLevelReferences: groups + [
|
||||
.group(XCSchema.Group(
|
||||
objectID: nil,
|
||||
name: "Products",
|
||||
path: "",
|
||||
includeInIndex: nil,
|
||||
children: productFiles,
|
||||
))
|
||||
],
|
||||
packages: [.init(location: .local(.init(path: fromProjectToRoot)), traits: [])],
|
||||
configurations: ["Debug", "Release"].map {
|
||||
.init(name: .init(name: $0), file: nil, objectID: nil)
|
||||
},
|
||||
buildSettings: ["SDKROOT": .string("iphoneos")],
|
||||
defaultConfigurationName: .init(name: "Debug"),
|
||||
targets: targets,
|
||||
localizationInfo: .init(development: .init(languageID: "en"), supported: []),
|
||||
requiredCapabilities: [],
|
||||
buildIndependentTargetsInParallel: true,
|
||||
lastUpgradeCheck: nil,
|
||||
lastSwiftUpdateCheck: nil,
|
||||
lastSwiftMigration: nil,
|
||||
organizationName: nil,
|
||||
classPrefix: nil,
|
||||
productsGroup: .namePath(.init(components: [.child("Products")])),
|
||||
importedProducts: [],
|
||||
)
|
||||
|
||||
let project = XcodeProject(project: schema)
|
||||
let projectURL = projectDir.appending(path: "\(plan.app.product).xcodeproj")
|
||||
try project.write(to: projectURL)
|
||||
|
||||
let workspace = XcodeWorkspace(children: [
|
||||
.file(XcodeWorkspace.Location(base: .container, path: "..")),
|
||||
.file(XcodeWorkspace.Location(base: .group, path: ".xtool-tmp/\(projectURL.lastPathComponent)"))
|
||||
])
|
||||
let workspaceURL = xtoolDir.appending(path: "\(plan.app.product).xcworkspace")
|
||||
try workspace.write(to: workspaceURL)
|
||||
return workspaceURL
|
||||
}
|
||||
|
||||
private func resourceReferences(for product: Plan.Product, at root: URL) throws -> [XCSchema.Reference] {
|
||||
var paths = product.resources.compactMap { resource -> String? in
|
||||
guard case .root(let source) = resource else { return nil }
|
||||
return source
|
||||
}
|
||||
if let iconPath = product.iconPath {
|
||||
paths.append(iconPath)
|
||||
}
|
||||
|
||||
var visited: Set<String> = []
|
||||
return try paths.compactMap { path in
|
||||
let url = URL(fileURLWithPath: path, relativeTo: root).standardizedFileURL
|
||||
guard visited.insert(url.path).inserted else { return nil }
|
||||
let isAbsolute = (path as NSString).isAbsolutePath
|
||||
let referencePath = isAbsolute ? path : ("../.." as NSString).appendingPathComponent(path)
|
||||
var isDirectory: ObjCBool = false
|
||||
_ = FileManager.default.fileExists(atPath: url.path, isDirectory: &isDirectory)
|
||||
|
||||
return .fileReference(.init(
|
||||
objectID: nil,
|
||||
path: try .init(base: isAbsolute ? .absolute : .project, path: referencePath),
|
||||
explicitFileType: isDirectory.boolValue ? .init(fileTypeID: "folder") : nil,
|
||||
expectedSignature: nil,
|
||||
textEncoding: nil,
|
||||
lineEnding: nil,
|
||||
includeInIndex: nil,
|
||||
buildFiles: [.init(
|
||||
objectID: nil,
|
||||
buildPhase: .named(
|
||||
target: .init(targetName: product.targetName),
|
||||
kind: .copy,
|
||||
name: "Copy Root Resources",
|
||||
type: product.type == .application ? .application : .appExtension,
|
||||
platform: .iOS,
|
||||
deploymentTarget: deploymentTarget,
|
||||
settings: Settings(buildSettings: buildSettings),
|
||||
sources: [
|
||||
TargetSource(
|
||||
path: try emptyFile.relativePath(from: projectDir).string,
|
||||
buildPhase: .sources
|
||||
),
|
||||
properties: buildFileProperties(),
|
||||
)],
|
||||
))
|
||||
],
|
||||
dependencies: [
|
||||
Dependency(
|
||||
type: .package(products: [product.product]),
|
||||
reference: "RootPackage"
|
||||
),
|
||||
] + additionalDependencies,
|
||||
info: Plist(
|
||||
path: try infoPath.relativePath(from: projectDir).string,
|
||||
attributes: [:]
|
||||
)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
private func buildFileProperties(removeHeadersOnCopy: Bool = false) -> XCSchema.BuildFileProperties {
|
||||
XCSchema.BuildFileProperties(
|
||||
platformFilters: [],
|
||||
additionalBuildFlags: nil,
|
||||
assetTags: [],
|
||||
attributes: XCSchema.BuildFileAttributes(
|
||||
headerRole: nil,
|
||||
machInterfaceGeneration: nil,
|
||||
isWeak: false,
|
||||
codeSignOnCopy: false,
|
||||
codeGeneration: .default,
|
||||
headerPreservation: removeHeadersOnCopy ? .removeOnCopy : .keep,
|
||||
decompress: false,
|
||||
codeGenerationVisibility: nil,
|
||||
),
|
||||
let project = Project(
|
||||
name: plan.app.targetName,
|
||||
targets: targets,
|
||||
packages: [
|
||||
"RootPackage": .local(
|
||||
path: fromProjectToRoot.string,
|
||||
group: nil,
|
||||
excludeFromProject: false
|
||||
),
|
||||
],
|
||||
options: SpecOptions(
|
||||
localPackagesGroup: ""
|
||||
)
|
||||
)
|
||||
|
||||
// TODO: Handle plan.resources of type .root
|
||||
// TODO: Handle plan.iconPath
|
||||
|
||||
let generator = ProjectGenerator(project: project)
|
||||
let xcodeproj = projectDir + "\(plan.app.product).xcodeproj"
|
||||
let xcworkspace = xtoolDir + "\(plan.app.product).xcworkspace"
|
||||
do {
|
||||
let current = Path.current
|
||||
Path.current = xcodeproj.parent()
|
||||
defer { Path.current = current }
|
||||
let xcodeProject = try generator.generateXcodeProject(userName: NSUserName())
|
||||
if let packageRef = xcodeProject.pbxproj.fileReferences.first(where: { $0.name == ".." }) {
|
||||
for group in xcodeProject.pbxproj.groups {
|
||||
group.children.removeAll(where: { $0.uuid == packageRef.uuid })
|
||||
}
|
||||
xcodeProject.pbxproj.delete(object: packageRef)
|
||||
}
|
||||
|
||||
try xcodeProject.write(path: Path(xcodeproj.lastComponent))
|
||||
}
|
||||
|
||||
do {
|
||||
let current = Path.current
|
||||
Path.current = xcworkspace.parent()
|
||||
defer { Path.current = current }
|
||||
|
||||
let xcworkspaceDirectory = xcworkspace.parent()
|
||||
let fromWorkspaceToSelf = try Path(".").relativePath(from: xcworkspaceDirectory).withName()
|
||||
let fromWorkspaceToProject = try xcodeproj.relativePath(from: xcworkspaceDirectory).withName()
|
||||
let workspace = XCWorkspace(data: .init(children: [
|
||||
.file(.init(location: .container(fromWorkspaceToSelf.string))),
|
||||
.file(.init(location: .group(fromWorkspaceToProject.string))),
|
||||
]))
|
||||
try workspace.write(path: Path(xcworkspace.lastComponent))
|
||||
}
|
||||
|
||||
return xcworkspace.url
|
||||
}
|
||||
}
|
||||
|
||||
extension Path {
|
||||
fileprivate func withName() -> Path {
|
||||
// eg if curr dir is Foo, this converts "." to "../Foo"
|
||||
// which includes the name in the path, and therefore
|
||||
// in the Xcode navigator
|
||||
self.parent() + self.absolute().lastComponent
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
module XADI [extern_c] {
|
||||
header "xadi.h"
|
||||
link "xadi"
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
#include <stdint.h>
|
||||
|
||||
void xadi_Load(const char *path);
|
||||
int32_t xadi_SetAndroidID(const char *identifier, uint32_t length);
|
||||
int32_t xadi_SetProvisioningPath(const char *path);
|
||||
int32_t xadi_ProvisioningErase(uint64_t dsId);
|
||||
int32_t xadi_Synchronize(uint64_t dsId, const void *serverIntermediateMetadata, uint32_t serverIntermediateMetadataLength, void **machineIdentifier, uint32_t *machineIdentifierLength, void **synchronizationResumeMetadata, uint32_t *synchronizationResumeMetadataLength);
|
||||
int32_t xadi_ProvisioningDestroy(uint32_t session);
|
||||
int32_t xadi_ProvisioningEnd(uint32_t session, const void *persistentTokenMetadata, uint32_t persistentTokenMetadataLength, const void *trustKey, uint32_t trustKeyLength);
|
||||
int32_t xadi_ProvisioningStart(uint64_t dsId, const void *serverProvisioningIntermediateMetadata, uint32_t serverProvisioningIntermediateMetadataLength, void **clientProvisioningIntermediateMetadata, uint32_t *clientProvisioningIntermediateMetadataLength, uint32_t *session);
|
||||
int32_t xadi_GetLoginCode(uint64_t dsId);
|
||||
int32_t xadi_Dispose(void *ptr);
|
||||
int32_t xadi_OTPRequest(uint64_t dsId, void **machineIdentifier, uint32_t *machineIdentifierLength, void **oneTimePassword, uint32_t *oneTimePasswordLength);
|
||||
@@ -137,8 +137,8 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
|
||||
id: appID.id
|
||||
)
|
||||
),
|
||||
// not public but required iff using ds2 API
|
||||
capability: context.auth.isPublicAPI ? nil : .init(
|
||||
// not public but required when using ds2 API
|
||||
capability: .init(
|
||||
data: .init(
|
||||
_type: .capabilities,
|
||||
id: typ
|
||||
|
||||
@@ -23,16 +23,6 @@ public struct DeveloperServicesCapability: Sendable, Hashable {
|
||||
self.isFree = isFree
|
||||
self.settings = settings
|
||||
}
|
||||
|
||||
public init(
|
||||
rawName: String,
|
||||
isFree: Bool,
|
||||
settings: [Components.Schemas.CapabilitySetting]? = nil
|
||||
) {
|
||||
self.capabilityType = .init(value2: rawName)
|
||||
self.isFree = isFree
|
||||
self.settings = settings
|
||||
}
|
||||
}
|
||||
|
||||
protocol EntitlementWithCapability: Entitlement {
|
||||
@@ -79,22 +69,6 @@ extension AppGroupEntitlement: EntitlementWithCapability {
|
||||
}
|
||||
}
|
||||
|
||||
extension AppleSignInEntitlement: EntitlementWithCapability {
|
||||
var capability: DeveloperServicesCapability {
|
||||
// A primary App ID: the app is its own Sign in with Apple group.
|
||||
DeveloperServicesCapability(
|
||||
.appleIdAuth,
|
||||
isFree: false,
|
||||
settings: [
|
||||
.init(
|
||||
key: .init(.appleIdAuthAppConsent),
|
||||
options: [.init(key: .init(.primaryAppConsent))]
|
||||
)
|
||||
]
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
extension AssociatedDomainsEntitlement: EntitlementWithCapability {
|
||||
var capability: DeveloperServicesCapability {
|
||||
DeveloperServicesCapability(.associatedDomains, isFree: false)
|
||||
@@ -154,9 +128,3 @@ extension WirelessAccessoryEntitlement: EntitlementWithCapability {
|
||||
DeveloperServicesCapability(.wirelessAccessoryConfiguration, isFree: true)
|
||||
}
|
||||
}
|
||||
|
||||
extension WiFiAwareEntitlement: EntitlementWithCapability {
|
||||
var capability: DeveloperServicesCapability {
|
||||
DeveloperServicesCapability(rawName: "WIFI_AWARE", isFree: false)
|
||||
}
|
||||
}
|
||||
|
||||
+2
-3
@@ -100,9 +100,8 @@ public struct DeveloperServicesFetchCertificateOperation: DeveloperServicesOpera
|
||||
return try await self.replaceCertificates(certificates, requireConfirmation: true)
|
||||
}
|
||||
|
||||
guard let certificate = certificates.first(where: {
|
||||
$0.attributes?.serialNumber.map(signingInfo.certificate.hasSerialNumber) == true
|
||||
}) else {
|
||||
let knownSerialNumber = signingInfo.certificate.serialNumber()
|
||||
guard let certificate = certificates.first(where: { $0.attributes?.serialNumber == knownSerialNumber }) else {
|
||||
// we need to revoke existing certs, otherwise it doesn't always let us make a new one
|
||||
return try await self.replaceCertificates(certificates, requireConfirmation: true)
|
||||
}
|
||||
|
||||
@@ -54,6 +54,7 @@ public struct DeveloperServicesClient: Sendable {
|
||||
}
|
||||
}
|
||||
|
||||
@Dependency(\.deviceInfoProvider) var deviceInfoProvider
|
||||
@Dependency(\.anisetteDataProvider) var anisetteDataProvider
|
||||
@Dependency(\.httpClient) var httpClient
|
||||
|
||||
@@ -75,6 +76,8 @@ public struct DeveloperServicesClient: Sendable {
|
||||
throw Error.malformedRequest
|
||||
}
|
||||
|
||||
let deviceInfo = try deviceInfoProvider.fetch()
|
||||
|
||||
var httpRequest = HTTPRequest(method: .post, url: url)
|
||||
let acceptedLanguages = Locale.preferredLanguages.joined(separator: ", ")
|
||||
|
||||
@@ -85,6 +88,8 @@ public struct DeveloperServicesClient: Sendable {
|
||||
request.methodOverride.map { httpRequest.headerFields[.init("X-HTTP-Method-Override")!] = $0 }
|
||||
|
||||
httpRequest.headerFields[.init(DeviceInfo.xcodeVersionKey)!] = DeviceInfo.xcodeVersion
|
||||
httpRequest.headerFields[.init(DeviceInfo.clientInfoKey)!] = deviceInfo.clientInfo.clientString
|
||||
httpRequest.headerFields[.init(DeviceInfo.deviceIDKey)!] = deviceInfo.deviceID
|
||||
|
||||
httpRequest.headerFields[.init("X-Apple-I-Identity-Id")!] = loginToken.adsid
|
||||
httpRequest.headerFields[.init("X-Apple-App-Info")!] = AppTokenKey.xcode.rawValue
|
||||
@@ -98,6 +103,8 @@ public struct DeveloperServicesClient: Sendable {
|
||||
|
||||
let (_, data) = try await httpClient.makeRequest(httpRequest, body: body)
|
||||
|
||||
// String(data: data, encoding: .utf8).map { print("\(url): \($0)") }
|
||||
|
||||
let decoded: R.Response = try request.apiVersion.decode(response: data)
|
||||
|
||||
return try await request.parse(decoded)
|
||||
|
||||
@@ -73,13 +73,6 @@ public enum DeveloperAPIAuthData: Sendable {
|
||||
}
|
||||
}
|
||||
|
||||
public var isPublicAPI: Bool {
|
||||
switch self {
|
||||
case .appStoreConnect: true
|
||||
case .xcode: false
|
||||
}
|
||||
}
|
||||
|
||||
// A unique ID tied to this token
|
||||
public var identityID: String {
|
||||
switch self {
|
||||
@@ -105,6 +98,7 @@ public struct XcodeAuthData: Sendable {
|
||||
}
|
||||
|
||||
public struct DeveloperAPIXcodeAuthMiddleware: ClientMiddleware {
|
||||
@Dependency(\.deviceInfoProvider) private var deviceInfoProvider
|
||||
@Dependency(\.anisetteDataProvider) private var anisetteDataProvider
|
||||
|
||||
public var authData: XcodeAuthData
|
||||
@@ -129,7 +123,7 @@ public struct DeveloperAPIXcodeAuthMiddleware: ClientMiddleware {
|
||||
) async throws -> (HTTPResponse, HTTPBody?) {
|
||||
var request = request
|
||||
|
||||
let anisetteData = try await anisetteDataProvider.fetchAnisetteData()
|
||||
let deviceInfo = try deviceInfoProvider.fetch()
|
||||
|
||||
// General
|
||||
request.headerFields[.acceptLanguage] = Locale.preferredLanguages.joined(separator: ", ")
|
||||
@@ -139,7 +133,13 @@ public struct DeveloperAPIXcodeAuthMiddleware: ClientMiddleware {
|
||||
|
||||
// Xcode-specific
|
||||
request.headerFields[.userAgent] = "Xcode"
|
||||
request.headerFields[.init(DeviceInfo.xcodeVersionKey)!] = DeviceInfo.xcodeVersion
|
||||
request.headerFields[.init(DeviceInfo.xcodeVersionKey)!] = "16.2 (16C5031c)"
|
||||
|
||||
// MobileMe identity
|
||||
request.headerFields[.init(DeviceInfo.clientInfoKey)!] = """
|
||||
<VirtualMac2,1> <macOS;15.1.1;24B91> <com.apple.AuthKit/1 (com.apple.dt.Xcode/23505)>
|
||||
""" // deviceInfo.clientInfo.clientString
|
||||
request.headerFields[.init(DeviceInfo.deviceIDKey)!] = deviceInfo.deviceID
|
||||
|
||||
// GrandSlam authentication
|
||||
request.headerFields[.init("X-Apple-App-Info")!] = AppTokenKey.xcode.rawValue
|
||||
@@ -147,6 +147,7 @@ public struct DeveloperAPIXcodeAuthMiddleware: ClientMiddleware {
|
||||
request.headerFields[.init("X-Apple-GS-Token")!] = authData.loginToken.token
|
||||
|
||||
// Anisette
|
||||
let anisetteData = try await anisetteDataProvider.fetchAnisetteData()
|
||||
for (key, value) in anisetteData.dictionary {
|
||||
request.headerFields[.init(key)!] = value
|
||||
}
|
||||
|
||||
+7
-10
@@ -61,16 +61,13 @@ public struct DeveloperServicesFetchProfileOperation: DeveloperServicesOperation
|
||||
break
|
||||
}
|
||||
|
||||
// Match locally rather than with filter[serialNumber]: the API lists serials with a
|
||||
// leading zero nibble ("0E41…") but its filter only matches them without it ("E41…").
|
||||
let certs = try await DeveloperAPIPages {
|
||||
try await context.developerAPIClient.certificatesGetCollection().ok.body.json
|
||||
} next: {
|
||||
$0.links.next
|
||||
}
|
||||
.map(\.data)
|
||||
.reduce(into: [], +=)
|
||||
.filter { $0.attributes?.serialNumber.map(signingInfo.certificate.hasSerialNumber) == true }
|
||||
let serialNumber = signingInfo.certificate.serialNumber()
|
||||
let certs = try await context.developerAPIClient.certificatesGetCollection(
|
||||
query: .init(
|
||||
filter_lbrack_serialNumber_rbrack_: [serialNumber]
|
||||
)
|
||||
)
|
||||
.ok.body.json.data
|
||||
|
||||
let allDevices = try await context.developerAPIClient.devicesGetCollection()
|
||||
.ok.body.json.data
|
||||
|
||||
@@ -4,7 +4,7 @@ import ConcurrencyExtras
|
||||
import Dependencies
|
||||
|
||||
public protocol RawADIProvider: Sendable {
|
||||
func clientInfo() async throws -> ClientInfoWithUserAgent
|
||||
func clientInfo() async throws -> String
|
||||
|
||||
func startProvisioning(
|
||||
spim: Data,
|
||||
@@ -18,9 +18,13 @@ public protocol RawADIProvider: Sendable {
|
||||
) async throws -> (machineID: Data, otp: Data)
|
||||
}
|
||||
|
||||
public struct ClientInfoWithUserAgent: Sendable {
|
||||
public let clientInfo: String
|
||||
public let akdUserAgent: String
|
||||
extension RawADIProvider {
|
||||
public func clientInfo() async throws -> String {
|
||||
// Looks like Apple detects attempts to use a macOS client string on Windows :/
|
||||
"""
|
||||
<PC> <Windows;6.2(0,0);9200> <com.apple.AuthKitWin/1 (com.apple.iCloud/7.21)>
|
||||
"""
|
||||
}
|
||||
}
|
||||
|
||||
private struct UnimplementedRawADIProvider: RawADIProvider {
|
||||
@@ -40,16 +44,17 @@ private struct UnimplementedRawADIProvider: RawADIProvider {
|
||||
let closure: (UUID, inout UInt64, Data) async throws -> (Data, Data) = unimplemented()
|
||||
return try await closure(userID, &routingInfo, provisioningInfo)
|
||||
}
|
||||
|
||||
func clientInfo() async throws -> ClientInfoWithUserAgent {
|
||||
let closure: () async throws -> ClientInfoWithUserAgent = unimplemented()
|
||||
return try await closure()
|
||||
}
|
||||
}
|
||||
|
||||
private enum RawADIProviderDependencyKey: DependencyKey {
|
||||
static let testValue: RawADIProvider = UnimplementedRawADIProvider()
|
||||
static let liveValue: RawADIProvider = OmnisetteADIProvider()
|
||||
static let liveValue: RawADIProvider = {
|
||||
#if os(Linux)
|
||||
return XADIProvider()
|
||||
#else
|
||||
return OmnisetteADIProvider()
|
||||
#endif
|
||||
}()
|
||||
}
|
||||
|
||||
extension DependencyValues {
|
||||
@@ -85,12 +90,15 @@ public struct ADIDataProvider: AnisetteDataProvider {
|
||||
private let localUserUID: UUID
|
||||
private let localUserID: String
|
||||
|
||||
private let _clientInfo = LockIsolated<ClientInfoWithUserAgent?>(nil)
|
||||
private let _clientInfo = LockIsolated<String?>(nil)
|
||||
|
||||
public init() {
|
||||
public init(provisioningData: ProvisioningData? = nil) {
|
||||
@Dependency(\.keyValueStorage) var storage
|
||||
|
||||
if let localUserUIDString = try? storage.string(forKey: Self.localUserUIDKey),
|
||||
if let provisioningData {
|
||||
self.localUserUID = provisioningData.localUserUID
|
||||
try? storage.setData(provisioningData.adiPb, forKey: Self.provisioningKey)
|
||||
try? storage.setString("\(provisioningData.routingInfo)", forKey: Self.routingInfoKey)
|
||||
} else if let localUserUIDString = try? storage.string(forKey: Self.localUserUIDKey),
|
||||
let localUserUID = UUID(uuidString: localUserUIDString) {
|
||||
self.localUserUID = localUserUID
|
||||
} else {
|
||||
@@ -102,15 +110,9 @@ public struct ADIDataProvider: AnisetteDataProvider {
|
||||
self.localUserID = SHA256.hash(data: Data(localUserUID.uuidString.utf8))
|
||||
.map { String(format: "%02X", $0) }
|
||||
.joined()
|
||||
|
||||
if (try? storage.string(forKey: Self.providerIDKey)) != Self.providerID {
|
||||
self.resetProvisioning()
|
||||
try? storage.setString(Self.providerID, forKey: Self.providerIDKey)
|
||||
}
|
||||
}
|
||||
|
||||
private static let localUserUIDKey = "XTLLocalUserUID"
|
||||
private static let providerIDKey = "XTLADIProviderID"
|
||||
private static let provisioningKey = "XTLProvisioningInfo"
|
||||
private static let routingInfoKey = "XTLRoutingInfo"
|
||||
|
||||
@@ -150,7 +152,7 @@ public struct ADIDataProvider: AnisetteDataProvider {
|
||||
return encoder
|
||||
}()
|
||||
|
||||
private func clientInfo() async throws -> ClientInfoWithUserAgent {
|
||||
private func clientInfo() async throws -> String {
|
||||
if let clientInfo = _clientInfo.value { return clientInfo }
|
||||
let clientInfo = try await rawProvider.clientInfo()
|
||||
_clientInfo.setValue(clientInfo)
|
||||
@@ -172,14 +174,17 @@ public struct ADIDataProvider: AnisetteDataProvider {
|
||||
.acceptLanguage: "en_US",
|
||||
.init(AnisetteData.localUserIDKey)!: self.localUserID,
|
||||
]
|
||||
request.headerFields[.init("X-MMe-Country")!] = Locale.current.region?.identifier
|
||||
request.headerFields[.init("X-MMe-Country")!] = Locale.current.regionCode
|
||||
|
||||
for (key, value) in try await deviceInfo().dictionary {
|
||||
request.headerFields[.init(key)!] = value
|
||||
}
|
||||
request.headerFields[.init(DeviceInfo.clientInfoKey)!] = try await clientInfo()
|
||||
request.headerFields[.init(DeviceInfo.deviceIDKey)!] = self.localUserUID.uuidString
|
||||
// request.headers[DeviceInfo.clientInfoKey] = self.deviceInfo.clientInfo.clientString
|
||||
// self.deviceInfo.dictionary.forEach { request.headers[$0] = $1 }
|
||||
|
||||
let (_, response) = try await self.httpClient.makeRequest(request, body: body)
|
||||
|
||||
// print(String(data: response, encoding: .utf8) ?? "<no utf8 data>")
|
||||
|
||||
return try GrandSlamOperationDecoder<Response>.decode(data: response)
|
||||
}
|
||||
|
||||
@@ -231,7 +236,7 @@ public struct ADIDataProvider: AnisetteDataProvider {
|
||||
machineID: mid.base64EncodedString(),
|
||||
localUserID: self.localUserID,
|
||||
oneTimePassword: otp.base64EncodedString(),
|
||||
deviceInfo: try await deviceInfo(),
|
||||
deviceID: self.localUserUID.uuidString
|
||||
)
|
||||
}
|
||||
|
||||
@@ -240,12 +245,6 @@ public struct ADIDataProvider: AnisetteDataProvider {
|
||||
try? storage.setString(nil, forKey: Self.routingInfoKey)
|
||||
}
|
||||
|
||||
private static var providerID: String? {
|
||||
"mac-omnisette"
|
||||
}
|
||||
|
||||
public var providerID: String? { Self.providerID }
|
||||
|
||||
public func provisioningData() -> ProvisioningData? {
|
||||
guard let provisioningInfo = try? storage.data(forKey: Self.provisioningKey),
|
||||
let routingInfoString = try? storage.string(forKey: Self.routingInfoKey),
|
||||
@@ -279,34 +278,8 @@ public struct ADIDataProvider: AnisetteDataProvider {
|
||||
)
|
||||
}
|
||||
|
||||
public func deviceInfo() async throws -> DeviceInfo {
|
||||
let clientInfo = try await clientInfo()
|
||||
return DeviceInfo(
|
||||
deviceID: localUserUID.uuidString,
|
||||
clientInfo: clientInfo.clientInfo,
|
||||
akdUserAgent: clientInfo.akdUserAgent,
|
||||
)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public struct ADIError: Error, CustomStringConvertible {
|
||||
public struct ADIError: Error {
|
||||
public var code: Int
|
||||
|
||||
public var description: String {
|
||||
switch code {
|
||||
case -45061:
|
||||
return """
|
||||
You were logged out. Please log in again with `xtool auth`.
|
||||
|
||||
If you see this repeatedly, please file an issue at https://github.com/xtool-org/xtool/issues/new/choose
|
||||
"""
|
||||
default:
|
||||
return """
|
||||
Apple Anisette library returned error \(code). Please try logging in again with `xtool auth`.
|
||||
|
||||
If this problem persists, file an issue at https://github.com/xtool-org/xtool/issues/new/choose
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -49,17 +49,17 @@ public struct AnisetteData {
|
||||
static let oneTimePasswordKey = "X-Apple-I-MD"
|
||||
public let oneTimePassword: String
|
||||
|
||||
public let deviceInfo: DeviceInfo
|
||||
static let deviceIDKey = "X-Mme-Device-Id"
|
||||
public var deviceID: String?
|
||||
|
||||
public var dictionary: [String: String] {
|
||||
var dictionary: [String: String] {
|
||||
// GSA doesn't like "en_US@rg=..."; it has to be just "en_US".
|
||||
let localeIdentifier = if let language = locale.language.languageCode?.identifier,
|
||||
let region = locale.region?.identifier {
|
||||
let localeIdentifier = if let language = locale.languageCode, let region = locale.regionCode {
|
||||
"\(language)_\(region)"
|
||||
} else {
|
||||
"en_US"
|
||||
}
|
||||
return [
|
||||
var dictionary = [
|
||||
Self.localeKey: localeIdentifier,
|
||||
Self.timeZoneKey: timeZone.abbreviation() ?? "UTC",
|
||||
Self.clientTimeKey: Self.dateFormatter.string(from: clientTime),
|
||||
@@ -68,7 +68,10 @@ public struct AnisetteData {
|
||||
Self.localUserIDKey: localUserID,
|
||||
Self.oneTimePasswordKey: oneTimePassword,
|
||||
]
|
||||
.merging(deviceInfo.dictionary) { _, b in b }
|
||||
if let deviceID {
|
||||
dictionary[Self.deviceIDKey] = deviceID
|
||||
}
|
||||
return dictionary
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -10,20 +10,10 @@ import Foundation
|
||||
import Dependencies
|
||||
|
||||
public protocol AnisetteDataProvider: Sendable {
|
||||
/// Stored alongside login data. If the provider reports a new ID, we log out.
|
||||
///
|
||||
/// This is useful when switching Anisette provider implementations if the old
|
||||
/// implementation's provisioning data won't work with the new implementation.
|
||||
///
|
||||
/// The default implementation returns `nil`.
|
||||
var providerID: String? { get }
|
||||
|
||||
// This is a suggestion and not a requirement.
|
||||
func resetProvisioning() async
|
||||
func provisioningData() -> ProvisioningData?
|
||||
|
||||
func deviceInfo() async throws -> DeviceInfo
|
||||
|
||||
func fetchAnisetteData() async throws -> AnisetteData
|
||||
}
|
||||
|
||||
@@ -34,7 +24,6 @@ public struct ProvisioningData: Hashable, Codable, Sendable {
|
||||
}
|
||||
|
||||
extension AnisetteDataProvider {
|
||||
public var providerID: String? { nil }
|
||||
public func provisioningData() -> ProvisioningData? { nil }
|
||||
public func resetProvisioning() async {}
|
||||
}
|
||||
@@ -56,9 +45,4 @@ private struct UnimplementedAnisetteDataProvider: AnisetteDataProvider {
|
||||
let closure: () async throws -> AnisetteData = unimplemented()
|
||||
return try await closure()
|
||||
}
|
||||
|
||||
func deviceInfo() async throws -> DeviceInfo {
|
||||
let closure: () async throws -> DeviceInfo = unimplemented()
|
||||
return try await closure()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,101 @@
|
||||
//
|
||||
// DeviceInfo+Fetching.swift
|
||||
// XKit
|
||||
//
|
||||
// Created by Kabir Oberai on 18/06/20.
|
||||
// Copyright © 2020 Kabir Oberai. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
#if os(macOS)
|
||||
extension DeviceInfo {
|
||||
|
||||
private static func fetchDeviceID() -> String? {
|
||||
var waitTime = timespec(tv_sec: 0, tv_nsec: 0) // wait indefinitely
|
||||
let bytes = [UInt8](unsafeUninitializedCapacity: MemoryLayout<uuid_t>.size) { buf, count in
|
||||
// force unwrapping is safe because uuid_t has a non-zero size
|
||||
count = (gethostuuid(buf.baseAddress!, &waitTime) == 0) ? buf.count : 0
|
||||
}
|
||||
guard !bytes.isEmpty else { return nil }
|
||||
return bytes.withUnsafeBufferPointer {
|
||||
UUID(uuid: UnsafeRawBufferPointer($0).load(as: uuid_t.self)).uuidString
|
||||
}
|
||||
}
|
||||
|
||||
private static func hardwareProperty(forKey key: String) -> Data? {
|
||||
let entry = IORegistryEntryFromPath(kIOMainPortDefault, "IODeviceTree:/options")
|
||||
guard entry != 0 else { return nil }
|
||||
defer { IOObjectRelease(entry) }
|
||||
|
||||
return IORegistryEntryCreateCFProperty(
|
||||
entry, key as CFString, kCFAllocatorDefault, 0
|
||||
)?.takeRetainedValue() as? Data
|
||||
}
|
||||
|
||||
private static func fetchROMAddress() -> String? {
|
||||
hardwareProperty(forKey: "4D1EDE05-38C7-4a6a-9CC6-4BCCA8B38C14:ROM")?
|
||||
.map { String(format: "%02hhx", $0) }
|
||||
.joined()
|
||||
}
|
||||
|
||||
private static func fetchMLBSerialNumber() -> String? {
|
||||
hardwareProperty(forKey: "4D1EDE05-38C7-4a6a-9CC6-4BCCA8B38C14:MLB")?
|
||||
.map { String(format: isprint(Int32($0)) != 0 ? "%c" : "%02hhx", $0) }
|
||||
.joined()
|
||||
}
|
||||
|
||||
private static func fetchSerialNumber() -> String? {
|
||||
let service = IOServiceGetMatchingService(kIOMainPortDefault, IOServiceMatching("IOPlatformExpertDevice"))
|
||||
guard service != 0 else { return nil }
|
||||
defer { IOObjectRelease(service) }
|
||||
return IORegistryEntryCreateCFProperty(
|
||||
service, "IOPlatformSerialNumber" as CFString, kCFAllocatorDefault, 0
|
||||
)?.takeRetainedValue() as? String
|
||||
}
|
||||
|
||||
private static func fetchHardwareModel() -> String? {
|
||||
var modelSize = 0
|
||||
guard sysctlbyname("hw.model", nil, &modelSize, nil, 0) == 0 else { return nil }
|
||||
guard let rawString = malloc(modelSize) else { return nil }
|
||||
guard sysctlbyname("hw.model", rawString, &modelSize, nil, 0) == 0 else {
|
||||
free(rawString)
|
||||
return nil
|
||||
}
|
||||
return String(bytesNoCopy: rawString, length: modelSize - 1, encoding: .utf8, freeWhenDone: true)
|
||||
}
|
||||
|
||||
public static func current() -> DeviceInfo? {
|
||||
let romAddress = fetchROMAddress() ?? ""
|
||||
let mlbSerialNumber = fetchMLBSerialNumber() ?? ""
|
||||
|
||||
guard let deviceID = fetchDeviceID(),
|
||||
let serialNumber = fetchSerialNumber(),
|
||||
let modelID = fetchHardwareModel()
|
||||
else { return nil }
|
||||
return DeviceInfo(
|
||||
deviceID: deviceID,
|
||||
romAddress: romAddress,
|
||||
mlbSerialNumber: mlbSerialNumber,
|
||||
serialNumber: serialNumber,
|
||||
modelID: modelID
|
||||
)
|
||||
}
|
||||
|
||||
}
|
||||
#else
|
||||
extension DeviceInfo {
|
||||
public static func current() -> DeviceInfo? {
|
||||
return DeviceInfo(
|
||||
deviceID: "99B5D9D4-B068-5CEE-A799-5EBB5B0894A6",
|
||||
romAddress: "94f6a300e9a0",
|
||||
mlbSerialNumber: "C02520301W0GF2D1U",
|
||||
serialNumber: "C02PQKRJG8WP",
|
||||
modelID: "MacBookPro11,5"
|
||||
)
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
// FIXME: Figure out DeviceInfo.current() outside macOS
|
||||
// (see above)
|
||||
@@ -1,21 +1,126 @@
|
||||
//
|
||||
// DeviceInfo.swift
|
||||
// XKit
|
||||
//
|
||||
// Created by Kabir Oberai on 19/11/19.
|
||||
// Copyright © 2019 Kabir Oberai. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import Dependencies
|
||||
|
||||
public struct DeviceInfo: Codable, Sendable {
|
||||
public static let xcodeVersionKey = "X-Xcode-Version"
|
||||
public static let xcodeVersion = "26.5 (17F42)"
|
||||
|
||||
public static let deviceIDKey = "X-Mme-Device-Id"
|
||||
/// `X-Xcode-Version`
|
||||
static let xcodeVersionKey = "X-Xcode-Version"
|
||||
/// Not included in `dictionary`
|
||||
public static let xcodeVersion = "14.2 (14C18)"
|
||||
|
||||
public struct ClientInfo: Codable {
|
||||
public static let macOSVersion = "10.14.6"
|
||||
public static let macOSBuild = "18G103"
|
||||
|
||||
public static let authKitVersion = "1"
|
||||
public static let akdVersion = "1.0"
|
||||
public static let cfNetworkVersion = "978.0.7"
|
||||
public static let darwinVersion = "18.7.0"
|
||||
|
||||
public let modelID: String // e.g. MacBookPro11,5
|
||||
|
||||
// TODO: Do we need to replace com.apple.akd with com.apple.dt.Xcode? See AltStore
|
||||
var clientString: String {
|
||||
"""
|
||||
<\(modelID)> <Mac OS X;\(Self.macOSVersion);\(Self.macOSBuild)> \
|
||||
<com.apple.AuthKit/\(Self.authKitVersion) (com.apple.akd/\(Self.akdVersion))>
|
||||
"""
|
||||
}
|
||||
|
||||
var userAgent: String {
|
||||
"akd/\(Self.akdVersion) CFNetwork/\(Self.cfNetworkVersion) Darwin/\(Self.darwinVersion)"
|
||||
}
|
||||
|
||||
public init(modelID: String) {
|
||||
self.modelID = modelID
|
||||
}
|
||||
}
|
||||
|
||||
/// `X-Mme-Device-Id`
|
||||
static let deviceIDKey = "X-Mme-Device-Id"
|
||||
public let deviceID: String
|
||||
|
||||
public static let clientInfoKey = "X-MMe-Client-Info"
|
||||
public let clientInfo: String
|
||||
/// `X-Apple-I-ROM`
|
||||
static let romAddressKey = "X-Apple-I-ROM"
|
||||
public let romAddress: String
|
||||
|
||||
public let akdUserAgent: String
|
||||
/// `X-Apple-I-MLB`
|
||||
static let mlbSerialNumberKey = "X-Apple-I-MLB"
|
||||
/// main logic board serial number
|
||||
public let mlbSerialNumber: String
|
||||
|
||||
public var dictionary: [String: String] {
|
||||
/// `X-Apple-I-SRL-NO`
|
||||
static let serialNumberKey = "X-Apple-I-SRL-NO"
|
||||
public let serialNumber: String
|
||||
|
||||
public let modelID: String
|
||||
|
||||
/// `X-MMe-Client-Info`
|
||||
static let clientInfoKey = "X-MMe-Client-Info"
|
||||
public var clientInfo: ClientInfo { .init(modelID: modelID) }
|
||||
|
||||
public init(
|
||||
deviceID: String,
|
||||
romAddress: String,
|
||||
mlbSerialNumber: String,
|
||||
serialNumber: String,
|
||||
modelID: String
|
||||
) {
|
||||
self.deviceID = deviceID
|
||||
self.romAddress = romAddress
|
||||
self.mlbSerialNumber = mlbSerialNumber
|
||||
self.serialNumber = serialNumber
|
||||
self.modelID = modelID
|
||||
}
|
||||
|
||||
var dictionary: [String: String] {
|
||||
[
|
||||
Self.clientInfoKey: clientInfo,
|
||||
Self.deviceIDKey: deviceID,
|
||||
Self.romAddressKey: romAddress,
|
||||
Self.mlbSerialNumberKey: mlbSerialNumber,
|
||||
Self.serialNumberKey: serialNumber
|
||||
]
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
extension DeviceInfo {
|
||||
public enum FetchError: Error {
|
||||
case couldNotFetch
|
||||
}
|
||||
|
||||
fileprivate static func fetch() throws -> Self {
|
||||
guard let deviceInfo = DeviceInfo.current() else {
|
||||
throw FetchError.couldNotFetch
|
||||
}
|
||||
return deviceInfo
|
||||
}
|
||||
}
|
||||
|
||||
public struct DeviceInfoProvider: DependencyKey, Sendable {
|
||||
public var fetch: @Sendable () throws -> DeviceInfo
|
||||
|
||||
public init(fetch: @escaping @Sendable () throws -> DeviceInfo) {
|
||||
self.fetch = fetch
|
||||
}
|
||||
|
||||
private static let current = Result { try DeviceInfo.fetch() }
|
||||
|
||||
public static let testValue = DeviceInfoProvider(fetch: unimplemented())
|
||||
public static let liveValue = DeviceInfoProvider { try current.get() }
|
||||
}
|
||||
|
||||
extension DependencyValues {
|
||||
public var deviceInfoProvider: DeviceInfoProvider {
|
||||
get { self[DeviceInfoProvider.self] }
|
||||
set { self[DeviceInfoProvider.self] = newValue }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,254 @@
|
||||
//
|
||||
// LocalAnisetteDataProviders.swift
|
||||
// XKit
|
||||
//
|
||||
// Created by Kabir Oberai on 29/06/20.
|
||||
// Copyright © 2020 Kabir Oberai. All rights reserved.
|
||||
//
|
||||
|
||||
#if false
|
||||
|
||||
import Foundation
|
||||
|
||||
/// Creates a socket connected to `ip` on `port`.
|
||||
///
|
||||
/// - Returns: A connected socket file descriptor, or `nil` if
|
||||
/// the connection failed. The caller is responsible for closing
|
||||
/// the returned file descriptor.
|
||||
private func connect(toIP ip: String, port: UInt16) -> Int32? {
|
||||
var addr = sockaddr_in()
|
||||
addr.sin_family = .init(AF_INET)
|
||||
addr.sin_port = CFSwapInt16HostToBig(port)
|
||||
addr.sin_addr.s_addr = inet_addr(ip)
|
||||
|
||||
// we can't do this inside withUnsafePointer due to memory exclusivity rules
|
||||
let addrSize = MemoryLayout.size(ofValue: addr)
|
||||
|
||||
let socketFd = socket(AF_INET, SOCK_STREAM, 0)
|
||||
guard socketFd != -1 else { return nil }
|
||||
guard withUnsafePointer(to: &addr, {
|
||||
connect(
|
||||
socketFd,
|
||||
UnsafeRawPointer($0).assumingMemoryBound(to: sockaddr.self),
|
||||
.init(addrSize)
|
||||
)
|
||||
}) == 0 else { return nil }
|
||||
|
||||
return socketFd
|
||||
}
|
||||
|
||||
public class NetcatAnisetteDataProvider: AnisetteDataProvider {
|
||||
|
||||
private struct RawAnisetteData {
|
||||
let machineID: String
|
||||
let localUserID: String
|
||||
let routingInfo: String
|
||||
let oneTimePassword: String
|
||||
}
|
||||
|
||||
private class ConnectionInfo {
|
||||
let socketFd: Int32
|
||||
let machineID: String
|
||||
let localUserID: String
|
||||
let routingInfo: String
|
||||
let firstOTP: String
|
||||
|
||||
init(socketFd: Int32, machineID: String, localUserID: String, routingInfo: String, firstOTP: String) {
|
||||
self.socketFd = socketFd
|
||||
self.machineID = machineID
|
||||
self.localUserID = localUserID
|
||||
self.routingInfo = routingInfo
|
||||
self.firstOTP = firstOTP
|
||||
}
|
||||
|
||||
deinit { close(socketFd) }
|
||||
}
|
||||
|
||||
public enum Error: Swift.Error {
|
||||
/// The user is probably not running anisettehelperd on the host machine
|
||||
case helperUnreachable
|
||||
case invalidAnisetteData
|
||||
case networkError(errno: Int32)
|
||||
}
|
||||
|
||||
public let ip: String
|
||||
public let port: UInt16
|
||||
public let deviceInfo: DeviceInfo
|
||||
private var _connectionInfo: ConnectionInfo?
|
||||
private var hasUsedFirstOTP = false
|
||||
|
||||
public init(ip: String, port: UInt16, deviceInfo: DeviceInfo) {
|
||||
self.ip = ip
|
||||
self.port = port
|
||||
self.deviceInfo = deviceInfo
|
||||
}
|
||||
|
||||
public convenience init(localPort port: UInt16, deviceInfo: DeviceInfo) {
|
||||
self.init(ip: "0.0.0.0", port: port, deviceInfo: deviceInfo)
|
||||
}
|
||||
|
||||
private func readAll(fromSocket sock: Int32) throws -> Data {
|
||||
let capacity = 1024
|
||||
let buf = UnsafeMutablePointer<UInt8>.allocate(capacity: capacity)
|
||||
defer { buf.deallocate() }
|
||||
var data = Data()
|
||||
while true {
|
||||
let count = recv(sock, buf, capacity, 0)
|
||||
guard count != -1 else {
|
||||
throw Error.networkError(errno: errno)
|
||||
}
|
||||
data.append(buf, count: count)
|
||||
if count < capacity {
|
||||
break
|
||||
}
|
||||
}
|
||||
return data
|
||||
}
|
||||
|
||||
private func connectionInfo() throws -> ConnectionInfo {
|
||||
if let connectionInfo = _connectionInfo { return connectionInfo }
|
||||
|
||||
guard let socketFd = connect(toIP: ip, port: port) else { throw Error.helperUnreachable }
|
||||
|
||||
let id = deviceInfo.deviceID
|
||||
write(socketFd, id, strlen(id) + 1) // include null
|
||||
let clientInfo = deviceInfo.clientInfo.clientString
|
||||
write(socketFd, clientInfo, strlen(clientInfo) + 1)
|
||||
|
||||
let initialData = try readAll(fromSocket: socketFd)
|
||||
guard let string = String(data: initialData, encoding: .utf8)
|
||||
else { throw Error.invalidAnisetteData }
|
||||
|
||||
let components = string.split(separator: "\r\n")
|
||||
guard components.count == 4 else { throw Error.invalidAnisetteData }
|
||||
|
||||
let connectionInfo = ConnectionInfo(
|
||||
socketFd: socketFd,
|
||||
machineID: String(components[0]),
|
||||
localUserID: String(components[1]),
|
||||
routingInfo: String(components[2]),
|
||||
firstOTP: String(components[3])
|
||||
)
|
||||
_connectionInfo = connectionInfo
|
||||
return connectionInfo
|
||||
}
|
||||
|
||||
private func rawAnisetteData() throws -> RawAnisetteData {
|
||||
let info = try connectionInfo()
|
||||
if !hasUsedFirstOTP {
|
||||
return RawAnisetteData(
|
||||
machineID: info.machineID,
|
||||
localUserID: info.localUserID,
|
||||
routingInfo: info.routingInfo,
|
||||
oneTimePassword: info.firstOTP
|
||||
)
|
||||
}
|
||||
|
||||
write(info.socketFd, "a\n", 3)
|
||||
let response = try readAll(fromSocket: info.socketFd)
|
||||
guard let otp = String(data: response, encoding: .utf8)
|
||||
else { throw Error.invalidAnisetteData }
|
||||
return RawAnisetteData(
|
||||
machineID: info.machineID,
|
||||
localUserID: info.localUserID,
|
||||
routingInfo: info.routingInfo,
|
||||
oneTimePassword: otp
|
||||
)
|
||||
}
|
||||
|
||||
public func fetchAnisetteData(completion: @escaping (Result<AnisetteData, Swift.Error>) -> Void) {
|
||||
let time = Date()
|
||||
|
||||
let raw: RawAnisetteData
|
||||
let routingInfo: UInt64
|
||||
do {
|
||||
raw = try rawAnisetteData()
|
||||
guard let rinfo = UInt64(raw.routingInfo)
|
||||
else { throw Error.invalidAnisetteData }
|
||||
routingInfo = rinfo
|
||||
} catch {
|
||||
return completion(.failure(error))
|
||||
}
|
||||
|
||||
let anisette = AnisetteData(
|
||||
clientTime: time,
|
||||
routingInfo: routingInfo,
|
||||
machineID: raw.machineID,
|
||||
localUserID: raw.localUserID,
|
||||
oneTimePassword: raw.oneTimePassword
|
||||
)
|
||||
|
||||
completion(.success(anisette))
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/// Provides Anisette Data by making a request to a TCP server
|
||||
public class TCPAnisetteDataProvider: AnisetteDataProvider {
|
||||
|
||||
public enum Error: Swift.Error {
|
||||
/// The user is probably not running anisettehelperd on the host machine
|
||||
case helperUnreachable
|
||||
case invalidAnisetteData
|
||||
}
|
||||
|
||||
public let ip: String
|
||||
public let port: UInt16
|
||||
|
||||
public init(ip: String, port: UInt16) {
|
||||
self.ip = ip
|
||||
self.port = port
|
||||
}
|
||||
|
||||
public convenience init(localPort port: UInt16) {
|
||||
self.init(ip: "0.0.0.0", port: port)
|
||||
}
|
||||
|
||||
private func rawAnisetteData() throws -> Data {
|
||||
guard let socketFd = connect(toIP: ip, port: port) else { throw Error.helperUnreachable }
|
||||
|
||||
let capacity = 1024
|
||||
let buf = UnsafeMutablePointer<UInt8>.allocate(capacity: capacity)
|
||||
defer { buf.deallocate() }
|
||||
var data = Data()
|
||||
while true {
|
||||
let count = recv(socketFd, buf, capacity, 0)
|
||||
// swiftlint:disable:next empty_count
|
||||
guard count != 0 else { break }
|
||||
data.append(buf, count: count)
|
||||
}
|
||||
|
||||
return data
|
||||
}
|
||||
|
||||
public func fetchAnisetteData(completion: @escaping (Result<AnisetteData, Swift.Error>) -> Void) {
|
||||
let time = Date()
|
||||
|
||||
let rawDeserialized: Any
|
||||
do {
|
||||
let raw = try rawAnisetteData()
|
||||
rawDeserialized = try PropertyListSerialization.propertyList(from: raw, format: nil)
|
||||
} catch {
|
||||
return completion(.failure(error))
|
||||
}
|
||||
|
||||
guard let data = rawDeserialized as? [String: Any],
|
||||
let rinfoString = data[AnisetteData.routingInfoKey] as? String,
|
||||
let rinfo = UInt64(rinfoString),
|
||||
let machineID = data[AnisetteData.machineIDKey] as? String,
|
||||
let localUserID = data[AnisetteData.localUserIDKey] as? String,
|
||||
let oneTimePassword = data[AnisetteData.oneTimePasswordKey] as? String
|
||||
else { return completion(.failure(Error.invalidAnisetteData)) }
|
||||
|
||||
completion(.success(AnisetteData(
|
||||
clientTime: time,
|
||||
routingInfo: rinfo,
|
||||
machineID: machineID,
|
||||
localUserID: localUserID,
|
||||
oneTimePassword: oneTimePassword
|
||||
)))
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -6,9 +6,10 @@ struct OmnisetteADIProvider: RawADIProvider {
|
||||
|
||||
// should implement v3 of https://github.com/SideStore/omnisette-server
|
||||
// list: https://servers.sidestore.io/servers.json
|
||||
// e.g. https://ani.sidestore.io
|
||||
private let url: URL
|
||||
init(
|
||||
url: URL = URL(string: "https://mac-ani.jkcoxson.com")!
|
||||
url: URL = URL(string: "https://ani.sidestore.io")! // URL(string: "http://localhost:6969")!
|
||||
) {
|
||||
self.url = url
|
||||
}
|
||||
@@ -27,19 +28,15 @@ struct OmnisetteADIProvider: RawADIProvider {
|
||||
return encoder
|
||||
}()
|
||||
|
||||
func clientInfo() async throws -> ClientInfoWithUserAgent {
|
||||
func clientInfo() async throws -> String {
|
||||
struct ClientInfo: Decodable {
|
||||
let clientInfo: String
|
||||
let userAgent: String
|
||||
}
|
||||
let body = try await client.makeRequest(
|
||||
HTTPRequest(url: url.appendingPathComponent("v3/client_info"))
|
||||
).body
|
||||
let clientInfo = try Self.decoder.decode(ClientInfo.self, from: body)
|
||||
return ClientInfoWithUserAgent(
|
||||
clientInfo: clientInfo.clientInfo,
|
||||
akdUserAgent: clientInfo.userAgent,
|
||||
)
|
||||
return clientInfo.clientInfo
|
||||
}
|
||||
|
||||
func startProvisioning(spim: Data, userID: UUID) async throws -> (RawADIProvisioningSession, Data) {
|
||||
|
||||
@@ -0,0 +1,195 @@
|
||||
#if os(Linux)
|
||||
|
||||
import Foundation
|
||||
import XADI
|
||||
import Dependencies
|
||||
|
||||
public actor XADIProvider: RawADIProvider {
|
||||
@MainActor private static var loadTask: Task<Void, Error>?
|
||||
@Dependency(\.httpClient) private var httpClient
|
||||
@Dependency(\.persistentDirectory) private var persistentDirectory
|
||||
|
||||
private var directory: URL { persistentDirectory.appendingPathComponent("Anisette") }
|
||||
|
||||
public init() {}
|
||||
|
||||
private func _loadADI(id: UUID) async throws {
|
||||
let dir = self.directory
|
||||
let libDir = dir.appending(path: "libs")
|
||||
if !libDir.dirExists {
|
||||
let tmp = dir.appending(path: "tmp")
|
||||
try? FileManager.default.createDirectory(at: tmp, withIntermediateDirectories: true)
|
||||
|
||||
let applemusic = tmp.appending(path: "applemusic.apk")
|
||||
if !applemusic.exists {
|
||||
print("[Downloading libraries] ...", terminator: "")
|
||||
fflush(stdoutSafe)
|
||||
let url = URL(string: "https://apps.mzstatic.com/content/android-apple-music-apk/applemusic.apk")!
|
||||
defer { print("") }
|
||||
let data = try await httpClient.makeRequest(HTTPRequest(url: url)) { progress in
|
||||
guard let progress else { return }
|
||||
let progString = "\(Int(progress * 100))%".padding(toLength: 4, leading: true)
|
||||
print("\r[Downloading libraries] \(progString)", terminator: "")
|
||||
fflush(stdoutSafe)
|
||||
}.body
|
||||
try data.write(to: applemusic)
|
||||
}
|
||||
|
||||
#if arch(arm64)
|
||||
let arch = "arm64-v8a"
|
||||
#elseif arch(x86_64)
|
||||
let arch = "x86_64"
|
||||
#else
|
||||
#error("Unsupported architecture")
|
||||
#endif
|
||||
let archDir = "lib/\(arch)"
|
||||
|
||||
// TODO: Use ZIPFoundation
|
||||
let proc = Process()
|
||||
proc.executableURL = URL(filePath: "/usr/bin/env")
|
||||
proc.arguments = [
|
||||
"unzip", "-q",
|
||||
applemusic.path(),
|
||||
"\(archDir)/libCoreADI.so",
|
||||
"\(archDir)/libstoreservicescore.so",
|
||||
"-d", tmp.path()
|
||||
]
|
||||
try proc.run()
|
||||
proc.waitUntilExit()
|
||||
try FileManager.default.moveItem(
|
||||
at: tmp.appending(path: archDir),
|
||||
to: libDir
|
||||
)
|
||||
try? FileManager.default.removeItem(at: tmp)
|
||||
}
|
||||
|
||||
xadi_Load(strdup(libDir.path()))
|
||||
|
||||
let rawID = id.uuidString.replacingOccurrences(of: "-", with: "").prefix(16).lowercased()
|
||||
try check(xadi_SetAndroidID(rawID, UInt32(rawID.utf8.count)))
|
||||
|
||||
let adi = dir.appending(path: "adi")
|
||||
try? FileManager.default.createDirectory(at: adi, withIntermediateDirectories: true)
|
||||
try check(xadi_SetProvisioningPath(adi.path()))
|
||||
}
|
||||
|
||||
@MainActor private func loadADI(id: UUID) async throws {
|
||||
if let loadTask = Self.loadTask {
|
||||
try await loadTask.value
|
||||
return
|
||||
}
|
||||
let loadTask = Task { try await _loadADI(id: id) }
|
||||
Self.loadTask = loadTask
|
||||
try await loadTask.value
|
||||
}
|
||||
|
||||
public func clientInfo() async throws -> String {
|
||||
"""
|
||||
<MacBookPro13,2> <macOS;13.1;22C65> <com.apple.AuthKit/1 (com.apple.dt.Xcode/3594.4.19)>
|
||||
"""
|
||||
}
|
||||
|
||||
public func startProvisioning(spim: Data, userID: UUID) async throws -> (any RawADIProvisioningSession, Data) {
|
||||
try await loadADI(id: userID)
|
||||
|
||||
var sessionID: UInt32 = 0
|
||||
var cpimBytes: UnsafeMutableRawPointer?
|
||||
var cpimLen: UInt32 = 0
|
||||
try check(spim.withUnsafeBytes { spimBytes in
|
||||
xadi_ProvisioningStart(
|
||||
UInt64(bitPattern: -2),
|
||||
spimBytes.baseAddress!, UInt32(spimBytes.count),
|
||||
&cpimBytes, &cpimLen,
|
||||
&sessionID
|
||||
)
|
||||
})
|
||||
let data = Data(UnsafeRawBufferPointer(start: cpimBytes, count: Int(cpimLen)))
|
||||
_ = cpimBytes.map { xadi_Dispose($0) }
|
||||
return (
|
||||
ADISession(
|
||||
sessionID: sessionID,
|
||||
adiDirectory: directory.appending(path: "adi")
|
||||
),
|
||||
data
|
||||
)
|
||||
}
|
||||
|
||||
private struct ADISession: RawADIProvisioningSession {
|
||||
let sessionID: UInt32
|
||||
let adiDirectory: URL
|
||||
|
||||
func endProvisioning(routingInfo: UInt64, ptm: Data, tk: Data) async throws -> Data {
|
||||
try check(ptm.withUnsafeBytes { ptmBuf in
|
||||
tk.withUnsafeBytes { tkBuf in
|
||||
xadi_ProvisioningEnd(
|
||||
sessionID,
|
||||
ptmBuf.baseAddress!, UInt32(ptmBuf.count),
|
||||
tkBuf.baseAddress!, UInt32(tkBuf.count)
|
||||
)
|
||||
}
|
||||
})
|
||||
let file = adiDirectory.appending(path: "adi.pb")
|
||||
// adi saves the file as 0o034 (group wx, public r) by default
|
||||
// which is a... strange choice that prevents us from reading
|
||||
// or writing by default. Since we're the owner, we can easily
|
||||
// change this though.
|
||||
try FileManager.default.setAttributes(
|
||||
// rw for owner
|
||||
[.posixPermissions: 0o600],
|
||||
ofItemAtPath: file.path
|
||||
)
|
||||
return try Data(contentsOf: file)
|
||||
}
|
||||
}
|
||||
|
||||
public func requestOTP(
|
||||
userID: UUID,
|
||||
routingInfo: inout UInt64,
|
||||
provisioningInfo: Data
|
||||
) async throws -> (machineID: Data, otp: Data) {
|
||||
try await loadADI(id: userID)
|
||||
|
||||
var midBytes: UnsafeMutableRawPointer?
|
||||
var midLen: UInt32 = 0
|
||||
var otpBytes: UnsafeMutableRawPointer?
|
||||
var otpLen: UInt32 = 0
|
||||
|
||||
let adiDirectory = directory.appending(path: "adi")
|
||||
try? FileManager.default.createDirectory(at: adiDirectory, withIntermediateDirectories: true)
|
||||
let adiFile = adiDirectory.appending(path: "adi.pb")
|
||||
try provisioningInfo.write(to: adiFile)
|
||||
|
||||
try check(xadi_OTPRequest(
|
||||
UInt64(bitPattern: -2),
|
||||
&midBytes, &midLen,
|
||||
&otpBytes, &otpLen
|
||||
))
|
||||
|
||||
let mid = Data(UnsafeRawBufferPointer(start: midBytes, count: Int(midLen)))
|
||||
let otp = Data(UnsafeRawBufferPointer(start: otpBytes, count: Int(otpLen)))
|
||||
|
||||
_ = midBytes.map { xadi_Dispose($0) }
|
||||
_ = otpBytes.map { xadi_Dispose($0) }
|
||||
|
||||
return (machineID: mid, otp: otp)
|
||||
}
|
||||
}
|
||||
|
||||
private func check(_ adiStatus: Int32) throws {
|
||||
guard adiStatus == 0 else {
|
||||
throw ADIError(code: Int(adiStatus))
|
||||
}
|
||||
}
|
||||
|
||||
extension StringProtocol {
|
||||
fileprivate func padding(
|
||||
toLength minLength: Int,
|
||||
withPad pad: Character = " ",
|
||||
leading: Bool = false
|
||||
) -> String {
|
||||
let justPadding = String(repeating: pad, count: Swift.max(minLength - count, 0))
|
||||
return leading ? justPadding + self : self + justPadding
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
import Foundation
|
||||
import Crypto
|
||||
import CryptoExtras
|
||||
import _CryptoExtras
|
||||
import BigInt
|
||||
|
||||
struct SRPClient {
|
||||
|
||||
@@ -15,19 +15,22 @@ struct GrandSlamClient: Sendable {
|
||||
|
||||
private let lookupManager = GrandSlamLookupManager()
|
||||
|
||||
@Dependency(\.deviceInfoProvider) var deviceInfoProvider
|
||||
@Dependency(\.anisetteDataProvider) var anisetteDataProvider
|
||||
@Dependency(\.httpClient) var httpClient
|
||||
|
||||
init() {}
|
||||
|
||||
func send<R: GrandSlamRequest>(_ request: R) async throws -> R.Decoder.Value {
|
||||
let deviceInfo = try deviceInfoProvider.fetch()
|
||||
|
||||
let anisetteData = try await anisetteDataProvider.fetchAnisetteData()
|
||||
let url = try await lookupManager.fetchURL(forEndpoint: R.endpoint)
|
||||
|
||||
let method = request.method(anisetteData: anisetteData)
|
||||
let method = request.method(deviceInfo: deviceInfo, anisetteData: anisetteData)
|
||||
var httpRequest = HTTPRequest(method: method.httpMethod, url: url)
|
||||
httpRequest.headerFields[.contentType] = "text/x-xml-plist"
|
||||
httpRequest.headerFields[.init(DeviceInfo.clientInfoKey)!] = anisetteData.deviceInfo.clientInfo
|
||||
httpRequest.headerFields[.init(DeviceInfo.clientInfoKey)!] = deviceInfo.clientInfo.clientString
|
||||
let body: Data? = switch method {
|
||||
case .get:
|
||||
nil
|
||||
@@ -36,13 +39,9 @@ struct GrandSlamClient: Sendable {
|
||||
fromPropertyList: body, format: .xml, options: 0
|
||||
)
|
||||
}
|
||||
request.configure(request: &httpRequest, anisetteData: anisetteData)
|
||||
request.configure(request: &httpRequest, deviceInfo: deviceInfo, anisetteData: anisetteData)
|
||||
|
||||
// GrandSlam doesn't seem to like reused (keep-alive) connections so create a
|
||||
// new one for each request. cf https://github.com/rileytestut/AltSign/pull/52
|
||||
let resp = try await httpClient.withEphemeralClient {
|
||||
try await $0.makeRequest(httpRequest, body: body)
|
||||
}
|
||||
let resp = try await httpClient.makeRequest(httpRequest, body: body)
|
||||
return try R.Decoder.decode(data: resp.body)
|
||||
}
|
||||
|
||||
|
||||
@@ -21,26 +21,31 @@ actor GrandSlamLookupManager {
|
||||
private let decoder = PropertyListDecoder()
|
||||
private var endpoints: GrandSlamEndpoints?
|
||||
|
||||
@Dependency(\.anisetteDataProvider) var anisetteDataProvider
|
||||
@Dependency(\.deviceInfoProvider) var deviceInfoProvider
|
||||
@Dependency(\.httpClient) var httpClient
|
||||
|
||||
init() {}
|
||||
|
||||
private func performLookup() async throws -> GrandSlamEndpoints {
|
||||
let deviceInfo = try await anisetteDataProvider.deviceInfo()
|
||||
let deviceInfo = try deviceInfoProvider.fetch()
|
||||
|
||||
/* {
|
||||
"X-Apple-I-Locale" = "en_IN";
|
||||
"X-Apple-I-TimeZone" = "Asia/Kolkata";
|
||||
"X-Apple-I-TimeZone-Offset" = 19800;
|
||||
"X-MMe-Client-Info" = "<MacBookPro11,5> <Mac OS X;10.14.6;18G103> <com.apple.AuthKit/1 (com.apple.akd/1.0)>";
|
||||
"X-MMe-Country" = IN;
|
||||
"X-Mme-Device-Id" = "[REDACTED]";
|
||||
} */
|
||||
var request = HTTPRequest(url: Self.lookupURL)
|
||||
request.headerFields = [
|
||||
.userAgent: deviceInfo.akdUserAgent,
|
||||
.init(DeviceInfo.clientInfoKey)!: deviceInfo.clientInfo.clientString,
|
||||
.init(DeviceInfo.deviceIDKey)!: deviceInfo.deviceID,
|
||||
.init(AnisetteData.iLocaleKey)!: Locale.current.identifier,
|
||||
.init(AnisetteData.timeZoneKey)!: TimeZone.current.identifier,
|
||||
.init("X-Apple-I-TimeZone-Offset")!: "\(TimeZone.current.secondsFromGMT())"
|
||||
]
|
||||
request.headerFields[.init("X-MMe-Country")!] = Locale.current.region?.identifier
|
||||
|
||||
for (key, value) in deviceInfo.dictionary {
|
||||
request.headerFields[.init(key)!] = value
|
||||
}
|
||||
request.headerFields[.init("X-MMe-Country")!] = Locale.current.regionCode
|
||||
|
||||
let (_, body) = try await httpClient.makeRequest(request)
|
||||
|
||||
|
||||
@@ -27,15 +27,7 @@ struct GrandSlamTwoFactorAuthenticateOperation {
|
||||
private func performSMSAuth() async throws {
|
||||
// TODO: parse phone number list from o=complete req?
|
||||
let phoneNumberID = "1"
|
||||
do {
|
||||
try await client.send(GrandSlamSMSAuthRequest(loginData: loginData, phoneNumberID: phoneNumberID))
|
||||
} catch let error as HTTPResponseError where error.status.code == 403 {
|
||||
print("""
|
||||
warning: Could not send verification code via SMS. Falling back to trusted device authentication...
|
||||
""")
|
||||
try await performTrustedDeviceAuth()
|
||||
return
|
||||
}
|
||||
try await client.send(GrandSlamSMSAuthRequest(loginData: loginData, phoneNumberID: phoneNumberID))
|
||||
try await validateCode(phoneNumberID: phoneNumberID)
|
||||
}
|
||||
|
||||
@@ -59,14 +51,7 @@ struct GrandSlamTwoFactorAuthenticateOperation {
|
||||
|
||||
private func performTrustedDeviceAuth() async throws {
|
||||
let request = GrandSlamTrustedDeviceRequest(loginData: loginData)
|
||||
do {
|
||||
try await client.send(request)
|
||||
} catch let error as HTTPResponseError where error.status.code == 403 {
|
||||
print("""
|
||||
warning: Could not send verification code. Generate one manually.
|
||||
See https://github.com/xtool-org/xtool/discussions/368
|
||||
""")
|
||||
}
|
||||
try await client.send(request)
|
||||
try await validateCode()
|
||||
}
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@ struct GrandSlamSMSAuthRequest: GrandSlamTwoFactorRequest {
|
||||
let loginData: GrandSlamLoginData
|
||||
let phoneNumberID: String
|
||||
|
||||
func method(anisetteData: AnisetteData) -> GrandSlamMethod {
|
||||
func method(deviceInfo: DeviceInfo, anisetteData: AnisetteData) -> GrandSlamMethod {
|
||||
.post([
|
||||
"serverInfo": [
|
||||
"phoneNumber.id": phoneNumberID
|
||||
|
||||
@@ -36,7 +36,7 @@ struct GrandSlamValidateSMSRequest: GrandSlamTwoFactorRequest {
|
||||
let phoneNumberID: String
|
||||
let verificationCode: String
|
||||
|
||||
func method(anisetteData: AnisetteData) -> GrandSlamMethod {
|
||||
func method(deviceInfo: DeviceInfo, anisetteData: AnisetteData) -> GrandSlamMethod {
|
||||
.post([
|
||||
"securityCode.code": verificationCode,
|
||||
"serverInfo": [
|
||||
|
||||
@@ -69,12 +69,12 @@ extension GrandSlamOperationRequest {
|
||||
|
||||
static var endpoint: GrandSlamEndpoint { .lookup(\.gsService) }
|
||||
|
||||
func configure(request: inout HTTPRequest, anisetteData: AnisetteData) {
|
||||
func configure(request: inout HTTPRequest, deviceInfo: DeviceInfo, anisetteData: AnisetteData) {
|
||||
request.headerFields[.accept] = "*/*"
|
||||
request.headerFields[.userAgent] = anisetteData.deviceInfo.akdUserAgent
|
||||
request.headerFields[.userAgent] = deviceInfo.clientInfo.userAgent
|
||||
}
|
||||
|
||||
func method(anisetteData: AnisetteData) -> GrandSlamMethod {
|
||||
func method(deviceInfo: DeviceInfo, anisetteData: AnisetteData) -> GrandSlamMethod {
|
||||
var clientData: [String: Any] = [
|
||||
"bootstrap": true,
|
||||
"icscrec": true,
|
||||
@@ -83,6 +83,7 @@ extension GrandSlamOperationRequest {
|
||||
"svct": "iCloud",
|
||||
"loc": Locale.current.identifier
|
||||
]
|
||||
clientData.merge(deviceInfo.dictionary) { _, b in b }
|
||||
clientData.merge(anisetteData.dictionary) { _, b in b }
|
||||
|
||||
var request: [String: Any] = [
|
||||
|
||||
@@ -30,6 +30,6 @@ protocol GrandSlamRequest: Sendable {
|
||||
|
||||
static var endpoint: GrandSlamEndpoint { get }
|
||||
|
||||
func configure(request: inout HTTPRequest, anisetteData: AnisetteData)
|
||||
func method(anisetteData: AnisetteData) -> GrandSlamMethod
|
||||
func configure(request: inout HTTPRequest, deviceInfo: DeviceInfo, anisetteData: AnisetteData)
|
||||
func method(deviceInfo: DeviceInfo, anisetteData: AnisetteData) -> GrandSlamMethod
|
||||
}
|
||||
|
||||
@@ -17,10 +17,9 @@ extension GrandSlamTwoFactorRequest {
|
||||
|
||||
var extraHeaders: [String: String] { [:] }
|
||||
|
||||
func configure(request: inout HTTPRequest, anisetteData: AnisetteData) {
|
||||
func configure(request: inout HTTPRequest, deviceInfo: DeviceInfo, anisetteData: AnisetteData) {
|
||||
request.headerFields[.accept] = "application/x-buddyml"
|
||||
request.headerFields[.contentType] = "application/x-plist"
|
||||
request.headerFields[.userAgent] = anisetteData.deviceInfo.akdUserAgent
|
||||
request.headerFields[.init("X-Apple-App-Info")!] = "com.apple.gs.xcode.auth"
|
||||
request.headerFields[.init(DeviceInfo.xcodeVersionKey)!] = DeviceInfo.xcodeVersion
|
||||
request.headerFields[.init("X-Apple-Identity-Token")!] = loginData.identityToken
|
||||
@@ -28,7 +27,7 @@ extension GrandSlamTwoFactorRequest {
|
||||
extraHeaders.forEach { request.headerFields[.init($0)!] = $1 }
|
||||
}
|
||||
|
||||
func method(anisetteData: AnisetteData) -> GrandSlamMethod {
|
||||
func method(deviceInfo: DeviceInfo, anisetteData: AnisetteData) -> GrandSlamMethod {
|
||||
.get
|
||||
}
|
||||
|
||||
|
||||
@@ -18,49 +18,23 @@ import OpenAPIAsyncHTTPClient
|
||||
import Dependencies
|
||||
|
||||
extension HTTPClientDependencyKey: DependencyKey {
|
||||
public static let liveValue: HTTPClientProtocol = Client()
|
||||
}
|
||||
|
||||
private struct Client: HTTPClientProtocol {
|
||||
private static var proxyConfiguration: HTTPClient.Configuration.Proxy? {
|
||||
// e.g. `XTL_HTTP_PROXY=localhost:8080`
|
||||
guard let value = ProcessInfo.processInfo.environment["XTL_HTTP_PROXY"],
|
||||
let separator = value.lastIndex(of: ":"),
|
||||
let port = Int(value[value.index(after: separator)...]) else {
|
||||
return nil
|
||||
}
|
||||
|
||||
let host = String(value[..<separator])
|
||||
return host.isEmpty ? nil : .server(host: host, port: port)
|
||||
}
|
||||
|
||||
private static let tlsConfiguration: TLSConfiguration = {
|
||||
let appleRoots = appleRootCertificates.map { pem in
|
||||
// if ssl cert parsing fails we're screwed so we might as well force try
|
||||
// swiftlint:disable:next force_try
|
||||
try! NIOSSLCertificate(bytes: Array(pem.utf8), format: .pem)
|
||||
}
|
||||
public static let liveValue: HTTPClientProtocol = {
|
||||
// if ssl cert parsing fails we're screwed so we might as well force try
|
||||
// swiftlint:disable:next force_try
|
||||
let appleRootCA = try! NIOSSLCertificate(bytes: Array(appleRootPEM.utf8), format: .pem)
|
||||
var tlsConfiguration: TLSConfiguration = .makeClientConfiguration()
|
||||
tlsConfiguration.additionalTrustRoots = [.certificates(appleRoots)]
|
||||
if ProcessInfo.processInfo.environment["XTL_DISABLE_TLS_VALIDATION"] == "1" {
|
||||
tlsConfiguration.certificateVerification = .none
|
||||
}
|
||||
return tlsConfiguration
|
||||
}()
|
||||
|
||||
var client: HTTPClient
|
||||
|
||||
init() {
|
||||
tlsConfiguration.additionalTrustRoots = [.certificates([appleRootCA])]
|
||||
var config = HTTPClient.Configuration(
|
||||
tlsConfiguration: Self.tlsConfiguration,
|
||||
proxy: Self.proxyConfiguration,
|
||||
tlsConfiguration: tlsConfiguration,
|
||||
decompression: .enabled(limit: .none)
|
||||
)
|
||||
config.timeout.connect = .seconds(60)
|
||||
self.client = HTTPClient(configuration: config)
|
||||
}
|
||||
return HTTPClient(configuration: config)
|
||||
}()
|
||||
}
|
||||
|
||||
func makeWebSocket(url: URL) async throws -> any WebSocketSession {
|
||||
extension HTTPClient: HTTPClientProtocol {
|
||||
public func makeWebSocket(url: URL) async throws -> any WebSocketSession {
|
||||
let (stream, continuation) = AsyncStream.makeStream(of: WebSocketSessionWrapper.self)
|
||||
async let value = stream.first(where: { _ in true })
|
||||
// must be after the `async let` so that we finish if connect throws
|
||||
@@ -68,7 +42,7 @@ private struct Client: HTTPClientProtocol {
|
||||
// we can't use the async overload because we need to immediately subscribe
|
||||
// to onText/onBinary in the same EventLoop tick that the WebSocket is created.
|
||||
// This is also why we create the SessionWrapper inside the closure.
|
||||
let future = WebSocket.connect(to: url, on: client.eventLoopGroup) {
|
||||
let future = WebSocket.connect(to: url, on: eventLoopGroup) {
|
||||
continuation.yield(WebSocketSessionWrapper(webSocket: $0))
|
||||
}
|
||||
try await future.get()
|
||||
@@ -82,17 +56,8 @@ private struct Client: HTTPClientProtocol {
|
||||
case connectFailed
|
||||
}
|
||||
|
||||
var asOpenAPITransport: any ClientTransport {
|
||||
AsyncHTTPClientTransport(configuration: .init(client: client))
|
||||
}
|
||||
|
||||
func withEphemeralClient<T>(
|
||||
perform: (any HTTPClientProtocol) async throws -> T
|
||||
) async throws -> T {
|
||||
let ephemeralClient = Client()
|
||||
let result = await Result { try await perform(ephemeralClient) }
|
||||
try? await ephemeralClient.client.shutdown()
|
||||
return try result.get()
|
||||
public var asOpenAPITransport: any ClientTransport {
|
||||
AsyncHTTPClientTransport(configuration: .init(client: self))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -138,17 +103,6 @@ private final class WebSocketSessionWrapper: WebSocketSession {
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Apple Root Certificates
|
||||
|
||||
// https://www.apple.com/certificateauthority/
|
||||
|
||||
private let appleRootCertificates: [String] = [
|
||||
appleRootPEM,
|
||||
appleRootG2PEM,
|
||||
appleRootG3PEM,
|
||||
]
|
||||
|
||||
// https://www.apple.com/appleca/AppleIncRootCertificate.cer
|
||||
private let appleRootPEM = """
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIEuzCCA6OgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQGEwJVUzET
|
||||
@@ -179,59 +133,4 @@ IQ7aunMZT7XZNn/Bh1XZp5m5MkL72NVxnn6hUrcbvZNCJBIqxw8dtk2cXmPIS4AX
|
||||
UKqK1drk/NAJBzewdXUh
|
||||
-----END CERTIFICATE-----
|
||||
"""
|
||||
|
||||
// https://www.apple.com/certificateauthority/AppleRootCA-G2.cer
|
||||
private let appleRootG2PEM = """
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIFkjCCA3qgAwIBAgIIAeDltYNno+AwDQYJKoZIhvcNAQEMBQAwZzEbMBkGA1UE
|
||||
AwwSQXBwbGUgUm9vdCBDQSAtIEcyMSYwJAYDVQQLDB1BcHBsZSBDZXJ0aWZpY2F0
|
||||
aW9uIEF1dGhvcml0eTETMBEGA1UECgwKQXBwbGUgSW5jLjELMAkGA1UEBhMCVVMw
|
||||
HhcNMTQwNDMwMTgxMDA5WhcNMzkwNDMwMTgxMDA5WjBnMRswGQYDVQQDDBJBcHBs
|
||||
ZSBSb290IENBIC0gRzIxJjAkBgNVBAsMHUFwcGxlIENlcnRpZmljYXRpb24gQXV0
|
||||
aG9yaXR5MRMwEQYDVQQKDApBcHBsZSBJbmMuMQswCQYDVQQGEwJVUzCCAiIwDQYJ
|
||||
KoZIhvcNAQEBBQADggIPADCCAgoCggIBANgREkhI2imKScUcx+xuM23+TfvgHN6s
|
||||
XuI2pyT5f1BrTM65MFQn5bPW7SXmMLYFN14UIhHF6Kob0vuy0gmVOKTvKkmMXT5x
|
||||
ZgM4+xb1hYjkWpIMBDLyyED7Ul+f9sDx47pFoFDVEovy3d6RhiPw9bZyLgHaC/Yu
|
||||
OQhfGaFjQQscp5TBhsRTL3b2CtcM0YM/GlMZ81fVJ3/8E7j4ko380yhDPLVoACVd
|
||||
J2LT3VXdRCCQgzWTxb+4Gftr49wIQuavbfqeQMpOhYV4SbHXw8EwOTKrfl+q04tv
|
||||
ny0aIWhwZ7Oj8ZhBbZF8+NfbqOdfIRqMM78xdLe40fTgIvS/cjTf94FNcX1RoeKz
|
||||
8NMoFnNvzcytN31O661A4T+B/fc9Cj6i8b0xlilZ3MIZgIxbdMYs0xBTJh0UT8TU
|
||||
gWY8h2czJxQI6bR3hDRSj4n4aJgXv8O7qhOTH11UL6jHfPsNFL4VPSQ08prcdUFm
|
||||
IrQB1guvkJ4M6mL4m1k8COKWNORj3rw31OsMiANDC1CvoDTdUE0V+1ok2Az6DGOe
|
||||
HwOx4e7hqkP0ZmUoNwIx7wHHHtHMn23KVDpA287PT0aLSmWaasZobNfMmRtHsHLD
|
||||
d4/E92GcdB/O/WuhwpyUgquUoue9G7q5cDmVF8Up8zlYNPXEpMZ7YLlmQ1A/bmH8
|
||||
DvmGqmAMQ0uVAgMBAAGjQjBAMB0GA1UdDgQWBBTEmRNsGAPCe8CjoA1/coB6HHcm
|
||||
jTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQwF
|
||||
AAOCAgEAUabz4vS4PZO/Lc4Pu1vhVRROTtHlznldgX/+tvCHM/jvlOV+3Gp5pxy+
|
||||
8JS3ptEwnMgNCnWefZKVfhidfsJxaXwU6s+DDuQUQp50DhDNqxq6EWGBeNjxtUVA
|
||||
eKuowM77fWM3aPbn+6/Gw0vsHzYmE1SGlHKy6gLti23kDKaQwFd1z4xCfVzmMX3z
|
||||
ybKSaUYOiPjjLUKyOKimGY3xn83uamW8GrAlvacp/fQ+onVJv57byfenHmOZ4VxG
|
||||
/5IFjPoeIPmGlFYl5bRXOJ3riGQUIUkhOb9iZqmxospvPyFgxYnURTbImHy99v6Z
|
||||
SYA7LNKmp4gDBDEZt7Y6YUX6yfIjyGNzv1aJMbDZfGKnexWoiIqrOEDCzBL/FePw
|
||||
N983csvMmOa/orz6JopxVtfnJBtIRD6e/J/JzBrsQzwBvDR4yGn1xuZW7AYJNpDr
|
||||
FEobXsmII9oDMJELuDY++ee1KG++P+w8j2Ud5cAeh6Squpj9kuNsJnfdBrRkBof0
|
||||
Tta6SqoWqPQFZ2aWuuJVecMsXUmPgEkrihLHdoBR37q9ZV0+N0djMenl9MU/S60E
|
||||
inpxLK8JQzcPqOMyT/RFtm2XNuyE9QoB6he7hY1Ck3DDUOUUi78/w0EP3SIEIwiK
|
||||
um1xRKtzCTrJ+VKACd+66eYWyi4uTLLT3OUEVLLUNIAytbwPF+E=
|
||||
-----END CERTIFICATE-----
|
||||
"""
|
||||
|
||||
// https://www.apple.com/certificateauthority/AppleRootCA-G3.cer
|
||||
private let appleRootG3PEM = """
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIICQzCCAcmgAwIBAgIILcX8iNLFS5UwCgYIKoZIzj0EAwMwZzEbMBkGA1UEAwwS
|
||||
QXBwbGUgUm9vdCBDQSAtIEczMSYwJAYDVQQLDB1BcHBsZSBDZXJ0aWZpY2F0aW9u
|
||||
IEF1dGhvcml0eTETMBEGA1UECgwKQXBwbGUgSW5jLjELMAkGA1UEBhMCVVMwHhcN
|
||||
MTQwNDMwMTgxOTA2WhcNMzkwNDMwMTgxOTA2WjBnMRswGQYDVQQDDBJBcHBsZSBS
|
||||
b290IENBIC0gRzMxJjAkBgNVBAsMHUFwcGxlIENlcnRpZmljYXRpb24gQXV0aG9y
|
||||
aXR5MRMwEQYDVQQKDApBcHBsZSBJbmMuMQswCQYDVQQGEwJVUzB2MBAGByqGSM49
|
||||
AgEGBSuBBAAiA2IABJjpLz1AcqTtkyJygRMc3RCV8cWjTnHcFBbZDuWmBSp3ZHtf
|
||||
TjjTuxxEtX/1H7YyYl3J6YRbTzBPEVoA/VhYDKX1DyxNB0cTddqXl5dvMVztK517
|
||||
IDvYuVTZXpmkOlEKMaNCMEAwHQYDVR0OBBYEFLuw3qFYM4iapIqZ3r6966/ayySr
|
||||
MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMAoGCCqGSM49BAMDA2gA
|
||||
MGUCMQCD6cHEFl4aXTQY2e3v9GwOAEZLuN+yRhHFD/3meoyhpmvOwgPUnPWTxnS4
|
||||
at+qIxUCMG1mihDK1A3UT82NQz60imOlM27jbdoXt2QfyFMm+YhidDkLF1vLUagM
|
||||
6BgD56KyKA==
|
||||
-----END CERTIFICATE-----
|
||||
"""
|
||||
#endif
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user