Compare commits

..

1 Commits

113 changed files with 1027 additions and 3425 deletions
-8
View File
@@ -1,8 +0,0 @@
*
!/Package.swift
!/Package.resolved
!/Sources
!/Tests
!/Linux
/Linux/packages
/Linux/staging
-17
View File
@@ -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 -1
View File
@@ -6,4 +6,4 @@ runs:
- name: Set up Xcode
shell: bash
run: |
sudo xcode-select -s /Applications/Xcode_27.0.0.app
sudo xcode-select -s /Applications/Xcode_26.4.app
+3 -5
View File
@@ -6,8 +6,6 @@ on:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
env:
XTL_CI: "1"
jobs:
build-linux:
strategy:
@@ -24,10 +22,10 @@ jobs:
uses: actions/checkout@v6
- name: Build and test
run: |
docker compose run --build -e XTL_CI=1 xtool bash -c \
docker compose run --build xtool bash -c \
"swift build --product xtool && .build/debug/xtool --help && swift test"
build-macos:
runs-on: xcode-27
runs-on: macos-26
steps:
- name: Checkout
uses: actions/checkout@v6
@@ -39,7 +37,7 @@ jobs:
run: |
swift test
build-ios:
runs-on: xcode-27
runs-on: macos-26
steps:
- name: Checkout
uses: actions/checkout@v6
-18
View File
@@ -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
+1 -27
View File
@@ -3,9 +3,6 @@ on:
tags:
- "*"
env:
XTL_CI: "1"
jobs:
build-linux:
strategy:
@@ -26,7 +23,6 @@ jobs:
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
@@ -36,7 +32,7 @@ jobs:
Linux/packages/xtool-${{ matrix.host.arch }}.AppImage
Linux/packages/xtool-${{ matrix.host.arch }}.AppImage.zsync
build-mac:
runs-on: xcode-27
runs-on: macos-26
permissions:
contents: write
steps:
@@ -57,7 +53,6 @@ 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
@@ -86,24 +81,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 }}
-7
View File
@@ -1,7 +0,0 @@
{
"swiftPM": {
"buildSystem": "swiftbuild",
"scratchPath": ".build/index-build"
},
"backgroundIndexing": true
}
+1 -1
View File
@@ -1,4 +1,4 @@
swiftlint_version: 0.65.1
swiftlint_version: 0.59.1
disabled_rules:
- trailing_comma
- nesting
-16
View File
@@ -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.
-1
View File
@@ -1 +0,0 @@
@AGENTS.md
+21 -8
View File
@@ -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
View File
@@ -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.0
FROM swift:${SWIFT_VERSION}-jammy AS build-base
FROM swift:6.3-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
-20
View File
@@ -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.
-31
View File
@@ -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.
-1
View File
@@ -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" } }
+2 -2
View File
@@ -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") {}
}
+4 -10
View File
@@ -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.3 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.3 (swift-6.3-RELEASE)
```
### usbmuxd
@@ -68,7 +62,7 @@ sudo apt-get install usbmuxd
### Xcode.xip
Download **Xcode 27** from <https://developer.apple.com/download/all/?q=Xcode>. Note the path where `Xcode.xip` is saved.
Download **Xcode 26** from <https://developer.apple.com/download/all/?q=Xcode>. Note the path where `Xcode.xip` is saved.
> Note:
>
@@ -131,7 +125,7 @@ Choice (0-1): 0
Path to Xcode.xip:
```
Enter the path (for example `~/Downloads/Xcode_27.0.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:
-6
View File
@@ -1,6 +0,0 @@
.DS_Store
.build
.swiftpm
*/xtool
*/.bsp
/out
-29
View File
@@ -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)")
}
}
}
-2
View File
@@ -1,2 +0,0 @@
version: 1
bundleID: sh.xtool.examples.DemoDynamic
-33
View File
@@ -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>
-6
View File
@@ -1,6 +0,0 @@
version: 1
bundleID: sh.xtool.examples.DemoExtensions
product: DemoExtensions
extensions:
- product: DemoExtensionsWidget
infoPath: Support/DemoExtensionsWidget-Info.plist
-31
View File
@@ -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
View File
@@ -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
-4
View File
@@ -1,4 +0,0 @@
version: 1
bundleID: sh.xtool.examples.DemoResources
resources:
- Resources/top.txt
-28
View File
@@ -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,4 +0,0 @@
import ExampleSupport
import SwiftUI
@main struct DemoApp: ExampleApp {}
-2
View File
@@ -1,2 +0,0 @@
version: 1
bundleID: sh.xtool.examples.DemoSimple
-132
View File
@@ -1,132 +0,0 @@
{
"originHash" : "4a80ae2e9e4c4e1e4e29c32e93dc624202a42a942e44d358035684ec5e0746f7",
"pins" : [
{
"identity" : "combine-schedulers",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/combine-schedulers",
"state" : {
"revision" : "114354e8c1667a2edc4993700fb9fa4f90157b56",
"version" : "1.2.2"
}
},
{
"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
}
-30
View File
@@ -1,30 +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"),
],
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)
}
}
}
-2
View File
@@ -1,2 +0,0 @@
version: 1
bundleID: sh.xtool.examples.DemoTCA
-31
View File
@@ -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)
}
}
}
-14
View File
@@ -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
-118
View File
@@ -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
View File
@@ -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"
+1 -6
View File
@@ -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)
+118 -100
View File
@@ -1,5 +1,5 @@
{
"originHash" : "7ae7f57a6038e121dec04557563bc2a3412c9e46e473d9c84f3e3ac82be608f9",
"originHash" : "80db0cddb0e78cf6a4c79f94537cdfebd8004679161532fbae8a57ee9d1d8cd1",
"pins" : [
{
"identity" : "aexml",
@@ -15,8 +15,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/swift-server/async-http-client.git",
"state" : {
"revision" : "f95c908967e98c68c5ce3fd61a7974e7e869e303",
"version" : "1.36.1"
"revision" : "3a5b74a58782c3b4c1f0bc75e9b67b10c2494e8f",
"version" : "1.33.1"
}
},
{
@@ -24,8 +24,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/attaswift/BigInt",
"state" : {
"revision" : "63feef7820abb1a8fb08587d7da56bb0b7db8751",
"version" : "6.0.1"
"revision" : "e07e00fa1fd435143a2dcf8b7eec9a7710b2fdfe",
"version" : "5.7.0"
}
},
{
@@ -33,8 +33,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/combine-schedulers",
"state" : {
"revision" : "114354e8c1667a2edc4993700fb9fa4f90157b56",
"version" : "1.2.2"
"revision" : "dcccb979a2183b8df3334237e3dc1ae2b4116a86",
"version" : "1.2.0"
}
},
{
"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" : "57b6318128e3f901c93f4fbf98d1c1464ec168d3",
"version" : "6.2.0"
}
},
{
@@ -64,6 +64,15 @@
"version" : "1.0.1"
}
},
{
"identity" : "rainbow",
"kind" : "remoteSourceControl",
"location" : "https://github.com/onevcat/Rainbow.git",
"state" : {
"revision" : "cdf146ae671b2624917648b61c908d1244b98ca1",
"version" : "4.2.1"
}
},
{
"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" : "626b5b7b2f45e1b0b1c6f4a309296d1d21d7311b",
"version" : "1.7.1"
}
},
{
@@ -96,8 +105,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-asn1.git",
"state" : {
"revision" : "3b6410f7dee09eb33cdd26260c5fd47fda19b0e2",
"version" : "1.7.3"
"revision" : "eb50cbd14606a9161cbc5d452f18797c90ef0bab",
"version" : "1.7.0"
}
},
{
@@ -105,8 +114,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-async-algorithms.git",
"state" : {
"revision" : "3da39bbc4e687d4192af7c9cf4eab805745a0b9c",
"version" : "1.1.5"
"revision" : "9d349bcc328ac3c31ce40e746b5882742a0d1272",
"version" : "1.1.3"
}
},
{
@@ -114,8 +123,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-atomics.git",
"state" : {
"revision" : "0442cb5a3f98ab802acb777929fdb446bda11a34",
"version" : "1.3.1"
"revision" : "b601256eab081c0f92f059e12818ac1d4f178ff7",
"version" : "1.3.0"
}
},
{
@@ -123,8 +132,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-certificates",
"state" : {
"revision" : "ff86b924ead66f853b8baf91f3c41926a8f36177",
"version" : "1.21.0"
"revision" : "bde8ca32a096825dfce37467137c903418c1893d",
"version" : "1.19.1"
}
},
{
@@ -132,8 +141,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-clocks",
"state" : {
"revision" : "82440fa0a8b1c381a6d1e8e0fc7bbba53ec63204",
"version" : "1.1.1"
"revision" : "cc46202b53476d64e824e0b6612da09d84ffde8e",
"version" : "1.0.6"
}
},
{
@@ -141,8 +150,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-collections",
"state" : {
"revision" : "a0cb0954ecb21e4e31b0070e6ed5674e8556685a",
"version" : "1.6.0"
"revision" : "fea17c02d767f46b23070fdfdacc28a03a39232a",
"version" : "1.5.1"
}
},
{
@@ -150,8 +159,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-concurrency-extras",
"state" : {
"revision" : "5fa253428866f2360c3754e88537f700ed2656b5",
"version" : "1.4.1"
"revision" : "5a3825302b1a0d744183200915a47b508c828e6f",
"version" : "1.3.2"
}
},
{
@@ -159,8 +168,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-configuration.git",
"state" : {
"revision" : "3533f65d3e36dcdffc91ce34ef4d3c9c1887fd4b",
"version" : "1.2.1"
"revision" : "be76c4ad929eb6c4bcaf3351799f2adf9e6848a9",
"version" : "1.2.0"
}
},
{
@@ -168,8 +177,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-crypto",
"state" : {
"revision" : "a9d1d5ab8951ada40cafff8c8e2b551dfde4f390",
"version" : "5.0.0"
"revision" : "1b6b2e274e85105bfa155183145a1dcfd63331f1",
"version" : "4.5.0"
}
},
{
@@ -177,8 +186,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-dependencies",
"state" : {
"revision" : "b476cc5761057d8d857de063fe7ac8daecf5c06b",
"version" : "1.17.1"
"revision" : "706feb7858a7f6c242879d137b8ee30926aa5b26",
"version" : "1.12.0"
}
},
{
@@ -186,8 +195,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-distributed-tracing.git",
"state" : {
"revision" : "cc504a45f6ce73ce6067837d7ac19fa67b229a56",
"version" : "1.5.0"
"revision" : "dc4030184203ffafbb2ec614352487235d747fe0",
"version" : "1.4.1"
}
},
{
@@ -222,17 +231,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" : "75b000cea2ca6d7527a57e1b9cc0bdf21a9abe9f",
"version" : "2.1.1"
"revision" : "45eb0224913ea070ec4fba17291b9e7ecf4749ca",
"version" : "1.5.1"
}
},
{
@@ -240,8 +240,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-log.git",
"state" : {
"revision" : "9c6fb14227f55d8f711ce3847dc2f419fb0ecacb",
"version" : "1.15.1"
"revision" : "5073617dac96330a486245e4c0179cb0a6fd2256",
"version" : "1.12.0"
}
},
{
@@ -249,8 +249,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio",
"state" : {
"revision" : "21de5f08c1a166a6dd293d0e587ad977bf8dac5d",
"version" : "2.103.0"
"revision" : "f71c8d2a5e74a2c6d11a0fbe324774b5d6084237",
"version" : "2.99.0"
}
},
{
@@ -258,8 +258,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-extras.git",
"state" : {
"revision" : "41449336c8ecfadac6b4b5be75f9c3c306e61ced",
"version" : "1.35.1"
"revision" : "5a48717e29f62cb8326d6d42e46b562ca93847a6",
"version" : "1.34.0"
}
},
{
@@ -267,8 +267,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-http2.git",
"state" : {
"revision" : "0f3e54e29c944c2e835ad52159da7d9e1c94ac69",
"version" : "1.46.0"
"revision" : "81cc18264f92cd307ff98430f89372711d4f6fe9",
"version" : "1.43.0"
}
},
{
@@ -276,8 +276,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-ssl.git",
"state" : {
"revision" : "322f3c2a4a21df31c84ca416bf65ee5e9059e440",
"version" : "2.37.5"
"revision" : "3f337058ccd7243c4cac7911477d8ad4c598d4da",
"version" : "2.37.0"
}
},
{
@@ -312,8 +312,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-openapi-generator",
"state" : {
"revision" : "39d49cf22abab58a07f02bb76808b5d2839b294a",
"version" : "1.13.1"
"revision" : "5dd0da1c7da7bac8f0c458a02a76f69031137a80",
"version" : "1.12.1"
}
},
{
@@ -321,8 +321,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-openapi-runtime",
"state" : {
"revision" : "9e53df53e043b53046a371b31aaf0a1e26eef946",
"version" : "1.12.1"
"revision" : "f039fa6d6338aab5164f3d1be16281524c9a8f89",
"version" : "1.11.0"
}
},
{
@@ -330,8 +330,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-openapi-urlsession",
"state" : {
"revision" : "08796d36c99ad2318929bfa1d1e40f82194b65cc",
"version" : "1.3.1"
"revision" : "576a65b4ffb8c12ddad4950dc21eea2ef071bec2",
"version" : "1.3.0"
}
},
{
@@ -348,8 +348,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/swift-server/swift-service-lifecycle",
"state" : {
"revision" : "7f9326b0326ff86e3646295ea6e891f68c471c5e",
"version" : "2.12.0"
"revision" : "9829955b385e5bb88128b73f1b8389e9b9c3191a",
"version" : "2.11.0"
}
},
{
@@ -357,8 +357,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/swiftlang/swift-subprocess",
"state" : {
"revision" : "b3937ab85dd32f6e9435914599c1519074769c1a",
"version" : "1.0.0"
"revision" : "11633673a41f509f8945f23c96c7acd4adafd679",
"version" : "0.5.0"
}
},
{
@@ -366,17 +366,26 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/swiftlang/swift-syntax",
"state" : {
"revision" : "050f1a346fbbac0ca2cfb15a95274f7bd1cf0ccf",
"version" : "604.0.0"
"revision" : "9de99a78f099e59caf2b2beec65a4c45d54b2081",
"version" : "603.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" : "7c6ad0fc39d0763e0b699210e4124afd5041c5df",
"version" : "1.6.4"
}
},
{
"identity" : "swiftcli",
"kind" : "remoteSourceControl",
"location" : "https://github.com/jakeheis/SwiftCLI.git",
"state" : {
"revision" : "2e949055d9797c1a6bddcda0e58dada16cc8e970",
"version" : "6.0.3"
}
},
{
@@ -384,8 +393,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/xtool-org/SwiftyMobileDevice",
"state" : {
"revision" : "1f6e4cc614a31953bda5d1092a747cfdea90916f",
"version" : "1.7.0"
"revision" : "280d0dc8153469944491aee2f19af29e9c7a77f0",
"version" : "1.5.0"
}
},
{
@@ -397,6 +406,15 @@
"version" : "3.3.0"
}
},
{
"identity" : "version",
"kind" : "remoteSourceControl",
"location" : "https://github.com/mxcl/Version",
"state" : {
"revision" : "3043fcd2a50375db76d89ff206a612471833d1c2",
"version" : "2.2.1"
}
},
{
"identity" : "websocket-kit",
"kind" : "remoteSourceControl",
@@ -407,21 +425,12 @@
}
},
{
"identity" : "xadi",
"identity" : "xcodegen",
"kind" : "remoteSourceControl",
"location" : "https://github.com/xtool-org/xadi",
"location" : "https://github.com/yonaskolb/XcodeGen",
"state" : {
"revision" : "3db108d3cafe719a4b2e9d13a9c8c52770e20aa7",
"version" : "0.4.2"
}
},
{
"identity" : "xcode-project-format",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/xcode-project-format.git",
"state" : {
"revision" : "c132630aabf40f6d6c3f7bb004595d2e5a28ea42",
"version" : "0.1.0"
"revision" : "8d3d3476a69ae3e5d68e1adccc701c410c05eb36",
"version" : "2.45.4"
}
},
{
@@ -429,8 +438,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/tuist/XcodeProj.git",
"state" : {
"revision" : "aeea2e97376cd69fbdd1c7e68664b79a1a641dde",
"version" : "9.17.5"
"revision" : "01bb77000bc8c23a09ea2058f4954612f03cb705",
"version" : "9.10.1"
}
},
{
"identity" : "xctest-dynamic-overlay",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
"state" : {
"revision" : "dfd70507def84cb5fb821278448a262c6ff2bbad",
"version" : "1.9.0"
}
},
{
@@ -438,8 +456,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/xtool-org/xtool-core",
"state" : {
"revision" : "f867f9c2aea16ac78ca14d0d2f948b47db0732b4",
"version" : "1.5.0"
"revision" : "d412ac768d1e73d16ad7ccc6805f12fc701709f6",
"version" : "1.4.0"
}
},
{
@@ -456,8 +474,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/xtool-org/zsign",
"state" : {
"revision" : "f6158be9e62a5ce2a53d72b1a6d880880da956c8",
"version" : "1.9.0"
"revision" : "6c4a9f52dd8bf374aa938ef9c17d5f261f2c333a",
"version" : "1.7.0"
}
}
],
+24 -55
View File
@@ -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(.v16),
.macOS(.v13),
],
products: [
.library(
@@ -48,27 +40,22 @@ let package = Package(
),
],
dependencies: [
.package(url: "https://github.com/xtool-org/xtool-core", .upToNextMinor(from: "1.5.0")),
.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/xadi", .upToNextMinor(from: "0.4.2")),
.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.7.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: "4.5.0"),
.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"),
// v1.7.0 has a crash on old OSes: https://github.com/apple/swift-collections/issues/733.
// pin 1.6.0 until 1.7.1 is released.
.package(url: "https://github.com/apple/swift-collections", exact: "1.6.0"),
.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/swiftlang/swift-subprocess", .upToNextMinor(from: "0.5.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"),
@@ -76,18 +63,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/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.45.4"),
],
targets: [
.systemLibrary(name: "XADI"),
.target(
name: "CXKit",
dependencies: [
@@ -104,8 +90,7 @@ let package = Package(
dependencies: [
.product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"),
],
exclude: ["openapi-generator-config.yaml", "patch.js"],
swiftSettings: swiftSettings,
exclude: ["openapi-generator-config.yaml", "patch.js"]
),
// common utilities shared across xtool targets
.target(
@@ -117,8 +102,7 @@ let package = Package(
package: "swift-subprocess",
condition: .when(platforms: [.linux, .macOS])
),
],
swiftSettings: swiftSettings,
]
),
.target(
name: "XKit",
@@ -126,7 +110,7 @@ let package = Package(
"DeveloperAPI",
"CXKit",
"XUtils",
.product(name: "XADI", package: "xadi", condition: .when(platforms: [.linux, .macOS])),
.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"),
@@ -135,7 +119,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"),
@@ -157,17 +141,13 @@ let package = Package(
condition: .when(platforms: [.linux])
),
],
cSettings: cSettings,
swiftSettings: swiftSettings,
cSettings: cSettings
),
.testTarget(
name: "XToolTests",
dependencies: [
"XKit",
"XToolSupport",
"PackLib",
],
swiftSettings: swiftSettings,
]
),
.target(
name: "XToolSupport",
@@ -178,28 +158,18 @@ 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",
@@ -208,8 +178,7 @@ let package = Package(
"XKit",
"XToolSupport",
],
cSettings: cSettings,
swiftSettings: swiftSettings,
cSettings: cSettings
),
]
)
+31 -130
View File
@@ -1,75 +1,37 @@
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) }
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)
@@ -79,43 +41,18 @@ public struct BuildSettings: Sendable {
arguments: .init(arguments),
output: .string(limit: .max)
).checkSuccess()
return result.standardOutput.trimmingCharacters(in: .whitespacesAndNewlines)
return result.standardOutput?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
}
private static let _swiftURL = Task {
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"))
}
#endif
public func withPackagePath(_ path: String) -> Self {
var copy = self
copy.packagePath = path
return copy
}
public func swiftPMInvocation(
forTool tool: String,
arguments: [String],
packagePathOverride: String? = nil
) async throws -> Subprocess.Configuration {
let executable: Executable
let baseArguments: [String]
@@ -128,71 +65,35 @@ 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.
executable = .path(try await Self.swiftURL.value)
#else
executable = .name("swift")
#endif
baseArguments = [tool]
}
let extraArguments: [String] = [
"--package-path", packagePathOverride ?? packagePath,
"--configuration", configuration.rawValue,
]
var rawEnv = ProcessInfo.processInfo.environment
rawEnv.removeValue(forKey: "SDKROOT")
let env = Dictionary(uniqueKeysWithValues: rawEnv.map {
(Environment.Key(rawValue: $0)!, $1)
})
return Configuration(
executable: executable,
arguments: .init(baseArguments + resolvedBaseOptions + arguments),
environment: .inherit.updating(sdkEnvironment),
executable,
arguments: .init(baseArguments + extraArguments + sdkOptions + options + arguments),
environment: .custom(env),
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",
]
}
public var buildServerArguments: [String] {
["package"] + baseBuildServerArguments + resolvedBaseOptions
}
public func buildServerInvocation() async throws -> Subprocess.Configuration {
try await swiftPMInvocation(forTool: "package", arguments: baseBuildServerArguments)
}
}
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"
}
}
}
-132
View File
@@ -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)
}
}
-3
View File
@@ -22,9 +22,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?
+17 -46
View File
@@ -55,24 +55,23 @@ 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",
],
)
let buildConfig = 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",
]
)
try await Subprocess.run(
buildConfig,
output: .currentStandardOutput,
output: .currentStandardError,
error: .currentStandardError,
)
.checkSuccess()
@@ -85,16 +84,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
)
@@ -193,7 +184,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 {
@@ -210,26 +201,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 {
+2 -6
View File
@@ -137,10 +137,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))
}
@@ -248,9 +244,10 @@ public struct Planner: Sendable {
}
private func _dumpAction(arguments: [String], path: String) async throws -> Data {
let dumpConfig = try await buildSettings.withPackagePath(path).swiftPMInvocation(
let dumpConfig = try await buildSettings.swiftPMInvocation(
forTool: "package",
arguments: arguments,
packagePathOverride: path
)
return try await Subprocess.run(
dumpConfig,
@@ -412,7 +409,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]?
-92
View File
@@ -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
}
}
}
+126 -254
View File
@@ -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] = [
var buildSettings: [String: 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"]),
"TARGETED_DEVICE_FAMILY": .string(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"] = .string((fromProjectToRoot + Path(entitlementsPath)).string)
}
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
+4
View File
@@ -0,0 +1,4 @@
module XADI [extern_c] {
header "xadi.h"
link "xadi"
}
+13
View File
@@ -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);
@@ -138,9 +138,3 @@ extension WirelessAccessoryEntitlement: EntitlementWithCapability {
DeveloperServicesCapability(.wirelessAccessoryConfiguration, isFree: true)
}
}
extension WiFiAwareEntitlement: EntitlementWithCapability {
var capability: DeveloperServicesCapability {
DeveloperServicesCapability(rawName: "WIFI_AWARE", isFree: false)
}
}
@@ -140,10 +140,12 @@ 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)!] = deviceInfo.clientInfo.clientString
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
@@ -49,7 +49,7 @@ private struct UnimplementedRawADIProvider: RawADIProvider {
private enum RawADIProviderDependencyKey: DependencyKey {
static let testValue: RawADIProvider = UnimplementedRawADIProvider()
static let liveValue: RawADIProvider = {
#if canImport(XADI)
#if os(Linux)
return XADIProvider()
#else
return OmnisetteADIProvider()
@@ -92,10 +92,13 @@ public struct ADIDataProvider: AnisetteDataProvider {
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 {
@@ -107,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"
@@ -248,12 +245,6 @@ public struct ADIDataProvider: AnisetteDataProvider {
try? storage.setString(nil, forKey: Self.routingInfoKey)
}
private static var providerID: String? {
"2"
}
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),
@@ -289,23 +280,6 @@ public struct ADIDataProvider: AnisetteDataProvider {
}
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
"""
}
}
}
@@ -10,14 +10,6 @@ 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?
@@ -32,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 {}
}
@@ -14,19 +14,29 @@ public struct DeviceInfo: Codable, Sendable {
/// `X-Xcode-Version`
static let xcodeVersionKey = "X-Xcode-Version"
/// Not included in `dictionary`
public static let xcodeVersion = "26.5 (17F42)"
public static let xcodeVersion = "14.2 (14C18)"
public struct ClientInfo: Codable {
public static let macOSVersion = "14.3.1"
public static let macOSBuild = "23D60"
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 {
"""
<Pixel 7> <Android;14;UQ1A.240205.002> <com.apple.AuthKit/1 (com.apple.akd/1.0)>
<\(modelID)> <Mac OS X;\(Self.macOSVersion);\(Self.macOSBuild)> \
<com.apple.AuthKit/\(Self.authKitVersion) (com.apple.akd/\(Self.akdVersion))>
"""
}
var userAgent: String {
"AuthKit/1 (Macintosh; OS X 27.0) (com.apple.dt.Xcode/26.5)"
"akd/\(Self.akdVersion) CFNetwork/\(Self.cfNetworkVersion) Darwin/\(Self.darwinVersion)"
}
public init(modelID: String) {
@@ -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
@@ -1,4 +1,4 @@
#if canImport(XADI)
#if os(Linux)
import Foundation
import XADI
@@ -8,7 +8,7 @@
import Foundation
import Crypto
import CryptoExtras
import _CryptoExtras
import BigInt
struct SRPClient {
+1 -5
View File
@@ -41,11 +41,7 @@ struct GrandSlamClient: Sendable {
}
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)
}
@@ -39,7 +39,6 @@ actor GrandSlamLookupManager {
} */
var request = HTTPRequest(url: Self.lookupURL)
request.headerFields = [
.userAgent: deviceInfo.clientInfo.userAgent,
.init(DeviceInfo.clientInfoKey)!: deviceInfo.clientInfo.clientString,
.init(DeviceInfo.deviceIDKey)!: deviceInfo.deviceID,
.init(AnisetteData.iLocaleKey)!: Locale.current.identifier,
@@ -18,47 +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 = {
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([appleRootCA])]
if ProcessInfo.processInfo.environment["XTL_DISABLE_TLS_VALIDATION"] == "1" {
tlsConfiguration.certificateVerification = .none
}
return tlsConfiguration
}()
var client: HTTPClient
init() {
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
@@ -66,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()
@@ -80,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))
}
}
@@ -18,10 +18,6 @@ public protocol HTTPClientProtocol: Sendable {
var asOpenAPITransport: ClientTransport { get }
func makeWebSocket(url: URL) async throws -> WebSocketSession
func withEphemeralClient<T>(
perform: (any HTTPClientProtocol) async throws -> T
) async throws -> T
}
extension HTTPClientProtocol {
@@ -45,72 +41,28 @@ extension HTTPClientProtocol {
public func makeRequest(
_ request: HTTPRequest,
body: Data? = nil,
requireHTTPSuccess: Bool = true,
onProgress: @isolated(any) (Double?) -> Void = { _ in }
) async throws -> (response: HTTPResponse, body: Data) {
await onProgress(0)
let (response, responseBody) = try await send(request, body: body.map { HTTPBody($0) })
guard !requireHTTPSuccess || ![.clientError, .serverError].contains(response.status.kind) else {
let errorBody = (try? await responseBody.collect()) ?? Data()
throw HTTPResponseError(
method: request.method,
url: "\(request.scheme ?? "https")://\(request.authority ?? "")\(request.path ?? "")",
status: response.status,
// we don't use `decoding:as:` because we want to validate the UTF8
body: String(data: errorBody, encoding: .utf8)?.trimmingCharacters(in: .whitespacesAndNewlines)
)
let (response, body) = try await send(request, body: body.map { HTTPBody($0) })
guard let body else {
return (response, Data())
}
return (response, try await responseBody.collect(onProgress: onProgress))
}
}
extension HTTPBody? {
fileprivate func collect(
onProgress: @isolated(any) (Double?) -> Void = { _ in }
) async throws -> Data {
try await self?.collect(onProgress: onProgress) ?? Data()
}
}
extension HTTPBody {
fileprivate func collect(
onProgress: @isolated(any) (Double?) -> Void
) async throws -> Data {
switch self.length {
switch body.length {
case .unknown:
return try await self.reduce(into: Data()) { $0 += $1 }
return (response, try await body.reduce(into: Data()) { $0 += $1 })
case .known(let length):
var data = Data(capacity: Int(length))
let total = Double(length)
for try await chunk in self {
for try await chunk in body {
data += chunk
await onProgress(Swift.min(Double(data.count) / total, 1))
await onProgress(min(Double(data.count) / total, 1))
}
return data
return (response, data)
}
}
}
public struct HTTPResponseError: Error, LocalizedError, Sendable, CustomStringConvertible {
public let method: HTTPRequest.Method
public let url: String
public let status: HTTPResponse.Status
public let body: String?
public var description: String {
var description = "\(method.rawValue) \(url) failed: HTTP \(status.code)"
if !status.reasonPhrase.isEmpty {
description += " \(status.reasonPhrase)"
}
if let body, !body.isEmpty {
description += ". Details:\n\(body)"
}
return description
}
public var errorDescription: String? { description }
}
private struct UnimplementedHTTPClient: HTTPClientProtocol, ClientTransport {
public var asOpenAPITransport: ClientTransport { self }
@@ -132,12 +84,6 @@ private struct UnimplementedHTTPClient: HTTPClientProtocol, ClientTransport {
return try closure()
}
func withEphemeralClient<T>(
perform: (any HTTPClientProtocol) async throws -> T
) async throws -> T {
try await perform(self)
}
public func makeWebSocket(url: URL) async throws -> any WebSocketSession {
let closure: (URL) async throws -> any WebSocketSession = unimplemented()
return try await closure(url)
@@ -40,18 +40,6 @@ private struct Client: HTTPClientProtocol {
) {
webSocketCallbacks.withValue { $0.removeValue(forKey: webSocketTask) }?(closeCode)
}
func urlSession(
_ session: URLSession,
didReceive challenge: URLAuthenticationChallenge
) async -> (URLSession.AuthChallengeDisposition, URLCredential?) {
if ProcessInfo.processInfo.environment["XTL_DISABLE_TLS_VALIDATION"] == "1",
let trust = challenge.protectionSpace.serverTrust {
return (.useCredential, URLCredential(trust: trust))
} else {
return (.performDefaultHandling, nil)
}
}
}
private let clientDelegate = ClientDelegate()
@@ -68,15 +56,6 @@ private struct Client: HTTPClientProtocol {
URLSessionTransport(configuration: .init(session: session))
}
func withEphemeralClient<T>(
perform: (any HTTPClientProtocol) async throws -> T
) async throws -> T {
let ephemeralClient = Client()
let result = await Result { try await perform(ephemeralClient) }
ephemeralClient.session.finishTasksAndInvalidate()
return try result.get()
}
public func makeWebSocket(url: URL) async throws -> any WebSocketSession {
let task = session.webSocketTask(with: url)
let (event, eventContinuation) = AsyncStream<URLSessionWebSocketTask.CloseCode?>.makeStream()
@@ -26,7 +26,6 @@ extension EntitlementContainer {
SiriKitEntitlement.self,
InterAppAudioEntitlement.self,
WirelessAccessoryEntitlement.self,
WiFiAwareEntitlement.self,
HomeKitEntitlement.self,
HealthKitEntitlement.self,
]
@@ -156,21 +155,6 @@ public struct WirelessAccessoryEntitlement: Entitlement, RawRepresentable {
public init(rawValue: Bool) { self.rawValue = rawValue }
}
public struct WiFiAwareEntitlement: Entitlement, RawRepresentable {
public static let identifier = "com.apple.developer.wifi-aware"
public var rawValue: [String]
public init(rawValue: [String]) { self.rawValue = rawValue }
public init(from decoder: Decoder) throws {
rawValue = try decoder.singleValueContainer().decode([String].self)
}
public func encode(to encoder: Encoder) throws {
var container = encoder.singleValueContainer()
try container.encode(rawValue)
}
}
public struct HomeKitEntitlement: Entitlement, RawRepresentable {
public static let identifier = "com.apple.developer.homekit"
+1 -1
View File
@@ -9,7 +9,7 @@
import Foundation
import Crypto
import X509
import CryptoExtras
import _CryptoExtras
public struct PrivateKey: Codable, Sendable {
// pem encoded
+1 -10
View File
@@ -76,12 +76,6 @@ struct AuthOperation {
}
private func logInWithPassword() async throws -> AuthToken {
print("""
Heads up:
This works by emulating a Pixel phone/Windows PC to interact with Apple services;
consider using a secondary Apple ID. Credentials are only ever sent to Apple.
""")
let username = try await Console.promptRequired("Apple ID: ", existing: username)
let password: String
@@ -117,15 +111,12 @@ struct AuthOperation {
}
)
@Dependency(\.anisetteDataProvider) var anisetteProvider
return AuthToken.xcode(.init(
appleID: username,
adsid: token.adsid,
token: token.token,
expiry: token.expiry,
teamID: team.id.rawValue,
anisetteProviderID: anisetteProvider.providerID
teamID: team.id.rawValue
))
}
}
+1 -13
View File
@@ -9,7 +9,6 @@ enum AuthToken: Codable, CustomStringConvertible {
var token: String
var expiry: Date
var teamID: String
var anisetteProviderID: String?
}
struct AppStoreConnect: Codable {
@@ -59,18 +58,7 @@ extension AuthToken {
guard let data = try storage.data(forKey: "XTLAuthToken") else {
return nil
}
let decoded = try decoder.decode(AuthToken.self, from: data)
switch decoded {
case .xcode(let xcode):
@Dependency(\.anisetteDataProvider) var anisetteProvider
guard xcode.anisetteProviderID == anisetteProvider.providerID else {
try? clear()
return nil
}
case .appStoreConnect:
break
}
return decoded
return try decoder.decode(AuthToken.self, from: data)
}
static func clear() throws {
@@ -22,7 +22,7 @@ struct DSTeamsListCommand: AsyncParsableCommand {
func run() async throws {
let token = try AuthToken.saved()
guard case let .xcode(authData) = token.authData() else {
guard case let .xcode(authData) = try token.authData() else {
throw Console.Error("This command requires password-based authentication")
}
let client = DeveloperServicesClient(authData: authData)
-32
View File
@@ -1,32 +0,0 @@
import ArgumentParser
import Foundation
import XKit
import PackLib
import Subprocess
struct DevBSPCommand: AsyncParsableCommand {
static let configuration = CommandConfiguration(
commandName: "build-server",
abstract: "Run build server",
)
@Option
var triple: String?
func run() async throws {
guard try await SwiftVersion.current.supportsSwiftBuild else {
throw Console.Error("`xtool dev build-server` requires Swift 6.4 or later")
}
let settings = try await BuildSettings(
configuration: .debug,
triple: triple ?? PackOperation.defaultTriple
)
try await Subprocess.run(
settings.buildServerInvocation(),
input: .currentStandardInput,
output: .currentStandardOutput,
error: .currentStandardError,
)
.checkSuccess()
}
}
+5 -17
View File
@@ -27,17 +27,6 @@ struct PackOperation {
@discardableResult
func run() async throws -> URL {
// TODO: support running inside a child directory
let contents = try FileManager.default.contentsOfDirectory(atPath: ".")
guard contents.contains("Package.swift")
|| contents.contains(where: { $0.hasPrefix("Package@") && $0.hasSuffix(".swift") })
else {
throw Console.Error("Could not find Package.swift in this directory.")
}
try await EnsureSDKOperation(quiet: true).run()
print("Planning...")
let schema: PackSchema
@@ -52,8 +41,6 @@ struct PackOperation {
""")
}
await LSPConfig.tryEnsure(using: schema)
let buildSettings = try await BuildSettings(
configuration: buildOptions.configuration,
triple: triple ?? Self.defaultTriple,
@@ -66,9 +53,11 @@ struct PackOperation {
)
let plan = try await planner.createPlan()
#if os(macOS)
if xcode {
return try await XcodePacker(plan: plan).createProject()
}
#endif
let packer = Packer(
buildSettings: buildSettings,
@@ -107,12 +96,12 @@ struct PackOperation {
struct DevXcodeCommand: AsyncParsableCommand {
static let configuration = CommandConfiguration(
commandName: "generate-xcode-project",
abstract: "Generate Xcode project"
abstract: "Generate Xcode project",
discussion: "This option does nothing on Linux"
)
func run() async throws {
let result = try await PackOperation(xcode: true).run()
print("Wrote to \(result.path)")
try await PackOperation(xcode: true).run()
}
}
@@ -285,7 +274,6 @@ struct DevCommand: AsyncParsableCommand {
DevXcodeCommand.self,
DevBuildCommand.self,
DevRunCommand.self,
DevBSPCommand.self,
],
defaultSubcommand: DevRunCommand.self
)
-90
View File
@@ -1,90 +0,0 @@
import Foundation
import PackLib
enum LSPConfig {
static let bsp: (String, String) = (
".bsp/xtool.json",
"""
{
"name": "xtool",
"version": "1.0",
"bspVersion": "2.2.0",
"languages": ["c", "cpp", "objective-c", "objective-cpp", "swift"],
"argv": ["/usr/bin/env", "xtool", "dev", "build-server"]
}
"""
)
static let legacyLSP: (String, String) = (
".sourcekit-lsp/config.json",
"""
{
"swiftPM": {
"swiftSDK": "arm64-apple-ios"
}
}
"""
)
nonisolated(nonsending) static func tryEnsure(
using schema: PackSchema,
quiet: Bool = false,
currentDirectory directory: URL = URL(filePath: FileManager.default.currentDirectoryPath)
) async {
do {
try await ensure(using: schema, quiet: quiet, currentDirectory: directory)
} catch {
print("warning: failed to validate LSP configuration: \(error)")
}
}
nonisolated(nonsending) static func ensure(
using schema: PackSchema,
quiet: Bool = false,
currentDirectory directory: URL = URL(filePath: FileManager.default.currentDirectoryPath)
) async throws {
if schema.skipLSP == true {
return
}
if try await SwiftVersion.current.supportsSwiftBuild {
try await ensure(primary: bsp, secondary: legacyLSP, quiet: quiet, currentDirectory: directory)
} else {
try await ensure(primary: legacyLSP, secondary: bsp, quiet: quiet, currentDirectory: directory)
}
}
// creates the primary LSP-support file if it doesn't exist, and cleans up old files
private nonisolated(nonsending) static func ensure(
primary: (String, String),
secondary: (String, String),
quiet: Bool,
currentDirectory directory: URL
) async throws {
let primaryURL = directory.appendingPathComponent(primary.0)
if FileManager.default.fileExists(atPath: primaryURL.path) {
return
}
try? FileManager.default.createDirectory(
at: primaryURL.deletingLastPathComponent(),
withIntermediateDirectories: true
)
try Data((primary.1 + "\n").utf8).write(to: primaryURL)
let secondaryURL = directory.appendingPathComponent(secondary.0)
if let secondaryData = try? await Data(reading: secondaryURL),
let secondaryString = String(data: secondaryData, encoding: .utf8),
secondaryString.trimmingCharacters(in: .whitespacesAndNewlines) == secondary.1 {
try? FileManager.default.removeItem(at: secondaryURL)
}
if !quiet {
print("""
[LSP] Created \(primary.0) for enhanced IDE support. You may
need to restart your editor for the change to take effect.
You can disable this with `skipLSP: true` in xtool.yml.
""")
}
}
}
+11 -6
View File
@@ -120,6 +120,17 @@ struct NewCommand: AsyncParsableCommand {
"""
),
(
".sourcekit-lsp/config.json",
"""
{
"swiftPM": {
"swiftSDK": "arm64-apple-ios"
}
}
"""
),
(
"Sources/\(moduleName)/\(moduleName)App.swift",
"""
@@ -166,12 +177,6 @@ struct NewCommand: AsyncParsableCommand {
try "\(contents)\n".write(to: url, atomically: true, encoding: .utf8)
}
await LSPConfig.tryEnsure(
using: .default,
quiet: true,
currentDirectory: baseURL,
)
print("\nFinished generating project \(name). Next steps:")
print("- Enter the directory with `cd \(name)`")
print("- Build and run with `xtool dev`")
+50 -387
View File
@@ -5,7 +5,6 @@ import Subprocess
import XKit // HTTPClient, stdoutSafe
import XUtils // System.File{Path,Descriptor}
// swiftlint:disable:next type_body_length
struct SDKBuilder {
enum Arch: String {
case x86_64
@@ -53,51 +52,13 @@ struct SDKBuilder {
}
}
enum Mode {
/// Create a slim SDK with just the files that this version of xtool uses
case buildSlim
/// Create an SDK that retains a full copy of Xcode.app/Contents/Developer.
/// Larger but allows in-place updates.
case buildNormal
/// Update a normal SDK in-place.
case update
var usesHardLinks: Bool {
switch self {
case .buildSlim: false
case .buildNormal, .update: true
}
}
}
let input: Input
let output: URL
let arch: Arch
let mode: Mode
// bump this when the sdk builder logic changes
static let sdkEpoch = 3
// tag from https://github.com/xtool-org/darwin-tools-linux-llvm
static let darwinToolsVersion = "1.1.0"
// tag from https://github.com/xtool-org/OpenAppleMacros
static let oamVersion = "1.3.0"
static let oamLibraries: [String] = [
"FoundationModelsMacros",
"PreviewsMacros",
"SwiftUIMacros",
]
static var currentSDKVersion: String {
"""
epoch=\(sdkEpoch),darwinTools=\(darwinToolsVersion),oam=\(oamVersion)
"""
}
// swiftlint:disable:next function_body_length
func buildSDK() async throws {
let sdkVersion = Self.currentSDKVersion
// TODO: store relevant info for staleness check
let sdkVersion = "develop"
try? FileManager.default.removeItem(at: output)
try FileManager.default.createDirectory(
@@ -105,11 +66,9 @@ struct SDKBuilder {
withIntermediateDirectories: true
)
// TODO: parallelize these three steps
// TODO: parallelize these two steps
// we need to synchronize progress reporting though
try await installMacros(in: output)
try await installToolset(in: output)
let dev = try await installDeveloper(in: output)
@@ -177,9 +136,6 @@ struct SDKBuilder {
"linker": {
"path": "ld64.lld"
},
"librarian": {
"path": "llvm-lib"
},
"swiftCompiler": {
"extraCLIOptions": [
"-Xfrontend", "-enable-cross-import-overlays",
@@ -193,26 +149,6 @@ struct SDKBuilder {
encoding: .utf8
)
// this toolset works with the swiftbuild system on Linux
// note that we need Swift 6.4+ because 6.3 has bugs in
// resolving the librarian and linker paths.
try """
{
"schemaVersion": "1.0",
"rootPath": "toolset/bin",
"linker": {
"path": "ld64.lld"
},
"librarian": {
"path": "llvm-lib"
}
}
""".write(
to: output.appendingPathComponent("toolset-swb.json"),
atomically: false,
encoding: .utf8
)
let sdkDefinition = SDKDefinition(
schemaVersion: "4.0",
targetTriples: [
@@ -233,8 +169,10 @@ struct SDKBuilder {
.write(to: output.appendingPathComponent("darwin-sdk-version.txt"))
}
// swiftlint:disable:next function_body_length
private func installToolset(in output: URL) async throws {
// tag from https://github.com/xtool-org/darwin-tools-linux-llvm
let darwinToolsVersion = "1.0.1"
let toolsetDir = output.appendingPathComponent("toolset")
try FileManager.default.createDirectory(
@@ -245,7 +183,7 @@ struct SDKBuilder {
@Dependency(\.httpClient) var httpClient
let url = URL(string: """
https://github.com/xtool-org/darwin-tools-linux-llvm/releases/download/\
v\(Self.darwinToolsVersion)/toolset-\(arch.rawValue).tar.gz
v\(darwinToolsVersion)/toolset-\(arch.rawValue).tar.gz
""")!
let (response, body) = try await httpClient.send(HTTPRequest(url: url))
guard response.status == 200, let body else { throw Console.Error("Could not fetch toolset") }
@@ -280,170 +218,29 @@ struct SDKBuilder {
try await execution.standardInputWriter.finish()
}
.checkSuccess()
// swift-build assumes we have an Apple-flavored librarian for Apple platforms
// (https://github.com/swiftlang/swift-build/blob/b2433e74e/Sources/SWBCore/SpecImplementations/Tools/LinkerTools.swift#L1735)
// but allows us to override this assumption if we explicitly provide the name llvm-lib (look a few lines above in that file)
try FileManager.default.moveItem(
at: toolsetDir.appending(path: "bin/libtool"),
to: toolsetDir.appending(path: "bin/llvm-lib")
)
let ld64 = toolsetDir.appending(path: "bin/ld64.lld")
let origBins = toolsetDir.appending(path: "bin/orig")
let origLD64 = origBins.appending(path: "ld64.lld")
try FileManager.default.createDirectory(at: origBins, withIntermediateDirectories: false)
try FileManager.default.moveItem(at: ld64, to: origLD64)
// this terrible hack works around the fact that lld doesn't support the -r option,
// which merges multiple object files into one (used by SPM's SWB backend to combine
// per-file MachOs into a single one for the module, on Darwin).
//
// so instead, we write a trampoline that intercepts `ld64.lld -r` and instead runs
// libtool to build a static archive.
try """
#!/bin/sh
set -eu
case "$0" in
*/*) script_path="$0" ;;
*) script_path="$(command -v "$0")" ;;
esac
case "$script_path" in
/*) script_dir="${script_path%/*}"; [ -n "$script_dir" ] || script_dir="/" ;;
*/*) script_dir="${script_path%/*}" ;;
*) script_dir="." ;;
esac
bin_dir="$(CDPATH= cd -P "$script_dir" && pwd -P)"
find_argument_value() {
argument_name="$1"
shift
while [ "$#" -gt 0 ]; do
if [ "$1" = "$argument_name" ]; then
shift
if [ "$#" -gt 0 ]; then
argument_value="$1"
return 0
fi
return 1
fi
shift
done
return 1
}
relocatable=
for argument do
if [ "$argument" = "-r" ]; then
relocatable=1
fi
done
if [ -n "$relocatable" ]; then
missing_argument=
if find_argument_value -filelist "$@"; then
filelist="$argument_value"
else
missing_argument=1
fi
if find_argument_value -dependency_info "$@"; then
dependency_info="$argument_value"
else
missing_argument=1
fi
if find_argument_value -o "$@"; then
output="$argument_value"
else
missing_argument=1
fi
if [ -n "$missing_argument" ]; then
echo "ld64.lld trampoline could not process arguments." >&2
echo "Please file an issue at https://github.com/xtool-org/xtool/issues" >&2
echo " Arguments: $@" >&2
exit 2
fi
exec "$bin_dir/llvm-lib" -static \
-filelist "$filelist" \
-dependency_info "$dependency_info" \
-o "$output"
fi
exec "$bin_dir/orig/ld64.lld" "$@"
""".write(
to: ld64,
atomically: false,
encoding: .utf8
)
// set -x
try FileManager.default.setAttributes([.posixPermissions: 0o755], ofItemAtPath: ld64.path)
}
private func installMacros(in output: URL) async throws {
@Dependency(\.httpClient) var httpClient
let url = URL(string: """
https://github.com/xtool-org/OpenAppleMacros/releases/download/\
v\(Self.oamVersion)/OpenAppleMacrosServer-\(arch.rawValue)
""")!
let (response, body) = try await httpClient.send(HTTPRequest(url: url))
guard response.status == 200, let body else { throw Console.Error("Could not fetch toolset") }
let length: Int64? = switch body.length {
case .known(let known): known
case .unknown: nil
}
let outputPath = output.appendingPathComponent("OpenAppleMacrosServer").path
do {
let handle = try FileDescriptor.open(
FilePath(outputPath),
.writeOnly,
options: .create,
permissions: [.ownerReadWriteExecute, .groupReadExecute, .otherReadExecute]
)
defer { try? handle.close() }
var written: Int64 = 0
for try await chunk in body {
try handle.writeAll(chunk)
written += Int64(chunk.count)
if let length {
let progress = Int(Double(written) / Double(length) * 100)
print("\r[Downloading OpenAppleMacros] \(progress)%", terminator: "")
fflush(stdoutSafe)
}
}
}
print()
}
private static let expectedXcodeChildren = ["Info.plist", "version.plist", "Developer"]
// swiftlint:disable:next cyclomatic_complexity function_body_length
private func installDeveloper(in output: URL) async throws -> URL {
let dev = output.appendingPathComponent("Developer")
let expectedAppDir = output.appendingPathComponent("Xcode.app")
let appDir: URL
let cleanupStageDir: URL?
let wanted: Int?
switch (input, mode) {
case (.xip(let inputPath), .buildSlim):
let stage = output.appendingPathComponent("DeveloperStage")
try FileManager.default.createDirectory(at: stage, withIntermediateDirectories: false)
wanted = try await extractXIP(inputPath: inputPath, outDir: stage.path)
switch input {
case .xip(let inputPath):
let devStage = output.appendingPathComponent("DeveloperStage")
try FileManager.default.createDirectory(at: devStage, withIntermediateDirectories: false)
// unxip doesn't like cooperative cancellation atm so shield it.
// if the user does a ^C during unxip, we'll just wait until extraction
// is over before bailing
wanted = try await Task {
try await extractXIP(inputPath: inputPath, outDir: devStage.path)
}.value
try Task.checkCancellation()
let contents = try FileManager.default.contentsOfDirectory(
at: stage,
at: devStage,
includingPropertiesForKeys: nil
)
let apps = contents.filter { $0.pathExtension == "app" }
@@ -455,45 +252,12 @@ struct SDKBuilder {
default:
throw Console.Error("Unrecognized xip layout (multiple apps found)")
}
cleanupStageDir = stage
case (.xip(let inputPath), .buildNormal):
wanted = try await extractXIP(inputPath: inputPath, outDir: output.path)
appDir = expectedAppDir
cleanupStageDir = nil
try cleanUpXcode(appDir)
case (.xip, .update):
throw Console.Error("Can't update with xip input")
case (.app(let appPath), .buildSlim):
cleanupStageDir = devStage
case .app(let appPath):
wanted = nil
appDir = URL(fileURLWithPath: appPath)
wanted = nil
cleanupStageDir = nil
case (.app(let appPath), .update):
appDir = URL(fileURLWithPath: appPath)
wanted = nil
cleanupStageDir = nil
try cleanUpXcode(appDir)
case (.app(let appPath), .buildNormal):
let source = URL(fileURLWithPath: appPath)
let sourceContentsDir = source.appendingPathComponent("Contents")
let expectedContentsDir = expectedAppDir.appendingPathComponent("Contents")
try FileManager.default.createDirectory(at: expectedContentsDir, withIntermediateDirectories: true)
print("[Copying Xcode.app] This might take a minute...")
for child in Self.expectedXcodeChildren {
let expectedFile = expectedContentsDir.appendingPathComponent(child)
let sourceFile = sourceContentsDir.appendingPathComponent(child)
guard FileManager.default.fileExists(atPath: sourceFile.path) else {
throw Console.Error("""
The provided directory at '\(appPath)' does not appear to be a known version of Xcode: \
could not read '\(sourceFile.path)'
""")
}
try await FileManager.default.copyItem(at: sourceFile, to: expectedFile, preserveOwner: false)
}
appDir = expectedAppDir
wanted = nil
cleanupStageDir = nil
}
try Task.checkCancellation()
try FileManager.default.createDirectory(at: dev, withIntermediateDirectories: false)
@@ -516,7 +280,7 @@ struct SDKBuilder {
}
if count % 100 == 0 {
if wanted == nil {
print("\r[Installing SDKs] Installed \(count) files", terminator: "")
print("\r[Installing SDKs] Copied \(count) files", terminator: "")
fflush(stdoutSafe)
}
await Task.yield()
@@ -529,11 +293,7 @@ struct SDKBuilder {
if try child.resourceValues(forKeys: [.isDirectoryKey]).isDirectory == true {
toDoDirs.append(path)
try FileManager.default.createDirectory(at: dest, withIntermediateDirectories: false)
} else if mode.usesHardLinks {
// Installed SDKs retain Xcode.app developer dir, so avoid storing their developer files twice.
try FileManager.default.linkItem(at: child, to: dest)
} else {
// Slim SDKs omit Xcode.app and contain independent copies.
try FileManager.default.copyItem(at: child, to: dest)
}
}
@@ -545,92 +305,51 @@ struct SDKBuilder {
}
print()
print("[Cleaning up]")
if let cleanupStageDir {
print("[Cleaning up]")
try FileManager.default.removeItem(at: cleanupStageDir)
try? FileManager.default.removeItem(at: cleanupStageDir)
}
print("[Finalizing SDKs]")
/*
XCTest and Testing.framework are located in *.platform/Developer/{Library/Frameworks,usr/lib} rather than inside
the SDK. These search paths are explicitly included when building tests, which presumably ensures that normal
applications don't accidentally link against them in production.
SwiftPM makes no such affordances outside of macOS, so we add the usr/lib path as include/library search paths
in the SDK config, and symlink the frameworks into the SDKs (since there's no frameworkSearchPaths option).
While this drops a safeguard it's better than not having the testing libs at all.
*/
for platform in ["iPhoneOS", "MacOSX", "iPhoneSimulator"] {
let lib = "../../../../../Library"
let platformDir = dev.appending(path: "Platforms/\(platform).platform")
try patchPlatformManifest(path: platformDir.appending(path: "Info.plist"))
/*
XCTest and Testing.framework are located in *.platform/Developer/{Library/Frameworks,usr/lib} rather than inside
the SDK. These search paths are explicitly included when building tests, which presumably ensures that normal
applications don't accidentally link against them in production.
SwiftPM makes no such affordances outside of macOS, so we add the usr/lib path as include/library search paths
in the SDK config, and symlink the frameworks into the SDKs (since there's no frameworkSearchPaths option).
While this drops a safeguard it's better than not having the testing libs at all.
*/
let fwk = platformDir.appending(path: "Developer/SDKs/\(platform).sdk/System/Library/Frameworks").path
let dest = dev.appendingPathComponent("""
Platforms/\(platform).platform/Developer/SDKs/\(platform).sdk\
/System/Library/Frameworks
""").path
try FileManager.default.createSymbolicLink(
atPath: "\(fwk)/Testing.framework",
atPath: "\(dest)/Testing.framework",
withDestinationPath: "\(lib)/Frameworks/Testing.framework"
)
try FileManager.default.createSymbolicLink(
atPath: "\(fwk)/XCTest.framework",
atPath: "\(dest)/XCTest.framework",
withDestinationPath: "\(lib)/Frameworks/XCTest.framework"
)
try FileManager.default.createSymbolicLink(
atPath: "\(fwk)/XCUIAutomation.framework",
atPath: "\(dest)/XCUIAutomation.framework",
withDestinationPath: "\(lib)/Frameworks/XCUIAutomation.framework"
)
try FileManager.default.createSymbolicLink(
atPath: "\(fwk)/XCTestCore.framework",
atPath: "\(dest)/XCTestCore.framework",
withDestinationPath: "\(lib)/PrivateFrameworks/XCTestCore.framework"
)
/*
Apply patches to load OpenAppleMacros as the swift-plugin-server
*/
let bin = platformDir.appendingPathComponent("Developer/usr/bin")
let pluginServer = bin.appendingPathComponent("swift-plugin-server")
try? FileManager.default.createDirectory(at: bin, withIntermediateDirectories: true)
try? FileManager.default.removeItem(at: pluginServer)
try FileManager.default.createSymbolicLink(
atPath: pluginServer.path,
withDestinationPath: "../../../../../../OpenAppleMacrosServer"
)
let hostDir = platformDir.appendingPathComponent("Developer/usr/lib/swift/host")
let pluginsDir = hostDir.appendingPathComponent("plugins")
if platform == "iPhoneSimulator" {
// The iPhoneSimulator platform doesn't contain plugins; Xcode seems to be hardcoded
// to look at the ones from iPhoneOS.platform. We can symlink the iPhoneOS ones too.
try? FileManager.default.createDirectory(at: hostDir, withIntermediateDirectories: true)
try? FileManager.default.removeItem(at: pluginsDir)
try FileManager.default.createSymbolicLink(
atPath: pluginsDir.path,
withDestinationPath: "../../../../../../iPhoneOS.platform/Developer/usr/lib/swift/host/plugins"
)
} else {
try? FileManager.default.removeItem(at: pluginsDir)
try FileManager.default.createDirectory(at: pluginsDir, withIntermediateDirectories: true)
// create a lib*.so file for each macro 'library' that we support.
// the files are stubs (empty) because we just need them to convince swiftc that
// yes we can handle said modules. the actual logic lives in the OpenAppleMacros
// server.
for library in Self.oamLibraries {
let target = pluginsDir.appendingPathComponent("lib\(library).so")
try Data().write(to: target)
}
}
}
// we copy over the host's clang resorurce dir during install, because intrinsics can differ
// by LLVM version
try FileManager.default.removeItem(
at: dev.appending(path: "Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/clang/include")
)
@@ -638,62 +357,9 @@ struct SDKBuilder {
return dev
}
/// Removes unneeded files from a copy of Xcode.app that's owned by xtool.
///
/// This is conservative: we keep anything that we expect _might_ be necessary
/// even in a future update of xtool, so that SDK self-updates work. We only
/// delete files that we're relatively confident won't be needed.
///
/// - Important: ONLY call this if we own appDir, lest we delete files from the user's Xcode.
private func cleanUpXcode(_ appDir: URL) throws {
let contentsDir = appDir.appendingPathComponent("Contents")
let contents = try FileManager.default.contentsOfDirectory(
at: contentsDir,
includingPropertiesForKeys: nil
)
let expectedChildren = Set(Self.expectedXcodeChildren)
let missingChildren = expectedChildren.subtracting(contents.map(\.lastPathComponent))
guard missingChildren.isEmpty else {
let missing = missingChildren.sorted().joined(separator: ", ")
throw Console.Error("Unrecognized xip layout: missing \(missing)")
}
for child in contents where !expectedChildren.contains(child.lastPathComponent) {
try FileManager.default.removeItem(at: child)
}
}
private func extractXIP(inputPath: String, outDir: String) async throws -> Int {
// unxip doesn't like cooperative cancellation atm so shield it.
// if the user does a ^C during unxip, we'll just wait until extraction
// is over before bailing
try await Task {
try await _extractXIP(inputPath: inputPath, outDir: outDir)
}.value
}
private func patchPlatformManifest(path: URL) throws {
let data = try Data(contentsOf: path)
guard var plist = try PropertyListSerialization.propertyList(from: data, options: [], format: nil) as? [String: Any] else {
throw Console.Error("Could not read '\(path.path)'")
}
var defaultProperties = (plist["DefaultProperties"] as? [String: Any]) ?? [:]
defaultProperties["SWIFT_RESOURCE_DIR"] = "$(PLATFORM_DIR)/../../Toolchains/XcodeDefault.xctoolchain/usr/lib/swift"
defaultProperties["CLANG_RESOURCE_DIR"] = "$(SWIFT_RESOURCE_DIR)/clang"
defaultProperties["ALTERNATE_LINKER"] = "lld"
// stub out codesign as /bin/true (SwiftBuild often emits CodeSign tasks, e.g. when
// building for sim). we sign post-build.
defaultProperties["CODESIGN"] = "true"
plist["DefaultProperties"] = defaultProperties
let newData = try PropertyListSerialization.data(fromPropertyList: plist, format: .xml, options: 0)
// a non-atomic write would modify the shared inode that's hard-linked from Xcode.app
try newData.write(to: path, options: .atomic)
}
// returns the number of files we actually want to keep,
// useful for computing progress % during fs traversal
private func _extractXIP(inputPath: String, outDir: String) async throws -> Int {
private func extractXIP(inputPath: String, outDir: String) async throws -> Int {
let fd = try FileDescriptor.open(inputPath, .readOnly)
defer { try? fd.close() }
@@ -834,16 +500,13 @@ struct SDKEntry {
E("clang"),
]),
E("Platforms", ["iPhoneOS", "MacOSX", "iPhoneSimulator"].map {
E("\($0).platform", [
E("Info.plist"),
E("Developer", [
E("SDKs"),
E("Library", [
E("Frameworks"),
E("PrivateFrameworks"),
]),
E("usr/lib"),
])
E("\($0).platform/Developer", [
E("SDKs"),
E("Library", [
E("Frameworks"),
E("PrivateFrameworks"),
]),
E("usr/lib"),
])
}),
])
+131 -129
View File
@@ -1,5 +1,6 @@
import Foundation
import XKit
import Version
import ArgumentParser
import Dependencies
import PackLib
@@ -12,7 +13,6 @@ struct SDKCommand: AsyncParsableCommand {
abstract: "Manage the Darwin Swift SDK",
subcommands: [
DevSDKInstallCommand.self,
DevSDKUpdateCommand.self,
DevSDKRemoveCommand.self,
DevSDKBuildCommand.self,
DevSDKStatusCommand.self,
@@ -49,7 +49,7 @@ struct DevSDKBuildCommand: AsyncParsableCommand {
let builderArch = try arch.sdkBuilderArch
let input = try SDKBuilder.Input(path: path)
let output = URL(fileURLWithPath: outputDir, isDirectory: true).appending(path: "darwin.xtoolsdk")
let builder = SDKBuilder(input: input, output: output, arch: builderArch, mode: .buildSlim)
let builder = SDKBuilder(input: input, output: output, arch: builderArch)
try await builder.buildSDK()
print("Built SDK at \(output.path). You can install it with `xtool sdk install`.")
}
@@ -90,24 +90,8 @@ struct DevSDKInstallCommand: AsyncParsableCommand {
)
var path: String
@Flag(
help: "Install a slim SDK (uses less disk space). Slim SDKs cannot be updated in place."
)
var slim = false
func run() async throws {
try await InstallSDKOperation(path: path, slim: slim).run()
}
}
struct DevSDKUpdateCommand: AsyncParsableCommand {
static let configuration = CommandConfiguration(
commandName: "update",
abstract: "Update the installed Darwin Swift SDK"
)
func run() async throws {
try await UpdateSDKOperation().run()
try await InstallSDKOperation(path: path).run()
}
}
@@ -118,7 +102,7 @@ struct DevSDKRemoveCommand: AsyncParsableCommand {
)
func run() async throws {
guard let sdk = try DarwinSDK.current() else {
guard let sdk = try await DarwinSDK.current() else {
throw Console.Error("Cannot remove SDK: no Darwin SDK installed")
}
try sdk.remove()
@@ -133,154 +117,172 @@ struct DevSDKStatusCommand: AsyncParsableCommand {
)
func run() async throws {
if let sdk = try DarwinSDK.current() {
print("Darwin SDK is installed")
print(" Path: \(sdk.bundle.path)")
print(" Flavor: \(sdk.flavor)")
print(" Version: \(sdk.version)")
if let sdk = try await DarwinSDK.current() {
print("Installed at \(sdk.bundle.path)")
} else {
print("Not installed")
}
}
}
extension DarwinSDK {
struct DarwinSDK {
let bundle: URL
let version: String
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"].contains(bundle.lastPathComponent) {
self.version = "unknown"
} else {
return nil
}
}
static func install(from path: String) async throws {
// we can't just move into ~/.swiftpm/swift-sdks because the swiftpm directory
// location depends on factors like $XDG_CONFIG_HOME. Rather than replicating
// SwiftPM's logic, which may change, it's more reliable to directly invoke
// `swift sdk install`. See: https://github.com/xtool-org/xtool/pull/40
let url = URL(fileURLWithPath: path)
guard DarwinSDK(bundle: url) != nil else { throw Console.Error("Invalid Darwin SDK at '\(path)'")}
try await addHostClangResourceDir(to: url)
try await Subprocess.run(
.name("swift"),
arguments: ["sdk", "install", url.path],
output: .discarded
)
.checkSuccess()
}
private static func addHostClangResourceDir(to sdk: URL) async throws {
let clangURL = try await ToolRegistry.locate("clang")
let process = try await Subprocess.run(
.path(FilePath(clangURL.path)),
arguments: ["-print-resource-dir"],
output: .string(limit: .max)
).checkSuccess()
let output = process.standardOutput ?? ""
let hostClangResources = URL(filePath: output.trimmingCharacters(in: .whitespacesAndNewlines))
let hostInclude = hostClangResources.appending(path: "include")
let sdkInclude = sdk.appending(path: "Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/clang/include")
try FileManager.default.copyItem(at: hostInclude, to: sdkInclude)
}
static func current() async throws -> DarwinSDK? {
let outputString: String
do {
outputString = try await Subprocess.run(
.name("swift"),
arguments: ["sdk", "configure", "darwin", "arm64-apple-ios", "--show-configuration"],
output: .string(limit: .max)
)
.checkSuccess()
.standardOutput
?? ""
} catch SubprocessFailure.exited {
return nil
}
// should be something like
// swiftResourcesPath: /home/user/.swiftpm/swift-sdks/darwin.artifactbundle/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift
// swiftlint:disable:previous line_length
let resourcesPathPrefix = "swiftResourcesPath: "
guard let resourcesPath = outputString
.split(separator: "\n")
.first(where: { $0.hasPrefix(resourcesPathPrefix) })?
.dropFirst(resourcesPathPrefix.count)
else { return nil }
var resourcesURL = URL(fileURLWithPath: String(resourcesPath))
for _ in 0..<6 {
resourcesURL = resourcesURL.deletingLastPathComponent()
}
return DarwinSDK(bundle: resourcesURL)
}
func isUpToDate() -> Bool {
version == SDKBuilder.currentSDKVersion
true
}
func remove() throws {
try FileManager.default.removeItem(at: bundle)
}
}
struct EnsureSDKOperation {
let quiet: Bool
func run() async throws {
#if os(macOS)
if !quiet {
print("Skipping Darwin SDK setup since we're on macOS.")
private enum SwiftVersion {}
extension SwiftVersion {
static func current() async throws -> Version {
let outputString: String?
do {
outputString = try await Subprocess.run(
.name("swift"),
arguments: ["--version"],
output: .string(limit: .max)
)
.checkSuccess()
.standardOutput
} catch {
throw Console.Error("Failed to obtain Swift version")
}
#else
let sdk = try DarwinSDK.current()
switch sdk.map({ ($0.isUpToDate(), $0.flavor) }) {
case (true, _)?: // swiftlint:disable:this optional_enum_case_matching
if !quiet {
print("Darwin SDK is up to date.")
}
case (false, .slim)?: // swiftlint:disable:this optional_enum_case_matching
throw Console.Error("""
Darwin SDK is out of date, and was installed in 'slim' mode.
Slim SDKs take less disk space, but can't be auto-updated.
Please install a new SDK with
xtool sdk install [--slim]
""")
case (false, .normal)?: // swiftlint:disable:this optional_enum_case_matching
print("Darwin SDK is out of date. Rebuilding...")
try await UpdateSDKOperation().run()
case (false, .legacy)?: // swiftlint:disable:this optional_enum_case_matching
print("""
Darwin SDK is incompatible: built with an older version of xtool.
Requesting re-install. This is a one-time rebuild; after this,
xtool will be able to resolve incompatibilities automatically.
""")
try await generateSDK()
case nil:
print("Now generating the Darwin SDK.\n")
try await generateSDK()
var output = outputString?[...] ?? ""
if output.hasPrefix("Apple ") {
output = output.dropFirst("Apple ".count)
}
func generateSDK() async throws {
let path = try await Console.prompt("""
Please download Xcode from http://developer.apple.com/download/all/?q=Xcode
and enter the path to the downloaded Xcode.xip.
Path to Xcode.xip: \("" /* pacify swiftlint trailing_whitespace */)
""")
let expanded = (path as NSString).expandingTildeInPath
try await InstallSDKOperation(path: expanded).run()
guard output.hasPrefix("Swift version ") else {
throw Console.Error("Could not parse Swift version: '\(output)'")
}
#endif
output = output.dropFirst("Swift version ".count)
guard let space = output.firstIndex(of: " ") else {
throw Console.Error("Could not parse Swift version: '\(output)'")
}
output = output[..<space]
guard let version = Version(tolerant: output) else {
throw Console.Error("Could not parse Swift version: '\(output)'")
}
return version
}
}
struct InstallSDKOperation {
let path: String
let slim: Bool
init(path: String, slim: Bool = false) {
self.path = path
self.slim = slim
}
func run() async throws {
#if os(macOS)
print("Skipping SDK install; the iOS SDK ships with Xcode on macOS")
#else
let temporaryBundle = try DarwinSDK.prepareTemporaryBundle()
let tempDir = try TemporaryDirectory(name: "DarwinSDKBuild")
let sdkPath = tempDir.url.appending(path: "darwin.artifactbundle")
if path.hasSuffix(".xtoolsdk") {
print("Installing prebuilt SDK...")
try await FileManager.default.copyItem(at: URL(filePath: path), to: temporaryBundle.url, preserveOwner: false)
try FileManager.default.copyItem(at: URL(filePath: path), to: sdkPath)
} else {
// validate input before removing existing SDK
let input = try SDKBuilder.Input(path: path)
let arch = try ArchSelection.auto.sdkBuilderArch
let mode: SDKBuilder.Mode = slim ? .buildSlim : .buildNormal
let builder = SDKBuilder(input: input, output: temporaryBundle.url, arch: arch, mode: mode)
let builder = SDKBuilder(input: input, output: sdkPath, arch: arch)
try await builder.buildSDK()
}
if let sdk = try DarwinSDK.current() {
if let sdk = try await DarwinSDK.current() {
print("Removing existing SDK...")
try sdk.remove()
}
try await temporaryBundle.install()
#endif
}
}
struct UpdateSDKOperation {
func run() async throws {
#if os(macOS)
print("Skipping SDK install; the iOS SDK ships with Xcode on macOS")
#else
guard let existing = try DarwinSDK.current() else {
throw Console.Error("Could not locate existing SDK; cannot perform update.")
}
let xcode = existing.bundle.appendingPathComponent("Xcode.app")
guard xcode.dirExists else {
// This includes prebuilt .xtoolsdk installs and installs created with --slim.
throw Console.Error("""
The installed SDK was built in 'slim' mode and cannot be updated in place. \
Please install a new copy with `xtool sdk install`.
""")
}
let input = try SDKBuilder.Input(path: xcode.path)
let arch = try ArchSelection.auto.sdkBuilderArch
let temporaryBundle = try DarwinSDK.prepareTemporaryBundle()
let builder = SDKBuilder(input: input, output: temporaryBundle.url, arch: arch, mode: .update)
try await builder.buildSDK()
guard DarwinSDK(bundle: temporaryBundle.url) != nil else {
throw Console.Error("Invalid Darwin SDK at '\(temporaryBundle.url.path)'")
}
try FileManager.default.moveItem(
at: xcode,
to: temporaryBundle.url.appendingPathComponent("Xcode.app")
)
try existing.remove()
try await temporaryBundle.install()
print("Updated SDK")
try await DarwinSDK.install(from: sdkPath.path)
// don't destroy tempDir before this point
withExtendedLifetime(tempDir) {}
#endif
}
}
+31 -2
View File
@@ -1,7 +1,6 @@
import ArgumentParser
import Foundation
import XKit
import PackLib
struct SetupCommand: AsyncParsableCommand {
static let configuration = CommandConfiguration(
@@ -24,6 +23,36 @@ struct SetupOperation {
func run() async throws {
try await AuthOperation(logoutFromExisting: false, quiet: quiet).run()
try await EnsureSDKOperation(quiet: quiet).run()
#if os(macOS)
if !quiet {
print("Skipping Darwin SDK setup since we're on macOS.")
}
#else
switch try await DarwinSDK.current()?.isUpToDate() {
case true?:
if !quiet {
print("Darwin SDK is up to date.")
}
case false?:
if !quiet {
print("Darwin SDK is outdated.")
}
fallthrough
case nil:
let path = try await Console.prompt("""
Now generating the Darwin SDK.
Please download Xcode from http://developer.apple.com/download/all/?q=Xcode
and enter the path to the downloaded Xcode.xip.
Path to Xcode.xip: \("" /* pacify swiftlint trailing_whitespace */)
""")
let expanded = (path as NSString).expandingTildeInPath
try await InstallSDKOperation(path: expanded).run()
}
#endif
}
}
-34
View File
@@ -1,7 +1,4 @@
import Foundation
#if canImport(Subprocess)
import Subprocess
#endif
extension Data {
// AsyncBytes is Darwin-only :/
@@ -23,37 +20,6 @@ extension Data {
}
}
extension FileManager {
/// Like `copyItem(at:to:)` but allows opting out of preserving the owner
package func copyItem(
at srcURL: URL,
to dstURL: URL,
preserveOwner: Bool,
) async throws {
// why this is needed: https://github.com/xtool-org/xtool/issues/254
#if canImport(Subprocess)
if !preserveOwner {
let result = try await Subprocess.run(
.name("cp"),
arguments: ["-R", srcURL.path, dstURL.path],
output: .discarded,
error: .string(limit: .max, encoding: UTF8.self),
)
do {
try result.checkSuccess()
} catch {
print("Error copying \(srcURL.path) to \(dstURL.path): \(result.standardError)")
throw error
}
return
}
#endif
try self.copyItem(at: srcURL, to: dstURL)
}
}
package func stderrPrint(_ message: String, terminator: String = "\n") {
try? FileHandle.standardError.write(contentsOf: Data("\(message)\(terminator)".utf8))
}
@@ -1,17 +0,0 @@
import Foundation
private import XcodeProj
extension XCSchema.Project {
public func pbxprojRepresentation(name: String) throws -> Data {
let xcprojData = try self.jsonRepresentation()
let pbxproj = try PBXProj(xcprojData: xcprojData, projectName: name)
// dataRepresentation should never return nil
return try pbxproj.dataRepresentation() ?? Data()
}
public init(pbxprojRepresentation data: Data) throws {
let pbxproj = try PBXProj(data: data)
let xcprojData = try pbxproj.xcprojData()
try self.init(jsonRepresentation: xcprojData)
}
}
-78
View File
@@ -1,78 +0,0 @@
import Foundation
@_exported import XcodeProjectFormat
// This library is a lightweight layer on top of the XcodeProjectFormat
// interface, providing other facilities for working with the Xcode
// project formats.
//
// We currently use XcodeProj under the hood for some functionality, but this
// should be considered an implementation detail.
public struct XcodeProject: Equatable, Sendable {
public enum Format: Sendable {
case pbxproj
case xcproj
}
public var project: XCSchema.Project
public var format: Format
public init(
project: XCSchema.Project,
format: Format = .pbxproj,
) {
self.project = project
self.format = format
}
/// Reads the project from the given `.xcodeproj` path.
public init(url: URL) throws {
guard url.pathExtension == "xcodeproj" else {
throw Errors.notAnXcodeproj(url.path)
}
let xcprojURL = url.appending(path: "project.xcproj")
lazy var pbxprojURL = url.appending(path: "project.pbxproj")
if FileManager.default.fileExists(atPath: xcprojURL.path) {
let data = try Data(contentsOf: xcprojURL)
self.project = try XCSchema.Project(jsonRepresentation: data)
self.format = .xcproj
} else if FileManager.default.fileExists(atPath: pbxprojURL.path) {
let data = try Data(contentsOf: pbxprojURL)
self.project = try XCSchema.Project(pbxprojRepresentation: data)
self.format = .pbxproj
} else {
throw Errors.missingProjectFile(url.path)
}
}
/// Sets the format in which the project should be serialized.
public func withFormat(_ format: Format) -> XcodeProject {
var copy = self
copy.format = format
return copy
}
/// Writes the project to the given `.xcodeproj` path.
public func write(to url: URL) throws {
try? FileManager.default.createDirectory(at: url, withIntermediateDirectories: true)
switch format {
case .pbxproj:
try project
.pbxprojRepresentation(name: url.deletingPathExtension().lastPathComponent)
.write(to: url.appendingPathComponent("project.pbxproj"))
case .xcproj:
try project
.jsonRepresentation()
.write(to: url.appendingPathComponent("project.xcproj"))
}
try XcodeWorkspace(children: [.file(.current)])
.write(to: url.appendingPathComponent("project.xcworkspace"))
}
public enum Errors: Error {
case notAnXcodeproj(String)
case missingProjectFile(String)
}
}
@@ -1,84 +0,0 @@
import Foundation
private import XcodeProj
extension XcodeWorkspace {
public init(url: URL) throws {
let workspace = try XCWorkspace(pathString: url.path)
self.init(workspace.data)
}
public func dataRepresentation() throws -> Data {
try xcWorkspaceData.dataRepresentation() ?? Data()
}
public func write(to url: URL) throws {
try? FileManager.default.createDirectory(at: url, withIntermediateDirectories: true)
try self.dataRepresentation()
.write(to: url.appendingPathComponent("contents.xcworkspacedata"))
}
}
// MARK: - Conversion
extension XcodeWorkspace {
fileprivate init(_ xcWorkspaceData: XCWorkspaceData) {
self.init(children: xcWorkspaceData.children.map { .init(from: $0) })
}
fileprivate var xcWorkspaceData: XCWorkspaceData {
XCWorkspaceData(children: children.map(\.xcWorkspaceDataElement))
}
}
extension XcodeWorkspace.Element {
fileprivate init(from xcWorkspaceDataElement: XCWorkspaceDataElement) {
switch xcWorkspaceDataElement {
case .file(let file):
self = .file(.init(file.location))
case .group(let group):
self = .group(.init(group))
case .fileSystemSynchronizedGroup(let group):
self = .fileSystemSynchronizedGroup(.init(group))
}
}
fileprivate var xcWorkspaceDataElement: XCWorkspaceDataElement {
switch self {
case .file(let location):
.file(.init(location: location.xcWorkspaceLocation))
case .group(let group):
.group(group.xcWorkspaceDataElement)
case .fileSystemSynchronizedGroup(let group):
.fileSystemSynchronizedGroup(group.xcWorkspaceDataElement)
}
}
}
extension XcodeWorkspace.Location {
fileprivate init(_ xcWorkspaceDataElementLocation: XCWorkspaceDataElementLocationType) {
self.base = .init(rawValue: xcWorkspaceDataElementLocation.schema)
self.path = xcWorkspaceDataElementLocation.path
}
fileprivate var xcWorkspaceLocation: XCWorkspaceDataElementLocationType {
.other(base.rawValue, path)
}
}
extension XcodeWorkspace.Group {
fileprivate init(_ xcWorkspaceDataGroup: XCWorkspaceDataGroup) {
self.init(
location: .init(xcWorkspaceDataGroup.location),
name: xcWorkspaceDataGroup.name,
children: xcWorkspaceDataGroup.children.map { .init(from: $0) }
)
}
fileprivate var xcWorkspaceDataElement: XCWorkspaceDataGroup {
.init(
location: self.location.xcWorkspaceLocation,
name: name,
children: children.map(\.xcWorkspaceDataElement)
)
}
}
-103
View File
@@ -1,103 +0,0 @@
import Foundation
public struct XcodeWorkspace: Hashable, Sendable {
public enum Element: Hashable, Sendable {
case file(Location)
case group(Group)
case fileSystemSynchronizedGroup(Group)
public var location: Location {
get {
switch self {
case let .file(location):
location
case let .group(group):
group.location
case let .fileSystemSynchronizedGroup(group):
group.location
}
}
set {
switch self {
case .file:
self = .file(newValue)
case .group(var group):
group.location = newValue
self = .group(group)
case .fileSystemSynchronizedGroup(var group):
group.location = newValue
self = .fileSystemSynchronizedGroup(group)
}
}
}
}
public struct Group: Hashable, Sendable {
public var location: Location
public var name: String?
public var children: [Element]
public init(location: Location, name: String?, children: [Element]) {
self.location = location
self.name = name
self.children = children
}
}
public struct Location: Hashable, Sendable {
public struct Base: Hashable, Sendable, RawRepresentable {
public var rawValue: String
public init(rawValue: String) {
self.rawValue = rawValue
}
}
public var base: Base
public var path: String
public init(base: Base, path: String) {
self.base = base
self.path = path
}
}
public var children: [Element]
public init(children: [Element]) {
self.children = children
}
}
extension XcodeWorkspace.Location.Base {
/// Absolute path
public static let absolute = Self(rawValue: "absolute")
/// Relative to container
public static let container = Self(rawValue: "container")
/// Relative to Developer Directory
public static let developer = Self(rawValue: "developer")
/// Relative to group
public static let group = Self(rawValue: "group")
/// Single project workspace in xcodeproj directory
public static let current = Self(rawValue: "self")
}
extension XcodeWorkspace.Location {
public static var current: Self {
Self(base: .current, path: "")
}
}
extension XcodeWorkspace.Location: LosslessStringConvertible, CustomStringConvertible {
public init?(_ string: String) {
guard let colon = string.firstIndex(of: ":") else {
return nil
}
self.base = Base(rawValue: String(string[..<colon]))
self.path = String(string[colon...].dropFirst())
}
public var description: String {
"\(base.rawValue):\(path)"
}
}
+1 -1
View File
@@ -8,7 +8,7 @@ import Dependencies
enum XToolMain {
static func main() async throws {
prepareDependencies { _ in
// TODO: Improve persistence mechanism
#warning("Improve persistence mechanism")
// for Windows, we could use dpapi.h or wincred.h.
// for Linux, maybe use libsecret?
// see https://github.com/atom/node-keytar
-55
View File
@@ -1,55 +0,0 @@
import Foundation
import Testing
@testable import PackLib
@Test func swiftPMDirectoryUsesXDGConfigHome() throws {
let directory = try DarwinSDK.swiftPMDirectory(
environment: ["XDG_CONFIG_HOME": "/xdg/config"],
homeDirectory: URL(fileURLWithPath: "/home/test")
)
#expect(directory.path == "/xdg/config/swiftpm")
}
@Test func swiftPMDirectoryFallsBackToHomeDirectory() throws {
let directory = try DarwinSDK.swiftPMDirectory(
environment: [:],
homeDirectory: URL(fileURLWithPath: "/home/test")
)
#expect(directory.path == "/home/test/.swiftpm")
}
@Test func swiftPMDirectoryRejectsRelativeXDGConfigHome() {
#expect(throws: StringError.self) {
try DarwinSDK.swiftPMDirectory(
environment: ["XDG_CONFIG_HOME": "relative/config"],
homeDirectory: URL(fileURLWithPath: "/home/test")
)
}
}
@Test func temporaryDarwinSDKBundleUsesSwiftSDKsDirectory() throws {
let configDirectory = FileManager.default.temporaryDirectory
.appendingPathComponent("DarwinSDKTests-\(UUID().uuidString)", isDirectory: true)
defer { try? FileManager.default.removeItem(at: configDirectory) }
let environment = ["XDG_CONFIG_HOME": configDirectory.path]
let sdksDirectory = configDirectory.appending(path: "swiftpm/swift-sdks")
let temporaryURL = sdksDirectory.appendingPathComponent("darwin.artifactbundle.tmp", isDirectory: true)
let installedBundle = sdksDirectory.appending(path: "darwin.artifactbundle")
try FileManager.default.createDirectory(at: installedBundle, withIntermediateDirectories: true)
try FileManager.default.createDirectory(at: temporaryURL, withIntermediateDirectories: false)
do {
let temporaryBundle = try DarwinSDK.prepareTemporaryBundle(environment: environment)
#expect(temporaryBundle.url == temporaryURL)
#expect(!FileManager.default.fileExists(atPath: temporaryURL.path))
try FileManager.default.createDirectory(at: temporaryBundle.url, withIntermediateDirectories: false)
#expect(DarwinSDK(bundle: temporaryBundle.url)?.version == "develop")
}
#expect(!FileManager.default.fileExists(atPath: temporaryURL.path))
#expect(FileManager.default.fileExists(atPath: installedBundle.path))
}

Some files were not shown because too many files have changed in this diff Show More