Compare commits
38 Commits
@@ -0,0 +1,37 @@
|
||||
---
|
||||
name: Bug report
|
||||
about: Report a bug
|
||||
title: ''
|
||||
labels: bug
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
||||
## Description
|
||||
|
||||
A clear and concise description of what the bug is.
|
||||
|
||||
## Environment
|
||||
|
||||
Please provide as much of the following information as is relevant.
|
||||
|
||||
Host OS (macOS/Linux/WSL):
|
||||
|
||||
Host OS version:
|
||||
<!-- macOS: Apple Logo > About this Mac -->
|
||||
<!-- Linux: -->
|
||||
<!-- cat /etc/*-release -->
|
||||
<!-- Windows: -->
|
||||
<!-- Get-WinVer; wsl -l -v -->
|
||||
|
||||
iOS device version:
|
||||
<!-- Settings > General > About > iOS Version -->
|
||||
|
||||
Swift version:
|
||||
<!-- swift --version -->
|
||||
|
||||
SDK version:
|
||||
<!-- macOS: -->
|
||||
<!-- xcodebuild -version; xcrun -sdk iphoneos -show-sdk-version -->
|
||||
<!-- Linux/WSL: -->
|
||||
<!-- swift sdk configure darwin arm64-apple-ios --show-configuration | grep -o 'iPhoneOS[0-9.]*\.sdk$' -->
|
||||
@@ -0,0 +1,10 @@
|
||||
---
|
||||
name: Feature request
|
||||
about: Suggest an idea
|
||||
title: ''
|
||||
labels: enhancement
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ jobs:
|
||||
uses: actions/checkout@v4
|
||||
- name: Build
|
||||
run: |
|
||||
docker compose run --build --rm xtool -c "swift build --product xtool"
|
||||
docker compose run --build --rm xtool swift build --product xtool
|
||||
build-macos:
|
||||
runs-on: macos-15
|
||||
steps:
|
||||
@@ -25,3 +25,15 @@ jobs:
|
||||
- name: Build
|
||||
run: |
|
||||
swift build --product xtool
|
||||
build-ios:
|
||||
runs-on: macos-15
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
- name: Build
|
||||
run: |
|
||||
set -o pipefail \
|
||||
&& xcodebuild build \
|
||||
-skipMacroValidation -skipPackagePluginValidation \
|
||||
-scheme XKit -destination generic/platform=iOS \
|
||||
| xcbeautify
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
on:
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
build:
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
host:
|
||||
- runner: ubuntu-24.04
|
||||
arch: x86_64
|
||||
- runner: ubuntu-24.04-arm
|
||||
arch: aarch64
|
||||
runs-on: ${{ matrix.host.runner }}
|
||||
permissions:
|
||||
contents: write
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
- name: Build
|
||||
run: |
|
||||
docker compose run --build --rm xtool -c "Linux/build.sh && mv Linux/packages/xtool{,-${{ matrix.host.arch }}}.AppImage"
|
||||
- name: Upload artifact
|
||||
id: upload_artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: xtool-${{ matrix.host.arch }}
|
||||
path: Linux/packages/xtool-${{ matrix.host.arch }}.AppImage
|
||||
release:
|
||||
needs: build
|
||||
runs-on: ubuntu-24.04
|
||||
permissions:
|
||||
contents: write
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Download artifact
|
||||
id: download_artifact
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
pattern: xtool-*
|
||||
path: output
|
||||
- name: Create and publish release
|
||||
id: publish_release
|
||||
run: |
|
||||
TAG="${GITHUB_REF##*/}-${GITHUB_SHA:0:7}"
|
||||
gh release create "$TAG" --draft --title "Draft Release"
|
||||
gh release upload "$TAG" output/**/*.AppImage
|
||||
@@ -0,0 +1,77 @@
|
||||
on:
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
build-linux:
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
host:
|
||||
- runner: ubuntu-24.04
|
||||
arch: x86_64
|
||||
- runner: ubuntu-24.04-arm
|
||||
arch: aarch64
|
||||
runs-on: ${{ matrix.host.runner }}
|
||||
permissions:
|
||||
contents: write
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
- name: Build
|
||||
run: |
|
||||
docker compose run --build --rm xtool Linux/build.sh
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: xtool-${{ matrix.host.arch }}
|
||||
path: |
|
||||
Linux/packages/xtool-${{ matrix.host.arch }}.AppImage
|
||||
Linux/packages/xtool-${{ matrix.host.arch }}.AppImage.zsync
|
||||
build-mac:
|
||||
runs-on: macos-15
|
||||
permissions:
|
||||
contents: write
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
- name: Setup Ruby
|
||||
uses: ruby/setup-ruby@v1
|
||||
with:
|
||||
working-directory: macOS
|
||||
bundler-cache: true
|
||||
- name: Build
|
||||
env:
|
||||
APP_STORE_CONNECT_API_KEY_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY_ID }}
|
||||
APP_STORE_CONNECT_API_KEY_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ISSUER_ID }}
|
||||
APP_STORE_CONNECT_API_KEY_KEY: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY }}
|
||||
IDENTITY_P12: ${{ secrets.IDENTITY_P12 }}
|
||||
DEVELOPMENT_TEAM: ${{ secrets.DEVELOPMENT_TEAM }}
|
||||
run: |
|
||||
cd macOS
|
||||
bundle exec fastlane package
|
||||
- name: Upload artifacts
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: xtool-mac
|
||||
path: |
|
||||
macOS/Build/Output/xtool.app.zip
|
||||
macOS/Build/Output/xtool.app.dSYM.zip
|
||||
release:
|
||||
needs: [build-linux, build-mac]
|
||||
runs-on: ubuntu-24.04
|
||||
permissions:
|
||||
contents: write
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Download artifact
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
pattern: xtool-*
|
||||
path: output
|
||||
- name: Create and publish release
|
||||
run: |
|
||||
TAG="${GITHUB_REF##*/}-${GITHUB_SHA:0:7}"
|
||||
gh release create "$TAG" --draft --title "Draft Release"
|
||||
gh release upload "$TAG" output/**/*.{AppImage,AppImage.zsync,app.zip,app.dSYM.zip}
|
||||
@@ -7,8 +7,8 @@ builder:
|
||||
- xtool
|
||||
- scheme: xtool
|
||||
platform: macosXcodebuild
|
||||
# - scheme: xtool
|
||||
# platform: linux
|
||||
# image: # TODO: we need to use our own Docker image for this
|
||||
- scheme: xtool
|
||||
platform: linux
|
||||
image: kabiroberai/xtool-dev:latest
|
||||
- scheme: XKit
|
||||
platform: ios
|
||||
|
||||
@@ -0,0 +1,128 @@
|
||||
# Contributor Covenant Code of Conduct
|
||||
|
||||
## Our Pledge
|
||||
|
||||
We as members, contributors, and leaders pledge to make participation in our
|
||||
community a harassment-free experience for everyone, regardless of age, body
|
||||
size, visible or invisible disability, ethnicity, sex characteristics, gender
|
||||
identity and expression, level of experience, education, socio-economic status,
|
||||
nationality, personal appearance, race, religion, or sexual identity
|
||||
and orientation.
|
||||
|
||||
We pledge to act and interact in ways that contribute to an open, welcoming,
|
||||
diverse, inclusive, and healthy community.
|
||||
|
||||
## Our Standards
|
||||
|
||||
Examples of behavior that contributes to a positive environment for our
|
||||
community include:
|
||||
|
||||
* Demonstrating empathy and kindness toward other people
|
||||
* Being respectful of differing opinions, viewpoints, and experiences
|
||||
* Giving and gracefully accepting constructive feedback
|
||||
* Accepting responsibility and apologizing to those affected by our mistakes,
|
||||
and learning from the experience
|
||||
* Focusing on what is best not just for us as individuals, but for the
|
||||
overall community
|
||||
|
||||
Examples of unacceptable behavior include:
|
||||
|
||||
* The use of sexualized language or imagery, and sexual attention or
|
||||
advances of any kind
|
||||
* Trolling, insulting or derogatory comments, and personal or political attacks
|
||||
* Public or private harassment
|
||||
* Publishing others' private information, such as a physical or email
|
||||
address, without their explicit permission
|
||||
* Other conduct which could reasonably be considered inappropriate in a
|
||||
professional setting
|
||||
|
||||
## Enforcement Responsibilities
|
||||
|
||||
Community leaders are responsible for clarifying and enforcing our standards of
|
||||
acceptable behavior and will take appropriate and fair corrective action in
|
||||
response to any behavior that they deem inappropriate, threatening, offensive,
|
||||
or harmful.
|
||||
|
||||
Community leaders have the right and responsibility to remove, edit, or reject
|
||||
comments, commits, code, wiki edits, issues, and other contributions that are
|
||||
not aligned to this Code of Conduct, and will communicate reasons for moderation
|
||||
decisions when appropriate.
|
||||
|
||||
## Scope
|
||||
|
||||
This Code of Conduct applies within all community spaces, and also applies when
|
||||
an individual is officially representing the community in public spaces.
|
||||
Examples of representing our community include using an official e-mail address,
|
||||
posting via an official social media account, or acting as an appointed
|
||||
representative at an online or offline event.
|
||||
|
||||
## Enforcement
|
||||
|
||||
Instances of abusive, harassing, or otherwise unacceptable behavior may be
|
||||
reported to the community leaders responsible for enforcement at
|
||||
conduct@xtool.sh.
|
||||
All complaints will be reviewed and investigated promptly and fairly.
|
||||
|
||||
All community leaders are obligated to respect the privacy and security of the
|
||||
reporter of any incident.
|
||||
|
||||
## Enforcement Guidelines
|
||||
|
||||
Community leaders will follow these Community Impact Guidelines in determining
|
||||
the consequences for any action they deem in violation of this Code of Conduct:
|
||||
|
||||
### 1. Correction
|
||||
|
||||
**Community Impact**: Use of inappropriate language or other behavior deemed
|
||||
unprofessional or unwelcome in the community.
|
||||
|
||||
**Consequence**: A private, written warning from community leaders, providing
|
||||
clarity around the nature of the violation and an explanation of why the
|
||||
behavior was inappropriate. A public apology may be requested.
|
||||
|
||||
### 2. Warning
|
||||
|
||||
**Community Impact**: A violation through a single incident or series
|
||||
of actions.
|
||||
|
||||
**Consequence**: A warning with consequences for continued behavior. No
|
||||
interaction with the people involved, including unsolicited interaction with
|
||||
those enforcing the Code of Conduct, for a specified period of time. This
|
||||
includes avoiding interactions in community spaces as well as external channels
|
||||
like social media. Violating these terms may lead to a temporary or
|
||||
permanent ban.
|
||||
|
||||
### 3. Temporary Ban
|
||||
|
||||
**Community Impact**: A serious violation of community standards, including
|
||||
sustained inappropriate behavior.
|
||||
|
||||
**Consequence**: A temporary ban from any sort of interaction or public
|
||||
communication with the community for a specified period of time. No public or
|
||||
private interaction with the people involved, including unsolicited interaction
|
||||
with those enforcing the Code of Conduct, is allowed during this period.
|
||||
Violating these terms may lead to a permanent ban.
|
||||
|
||||
### 4. Permanent Ban
|
||||
|
||||
**Community Impact**: Demonstrating a pattern of violation of community
|
||||
standards, including sustained inappropriate behavior, harassment of an
|
||||
individual, or aggression toward or disparagement of classes of individuals.
|
||||
|
||||
**Consequence**: A permanent ban from any sort of public interaction within
|
||||
the community.
|
||||
|
||||
## Attribution
|
||||
|
||||
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
|
||||
version 2.0, available at
|
||||
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
|
||||
|
||||
Community Impact Guidelines were inspired by [Mozilla's code of conduct
|
||||
enforcement ladder](https://github.com/mozilla/diversity).
|
||||
|
||||
[homepage]: https://www.contributor-covenant.org
|
||||
|
||||
For answers to common questions about this code of conduct, see the FAQ at
|
||||
https://www.contributor-covenant.org/faq. Translations are available at
|
||||
https://www.contributor-covenant.org/translations.
|
||||
@@ -1,7 +1,7 @@
|
||||
# Note: We use 20.04 since AppImage recommends building on the
|
||||
# Note: We use 22.04 since AppImage recommends building on the
|
||||
# oldest configuration that you support
|
||||
|
||||
FROM swift:6.1-focal AS build-base
|
||||
FROM swift:6.1-jammy AS build-base
|
||||
|
||||
RUN apt-get update \
|
||||
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
|
||||
@@ -94,4 +94,4 @@ ENV USBMUXD_SOCKET_ADDRESS=host.docker.internal:27015
|
||||
|
||||
WORKDIR /xtool
|
||||
|
||||
ENTRYPOINT [ "/bin/bash" ]
|
||||
CMD [ "/bin/bash" ]
|
||||
|
||||
@@ -5,8 +5,8 @@ shopt -s nullglob
|
||||
|
||||
cd "$(dirname "$0")"
|
||||
|
||||
# installer version
|
||||
export LINUXDEPLOY_OUTPUT_VERSION="1.0.0"
|
||||
# release version
|
||||
export LINUXDEPLOY_OUTPUT_VERSION="latest"
|
||||
|
||||
if ! command -v fusermount &>/dev/null; then
|
||||
# Docker doesn't support FUSE
|
||||
@@ -21,6 +21,7 @@ bin="$(swift build --package-path .. -c release --show-bin-path)"
|
||||
strip "${bin}/xtool"
|
||||
|
||||
curr_git_info="$(curl -fsSL https://api.github.com/repos/linuxdeploy/linuxdeploy/git/refs/tags/continuous)"
|
||||
curr_arch="$(uname -m)"
|
||||
|
||||
if [[ -f staging/linuxdeploy/git.json ]]; then
|
||||
if ! cmp -s staging/linuxdeploy/git.json <(echo "$curr_git_info"); then
|
||||
@@ -33,7 +34,7 @@ else
|
||||
fi
|
||||
|
||||
if [[ ! -f staging/linuxdeploy/linuxdeploy.AppImage ]]; then
|
||||
curl -fsSL "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-$(arch).AppImage" \
|
||||
curl -fsSL "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-${curr_arch}.AppImage" \
|
||||
-o staging/linuxdeploy/linuxdeploy.AppImage
|
||||
chmod +x staging/linuxdeploy/linuxdeploy.AppImage
|
||||
echo "$curr_git_info" > staging/linuxdeploy/git.json
|
||||
@@ -42,14 +43,17 @@ fi
|
||||
mkdir -p staging/tmp/AppDir/usr/bin
|
||||
find "${bin}"/ -name '*.resources' -print0 | xargs -0 -I {} cp -a {} "${PWD}/staging/tmp/AppDir/usr/bin/"
|
||||
|
||||
LDAI_OUTPUT="staging/tmp/xtool.AppImage" ./staging/linuxdeploy/linuxdeploy.AppImage \
|
||||
env \
|
||||
LDAI_OUTPUT="staging/tmp/xtool-${curr_arch}.AppImage" \
|
||||
LDAI_UPDATE_INFORMATION="gh-releases-zsync|xtool-org|xtool|latest|xtool-${curr_arch}.AppImage.zsync" \
|
||||
./staging/linuxdeploy/linuxdeploy.AppImage \
|
||||
--appdir staging/tmp/AppDir \
|
||||
--output appimage \
|
||||
-e "${bin}/xtool" \
|
||||
-d xtool.desktop \
|
||||
-i xtool.png
|
||||
mkdir -p packages
|
||||
mv -f staging/tmp/xtool.AppImage packages/xtool.AppImage
|
||||
mv -f "staging/tmp/xtool-${curr_arch}.AppImage" "./xtool-${curr_arch}.AppImage.zsync" packages/
|
||||
|
||||
rm -rf staging/tmp
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ update-api:
|
||||
@+$(MAKE) -B api
|
||||
|
||||
openapi/openapi.json: openapi/base.json Sources/DeveloperAPI/openapi-overlay.yaml
|
||||
npx bump-cli overlay openapi/base.json Sources/DeveloperAPI/openapi-overlay.yaml > openapi/openapi.json
|
||||
npx --yes bump-cli overlay openapi/base.json Sources/DeveloperAPI/openapi-overlay.yaml > openapi/openapi.json
|
||||
|
||||
openapi/base.json:
|
||||
@mkdir -p openapi
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
/docs
|
||||
@@ -0,0 +1,11 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
cd "$(dirname "$0")"
|
||||
|
||||
rm -rf docs
|
||||
|
||||
swift package --allow-writing-to-package-directory \
|
||||
generate-documentation --target XToolDocs --disable-indexing \
|
||||
--output-path docs
|
||||
@@ -23,7 +23,7 @@ let package = Package(
|
||||
),
|
||||
.executable(
|
||||
name: "xtool",
|
||||
targets: ["XTool"]
|
||||
targets: ["xtool"]
|
||||
),
|
||||
],
|
||||
dependencies: [
|
||||
@@ -153,7 +153,7 @@ let package = Package(
|
||||
]
|
||||
),
|
||||
.executableTarget(
|
||||
name: "XTool",
|
||||
name: "xtool",
|
||||
dependencies: [
|
||||
"SwiftyMobileDevice",
|
||||
"XKit",
|
||||
@@ -161,5 +161,8 @@ let package = Package(
|
||||
],
|
||||
cSettings: cSettings
|
||||
),
|
||||
.executableTarget(
|
||||
name: "XToolDocs"
|
||||
),
|
||||
]
|
||||
)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# xtool
|
||||
|
||||
Cross-platform Xcode replacement. Build and deploy iOS apps with SwiftPM on Linux and macOS.
|
||||
Cross-platform Xcode replacement. Build and deploy iOS apps with SwiftPM on Linux, Windows, and macOS.
|
||||
|
||||
## Overview
|
||||
|
||||
@@ -14,13 +14,16 @@ xtool is a cross-platform (Linux/WSL/macOS) tool that replicates Xcode functiona
|
||||
|
||||
## Getting Started
|
||||
|
||||
View the documentation on [Swift Package Index](https://swiftpackageindex.com/xtool-org/xtool).
|
||||
1. Follow the guide to install `xtool`
|
||||
- [Installation (Linux/Windows)](https://xtool.sh/documentation/xtooldocs/installation-linux)
|
||||
- [Installation (macOS)](https://xtool.sh/documentation/xtooldocs/installation-macos)
|
||||
2. Create and run your first xtool-powered app by following the [tutorial](https://xtool.sh/tutorials/xtooldocs/first-app)!
|
||||
|
||||
## Examples
|
||||
|
||||
### Screenshot
|
||||
|
||||

|
||||

|
||||
|
||||
### Command line interface
|
||||
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
# Security Policy
|
||||
|
||||
## Reporting a Vulnerability
|
||||
|
||||
To report a vulnerability, please use GitHub's ["Report a Vulnerability"](https://github.com/xtool-org/xtool/security/advisories/new) tab. We'll be in touch regarding next steps.
|
||||
@@ -2017,6 +2017,207 @@ public struct DeveloperAPIClient: APIProtocol {
|
||||
}
|
||||
)
|
||||
}
|
||||
/// - Remark: HTTP `PATCH /v1/certificates/{id}`.
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/patch(certificates_updateInstance)`.
|
||||
public func certificatesUpdateInstance(_ input: Operations.CertificatesUpdateInstance.Input) async throws -> Operations.CertificatesUpdateInstance.Output {
|
||||
try await client.send(
|
||||
input: input,
|
||||
forOperation: Operations.CertificatesUpdateInstance.id,
|
||||
serializer: { input in
|
||||
let path = try converter.renderedPath(
|
||||
template: "/v1/certificates/{}",
|
||||
parameters: [
|
||||
input.path.id
|
||||
]
|
||||
)
|
||||
var request: HTTPTypes.HTTPRequest = .init(
|
||||
soar_path: path,
|
||||
method: .patch
|
||||
)
|
||||
suppressMutabilityWarning(&request)
|
||||
converter.setAcceptHeader(
|
||||
in: &request.headerFields,
|
||||
contentTypes: input.headers.accept
|
||||
)
|
||||
let body: OpenAPIRuntime.HTTPBody?
|
||||
switch input.body {
|
||||
case let .json(value):
|
||||
body = try converter.setRequiredRequestBodyAsJSON(
|
||||
value,
|
||||
headerFields: &request.headerFields,
|
||||
contentType: "application/json; charset=utf-8"
|
||||
)
|
||||
}
|
||||
return (request, body)
|
||||
},
|
||||
deserializer: { response, responseBody in
|
||||
switch response.status.code {
|
||||
case 200:
|
||||
let contentType = converter.extractContentTypeIfPresent(in: response.headerFields)
|
||||
let body: Operations.CertificatesUpdateInstance.Output.Ok.Body
|
||||
let chosenContentType = try converter.bestContentType(
|
||||
received: contentType,
|
||||
options: [
|
||||
"application/json"
|
||||
]
|
||||
)
|
||||
switch chosenContentType {
|
||||
case "application/json":
|
||||
body = try await converter.getResponseBodyAsJSON(
|
||||
Components.Schemas.CertificateResponse.self,
|
||||
from: responseBody,
|
||||
transforming: { value in
|
||||
.json(value)
|
||||
}
|
||||
)
|
||||
default:
|
||||
preconditionFailure("bestContentType chose an invalid content type.")
|
||||
}
|
||||
return .ok(.init(body: body))
|
||||
case 400:
|
||||
let contentType = converter.extractContentTypeIfPresent(in: response.headerFields)
|
||||
let body: Operations.CertificatesUpdateInstance.Output.BadRequest.Body
|
||||
let chosenContentType = try converter.bestContentType(
|
||||
received: contentType,
|
||||
options: [
|
||||
"application/json"
|
||||
]
|
||||
)
|
||||
switch chosenContentType {
|
||||
case "application/json":
|
||||
body = try await converter.getResponseBodyAsJSON(
|
||||
Components.Schemas.ErrorResponse.self,
|
||||
from: responseBody,
|
||||
transforming: { value in
|
||||
.json(value)
|
||||
}
|
||||
)
|
||||
default:
|
||||
preconditionFailure("bestContentType chose an invalid content type.")
|
||||
}
|
||||
return .badRequest(.init(body: body))
|
||||
case 401:
|
||||
let contentType = converter.extractContentTypeIfPresent(in: response.headerFields)
|
||||
let body: Operations.CertificatesUpdateInstance.Output.Unauthorized.Body
|
||||
let chosenContentType = try converter.bestContentType(
|
||||
received: contentType,
|
||||
options: [
|
||||
"application/json"
|
||||
]
|
||||
)
|
||||
switch chosenContentType {
|
||||
case "application/json":
|
||||
body = try await converter.getResponseBodyAsJSON(
|
||||
Components.Schemas.ErrorResponse.self,
|
||||
from: responseBody,
|
||||
transforming: { value in
|
||||
.json(value)
|
||||
}
|
||||
)
|
||||
default:
|
||||
preconditionFailure("bestContentType chose an invalid content type.")
|
||||
}
|
||||
return .unauthorized(.init(body: body))
|
||||
case 403:
|
||||
let contentType = converter.extractContentTypeIfPresent(in: response.headerFields)
|
||||
let body: Operations.CertificatesUpdateInstance.Output.Forbidden.Body
|
||||
let chosenContentType = try converter.bestContentType(
|
||||
received: contentType,
|
||||
options: [
|
||||
"application/json"
|
||||
]
|
||||
)
|
||||
switch chosenContentType {
|
||||
case "application/json":
|
||||
body = try await converter.getResponseBodyAsJSON(
|
||||
Components.Schemas.ErrorResponse.self,
|
||||
from: responseBody,
|
||||
transforming: { value in
|
||||
.json(value)
|
||||
}
|
||||
)
|
||||
default:
|
||||
preconditionFailure("bestContentType chose an invalid content type.")
|
||||
}
|
||||
return .forbidden(.init(body: body))
|
||||
case 404:
|
||||
let contentType = converter.extractContentTypeIfPresent(in: response.headerFields)
|
||||
let body: Operations.CertificatesUpdateInstance.Output.NotFound.Body
|
||||
let chosenContentType = try converter.bestContentType(
|
||||
received: contentType,
|
||||
options: [
|
||||
"application/json"
|
||||
]
|
||||
)
|
||||
switch chosenContentType {
|
||||
case "application/json":
|
||||
body = try await converter.getResponseBodyAsJSON(
|
||||
Components.Schemas.ErrorResponse.self,
|
||||
from: responseBody,
|
||||
transforming: { value in
|
||||
.json(value)
|
||||
}
|
||||
)
|
||||
default:
|
||||
preconditionFailure("bestContentType chose an invalid content type.")
|
||||
}
|
||||
return .notFound(.init(body: body))
|
||||
case 409:
|
||||
let contentType = converter.extractContentTypeIfPresent(in: response.headerFields)
|
||||
let body: Operations.CertificatesUpdateInstance.Output.Conflict.Body
|
||||
let chosenContentType = try converter.bestContentType(
|
||||
received: contentType,
|
||||
options: [
|
||||
"application/json"
|
||||
]
|
||||
)
|
||||
switch chosenContentType {
|
||||
case "application/json":
|
||||
body = try await converter.getResponseBodyAsJSON(
|
||||
Components.Schemas.ErrorResponse.self,
|
||||
from: responseBody,
|
||||
transforming: { value in
|
||||
.json(value)
|
||||
}
|
||||
)
|
||||
default:
|
||||
preconditionFailure("bestContentType chose an invalid content type.")
|
||||
}
|
||||
return .conflict(.init(body: body))
|
||||
case 422:
|
||||
let contentType = converter.extractContentTypeIfPresent(in: response.headerFields)
|
||||
let body: Operations.CertificatesUpdateInstance.Output.UnprocessableContent.Body
|
||||
let chosenContentType = try converter.bestContentType(
|
||||
received: contentType,
|
||||
options: [
|
||||
"application/json"
|
||||
]
|
||||
)
|
||||
switch chosenContentType {
|
||||
case "application/json":
|
||||
body = try await converter.getResponseBodyAsJSON(
|
||||
Components.Schemas.ErrorResponse.self,
|
||||
from: responseBody,
|
||||
transforming: { value in
|
||||
.json(value)
|
||||
}
|
||||
)
|
||||
default:
|
||||
preconditionFailure("bestContentType chose an invalid content type.")
|
||||
}
|
||||
return .unprocessableContent(.init(body: body))
|
||||
default:
|
||||
return .undocumented(
|
||||
statusCode: response.status.code,
|
||||
.init(
|
||||
headerFields: response.headerFields,
|
||||
body: responseBody
|
||||
)
|
||||
)
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
/// - Remark: HTTP `DELETE /v1/certificates/{id}`.
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/delete(certificates_deleteInstance)`.
|
||||
public func certificatesDeleteInstance(_ input: Operations.CertificatesDeleteInstance.Input) async throws -> Operations.CertificatesDeleteInstance.Output {
|
||||
|
||||
@@ -44,6 +44,9 @@ public protocol APIProtocol: Sendable {
|
||||
/// - Remark: HTTP `GET /v1/certificates/{id}`.
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/get(certificates_getInstance)`.
|
||||
func certificatesGetInstance(_ input: Operations.CertificatesGetInstance.Input) async throws -> Operations.CertificatesGetInstance.Output
|
||||
/// - Remark: HTTP `PATCH /v1/certificates/{id}`.
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/patch(certificates_updateInstance)`.
|
||||
func certificatesUpdateInstance(_ input: Operations.CertificatesUpdateInstance.Input) async throws -> Operations.CertificatesUpdateInstance.Output
|
||||
/// - Remark: HTTP `DELETE /v1/certificates/{id}`.
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/delete(certificates_deleteInstance)`.
|
||||
func certificatesDeleteInstance(_ input: Operations.CertificatesDeleteInstance.Input) async throws -> Operations.CertificatesDeleteInstance.Output
|
||||
@@ -222,6 +225,19 @@ extension APIProtocol {
|
||||
headers: headers
|
||||
))
|
||||
}
|
||||
/// - Remark: HTTP `PATCH /v1/certificates/{id}`.
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/patch(certificates_updateInstance)`.
|
||||
public func certificatesUpdateInstance(
|
||||
path: Operations.CertificatesUpdateInstance.Input.Path,
|
||||
headers: Operations.CertificatesUpdateInstance.Input.Headers = .init(),
|
||||
body: Operations.CertificatesUpdateInstance.Input.Body
|
||||
) async throws -> Operations.CertificatesUpdateInstance.Output {
|
||||
try await certificatesUpdateInstance(Operations.CertificatesUpdateInstance.Input(
|
||||
path: path,
|
||||
headers: headers,
|
||||
body: body
|
||||
))
|
||||
}
|
||||
/// - Remark: HTTP `DELETE /v1/certificates/{id}`.
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/delete(certificates_deleteInstance)`.
|
||||
public func certificatesDeleteInstance(
|
||||
@@ -3116,6 +3132,8 @@ public enum Components {
|
||||
public var expirationDate: Foundation.Date?
|
||||
/// - Remark: Generated from `#/components/schemas/Certificate/attributes/certificateContent`.
|
||||
public var certificateContent: Swift.String?
|
||||
/// - Remark: Generated from `#/components/schemas/Certificate/attributes/activated`.
|
||||
public var activated: Swift.Bool?
|
||||
/// Creates a new `AttributesPayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
@@ -3126,6 +3144,7 @@ public enum Components {
|
||||
/// - platform:
|
||||
/// - expirationDate:
|
||||
/// - certificateContent:
|
||||
/// - activated:
|
||||
public init(
|
||||
name: Swift.String? = nil,
|
||||
certificateType: Components.Schemas.CertificateType? = nil,
|
||||
@@ -3133,7 +3152,8 @@ public enum Components {
|
||||
serialNumber: Swift.String? = nil,
|
||||
platform: Components.Schemas.BundleIdPlatform? = nil,
|
||||
expirationDate: Foundation.Date? = nil,
|
||||
certificateContent: Swift.String? = nil
|
||||
certificateContent: Swift.String? = nil,
|
||||
activated: Swift.Bool? = nil
|
||||
) {
|
||||
self.name = name
|
||||
self.certificateType = certificateType
|
||||
@@ -3142,6 +3162,7 @@ public enum Components {
|
||||
self.platform = platform
|
||||
self.expirationDate = expirationDate
|
||||
self.certificateContent = certificateContent
|
||||
self.activated = activated
|
||||
}
|
||||
public enum CodingKeys: String, CodingKey {
|
||||
case name
|
||||
@@ -3151,6 +3172,7 @@ public enum Components {
|
||||
case platform
|
||||
case expirationDate
|
||||
case certificateContent
|
||||
case activated
|
||||
}
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/Certificate/attributes`.
|
||||
@@ -3269,21 +3291,84 @@ public enum Components {
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateCreateRequest/data/attributes`.
|
||||
public var attributes: Components.Schemas.CertificateCreateRequest.DataPayload.AttributesPayload
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateCreateRequest/data/relationships`.
|
||||
public struct RelationshipsPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateCreateRequest/data/relationships/merchantId`.
|
||||
public struct MerchantIdPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateCreateRequest/data/relationships/merchantId/data`.
|
||||
public struct DataPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateCreateRequest/data/relationships/merchantId/data/type`.
|
||||
@frozen public enum _TypePayload: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case merchantIds = "merchantIds"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateCreateRequest/data/relationships/merchantId/data/type`.
|
||||
public var _type: Components.Schemas.CertificateCreateRequest.DataPayload.RelationshipsPayload.MerchantIdPayload.DataPayload._TypePayload
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateCreateRequest/data/relationships/merchantId/data/id`.
|
||||
public var id: Swift.String
|
||||
/// Creates a new `DataPayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - _type:
|
||||
/// - id:
|
||||
public init(
|
||||
_type: Components.Schemas.CertificateCreateRequest.DataPayload.RelationshipsPayload.MerchantIdPayload.DataPayload._TypePayload,
|
||||
id: Swift.String
|
||||
) {
|
||||
self._type = _type
|
||||
self.id = id
|
||||
}
|
||||
public enum CodingKeys: String, CodingKey {
|
||||
case _type = "type"
|
||||
case id
|
||||
}
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateCreateRequest/data/relationships/merchantId/data`.
|
||||
public var data: Components.Schemas.CertificateCreateRequest.DataPayload.RelationshipsPayload.MerchantIdPayload.DataPayload?
|
||||
/// Creates a new `MerchantIdPayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - data:
|
||||
public init(data: Components.Schemas.CertificateCreateRequest.DataPayload.RelationshipsPayload.MerchantIdPayload.DataPayload? = nil) {
|
||||
self.data = data
|
||||
}
|
||||
public enum CodingKeys: String, CodingKey {
|
||||
case data
|
||||
}
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateCreateRequest/data/relationships/merchantId`.
|
||||
public var merchantId: Components.Schemas.CertificateCreateRequest.DataPayload.RelationshipsPayload.MerchantIdPayload?
|
||||
/// Creates a new `RelationshipsPayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - merchantId:
|
||||
public init(merchantId: Components.Schemas.CertificateCreateRequest.DataPayload.RelationshipsPayload.MerchantIdPayload? = nil) {
|
||||
self.merchantId = merchantId
|
||||
}
|
||||
public enum CodingKeys: String, CodingKey {
|
||||
case merchantId
|
||||
}
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateCreateRequest/data/relationships`.
|
||||
public var relationships: Components.Schemas.CertificateCreateRequest.DataPayload.RelationshipsPayload?
|
||||
/// Creates a new `DataPayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - _type:
|
||||
/// - attributes:
|
||||
/// - relationships:
|
||||
public init(
|
||||
_type: Components.Schemas.CertificateCreateRequest.DataPayload._TypePayload,
|
||||
attributes: Components.Schemas.CertificateCreateRequest.DataPayload.AttributesPayload
|
||||
attributes: Components.Schemas.CertificateCreateRequest.DataPayload.AttributesPayload,
|
||||
relationships: Components.Schemas.CertificateCreateRequest.DataPayload.RelationshipsPayload? = nil
|
||||
) {
|
||||
self._type = _type
|
||||
self.attributes = attributes
|
||||
self.relationships = relationships
|
||||
}
|
||||
public enum CodingKeys: String, CodingKey {
|
||||
case _type = "type"
|
||||
case attributes
|
||||
case relationships
|
||||
}
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateCreateRequest/data`.
|
||||
@@ -3299,6 +3384,69 @@ public enum Components {
|
||||
case data
|
||||
}
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateUpdateRequest`.
|
||||
public struct CertificateUpdateRequest: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateUpdateRequest/data`.
|
||||
public struct DataPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateUpdateRequest/data/type`.
|
||||
@frozen public enum _TypePayload: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case certificates = "certificates"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateUpdateRequest/data/type`.
|
||||
public var _type: Components.Schemas.CertificateUpdateRequest.DataPayload._TypePayload
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateUpdateRequest/data/id`.
|
||||
public var id: Swift.String
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateUpdateRequest/data/attributes`.
|
||||
public struct AttributesPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateUpdateRequest/data/attributes/activated`.
|
||||
public var activated: Swift.Bool?
|
||||
/// Creates a new `AttributesPayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - activated:
|
||||
public init(activated: Swift.Bool? = nil) {
|
||||
self.activated = activated
|
||||
}
|
||||
public enum CodingKeys: String, CodingKey {
|
||||
case activated
|
||||
}
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateUpdateRequest/data/attributes`.
|
||||
public var attributes: Components.Schemas.CertificateUpdateRequest.DataPayload.AttributesPayload?
|
||||
/// Creates a new `DataPayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - _type:
|
||||
/// - id:
|
||||
/// - attributes:
|
||||
public init(
|
||||
_type: Components.Schemas.CertificateUpdateRequest.DataPayload._TypePayload,
|
||||
id: Swift.String,
|
||||
attributes: Components.Schemas.CertificateUpdateRequest.DataPayload.AttributesPayload? = nil
|
||||
) {
|
||||
self._type = _type
|
||||
self.id = id
|
||||
self.attributes = attributes
|
||||
}
|
||||
public enum CodingKeys: String, CodingKey {
|
||||
case _type = "type"
|
||||
case id
|
||||
case attributes
|
||||
}
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateUpdateRequest/data`.
|
||||
public var data: Components.Schemas.CertificateUpdateRequest.DataPayload
|
||||
/// Creates a new `CertificateUpdateRequest`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - data:
|
||||
public init(data: Components.Schemas.CertificateUpdateRequest.DataPayload) {
|
||||
self.data = data
|
||||
}
|
||||
public enum CodingKeys: String, CodingKey {
|
||||
case data
|
||||
}
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/Device`.
|
||||
public struct Device: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/Device/type`.
|
||||
@@ -3325,6 +3473,7 @@ public enum Components {
|
||||
case ipod = "IPOD"
|
||||
case appleTv = "APPLE_TV"
|
||||
case mac = "MAC"
|
||||
case appleVisionPro = "APPLE_VISION_PRO"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/Device/attributes/deviceClass`.
|
||||
public var deviceClass: Components.Schemas.Device.AttributesPayload.DeviceClassPayload?
|
||||
@@ -5033,17 +5182,22 @@ public enum Components {
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateType`.
|
||||
@frozen public enum CertificateType: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case iosDevelopment = "IOS_DEVELOPMENT"
|
||||
case iosDistribution = "IOS_DISTRIBUTION"
|
||||
case macAppDistribution = "MAC_APP_DISTRIBUTION"
|
||||
case macInstallerDistribution = "MAC_INSTALLER_DISTRIBUTION"
|
||||
case macAppDevelopment = "MAC_APP_DEVELOPMENT"
|
||||
case applePay = "APPLE_PAY"
|
||||
case applePayMerchantIdentity = "APPLE_PAY_MERCHANT_IDENTITY"
|
||||
case applePayPspIdentity = "APPLE_PAY_PSP_IDENTITY"
|
||||
case applePayRsa = "APPLE_PAY_RSA"
|
||||
case developerIdKext = "DEVELOPER_ID_KEXT"
|
||||
case developerIdKextG2 = "DEVELOPER_ID_KEXT_G2"
|
||||
case developerIdApplication = "DEVELOPER_ID_APPLICATION"
|
||||
case developerIdApplicationG2 = "DEVELOPER_ID_APPLICATION_G2"
|
||||
case development = "DEVELOPMENT"
|
||||
case distribution = "DISTRIBUTION"
|
||||
case identityAccess = "IDENTITY_ACCESS"
|
||||
case iosDevelopment = "IOS_DEVELOPMENT"
|
||||
case iosDistribution = "IOS_DISTRIBUTION"
|
||||
case macAppDistribution = "MAC_APP_DISTRIBUTION"
|
||||
case macInstallerDistribution = "MAC_INSTALLER_DISTRIBUTION"
|
||||
case macAppDevelopment = "MAC_APP_DEVELOPMENT"
|
||||
case passTypeId = "PASS_TYPE_ID"
|
||||
case passTypeIdWithNfc = "PASS_TYPE_ID_WITH_NFC"
|
||||
}
|
||||
@@ -8419,17 +8573,22 @@ public enum Operations {
|
||||
public var filter_lbrack_displayName_rbrack_: [Swift.String]?
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/GET/query/Filter_lbrack_certificateType_rbrack_Payload`.
|
||||
@frozen public enum FilterLbrackCertificateTypeRbrackPayloadPayload: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case iosDevelopment = "IOS_DEVELOPMENT"
|
||||
case iosDistribution = "IOS_DISTRIBUTION"
|
||||
case macAppDistribution = "MAC_APP_DISTRIBUTION"
|
||||
case macInstallerDistribution = "MAC_INSTALLER_DISTRIBUTION"
|
||||
case macAppDevelopment = "MAC_APP_DEVELOPMENT"
|
||||
case applePay = "APPLE_PAY"
|
||||
case applePayMerchantIdentity = "APPLE_PAY_MERCHANT_IDENTITY"
|
||||
case applePayPspIdentity = "APPLE_PAY_PSP_IDENTITY"
|
||||
case applePayRsa = "APPLE_PAY_RSA"
|
||||
case developerIdKext = "DEVELOPER_ID_KEXT"
|
||||
case developerIdKextG2 = "DEVELOPER_ID_KEXT_G2"
|
||||
case developerIdApplication = "DEVELOPER_ID_APPLICATION"
|
||||
case developerIdApplicationG2 = "DEVELOPER_ID_APPLICATION_G2"
|
||||
case development = "DEVELOPMENT"
|
||||
case distribution = "DISTRIBUTION"
|
||||
case identityAccess = "IDENTITY_ACCESS"
|
||||
case iosDevelopment = "IOS_DEVELOPMENT"
|
||||
case iosDistribution = "IOS_DISTRIBUTION"
|
||||
case macAppDistribution = "MAC_APP_DISTRIBUTION"
|
||||
case macInstallerDistribution = "MAC_INSTALLER_DISTRIBUTION"
|
||||
case macAppDevelopment = "MAC_APP_DEVELOPMENT"
|
||||
case passTypeId = "PASS_TYPE_ID"
|
||||
case passTypeIdWithNfc = "PASS_TYPE_ID_WITH_NFC"
|
||||
}
|
||||
@@ -8473,6 +8632,7 @@ public enum Operations {
|
||||
case platform = "platform"
|
||||
case expirationDate = "expirationDate"
|
||||
case certificateContent = "certificateContent"
|
||||
case activated = "activated"
|
||||
}
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/GET/query/fields[certificates]`.
|
||||
public typealias Fields_lbrack_certificates_rbrack_Payload = [Operations.CertificatesGetCollection.Input.Query.FieldsLbrackCertificatesRbrackPayloadPayload]
|
||||
@@ -9179,6 +9339,7 @@ public enum Operations {
|
||||
case platform = "platform"
|
||||
case expirationDate = "expirationDate"
|
||||
case certificateContent = "certificateContent"
|
||||
case activated = "activated"
|
||||
}
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/GET/query/fields[certificates]`.
|
||||
public typealias Fields_lbrack_certificates_rbrack_Payload = [Operations.CertificatesGetInstance.Input.Query.FieldsLbrackCertificatesRbrackPayloadPayload]
|
||||
@@ -9510,6 +9671,449 @@ public enum Operations {
|
||||
}
|
||||
}
|
||||
}
|
||||
/// - Remark: HTTP `PATCH /v1/certificates/{id}`.
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/patch(certificates_updateInstance)`.
|
||||
public enum CertificatesUpdateInstance {
|
||||
public static let id: Swift.String = "certificates_updateInstance"
|
||||
public struct Input: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/path`.
|
||||
public struct Path: Sendable, Hashable {
|
||||
/// the id of the requested resource
|
||||
///
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/path/id`.
|
||||
public var id: Swift.String
|
||||
/// Creates a new `Path`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - id: the id of the requested resource
|
||||
public init(id: Swift.String) {
|
||||
self.id = id
|
||||
}
|
||||
}
|
||||
public var path: Operations.CertificatesUpdateInstance.Input.Path
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/header`.
|
||||
public struct Headers: Sendable, Hashable {
|
||||
public var accept: [OpenAPIRuntime.AcceptHeaderContentType<Operations.CertificatesUpdateInstance.AcceptableContentType>]
|
||||
/// Creates a new `Headers`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - accept:
|
||||
public init(accept: [OpenAPIRuntime.AcceptHeaderContentType<Operations.CertificatesUpdateInstance.AcceptableContentType>] = .defaultValues()) {
|
||||
self.accept = accept
|
||||
}
|
||||
}
|
||||
public var headers: Operations.CertificatesUpdateInstance.Input.Headers
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/requestBody`.
|
||||
@frozen public enum Body: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/requestBody/content/application\/json`.
|
||||
case json(Components.Schemas.CertificateUpdateRequest)
|
||||
}
|
||||
public var body: Operations.CertificatesUpdateInstance.Input.Body
|
||||
/// Creates a new `Input`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - path:
|
||||
/// - headers:
|
||||
/// - body:
|
||||
public init(
|
||||
path: Operations.CertificatesUpdateInstance.Input.Path,
|
||||
headers: Operations.CertificatesUpdateInstance.Input.Headers = .init(),
|
||||
body: Operations.CertificatesUpdateInstance.Input.Body
|
||||
) {
|
||||
self.path = path
|
||||
self.headers = headers
|
||||
self.body = body
|
||||
}
|
||||
}
|
||||
@frozen public enum Output: Sendable, Hashable {
|
||||
public struct Ok: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/responses/200/content`.
|
||||
@frozen public enum Body: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/responses/200/content/application\/json`.
|
||||
case json(Components.Schemas.CertificateResponse)
|
||||
/// The associated value of the enum case if `self` is `.json`.
|
||||
///
|
||||
/// - Throws: An error if `self` is not `.json`.
|
||||
/// - SeeAlso: `.json`.
|
||||
public var json: Components.Schemas.CertificateResponse {
|
||||
get throws {
|
||||
switch self {
|
||||
case let .json(body):
|
||||
return body
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
/// Received HTTP response body
|
||||
public var body: Operations.CertificatesUpdateInstance.Output.Ok.Body
|
||||
/// Creates a new `Ok`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - body: Received HTTP response body
|
||||
public init(body: Operations.CertificatesUpdateInstance.Output.Ok.Body) {
|
||||
self.body = body
|
||||
}
|
||||
}
|
||||
/// Single Certificate
|
||||
///
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/patch(certificates_updateInstance)/responses/200`.
|
||||
///
|
||||
/// HTTP response code: `200 ok`.
|
||||
case ok(Operations.CertificatesUpdateInstance.Output.Ok)
|
||||
/// The associated value of the enum case if `self` is `.ok`.
|
||||
///
|
||||
/// - Throws: An error if `self` is not `.ok`.
|
||||
/// - SeeAlso: `.ok`.
|
||||
public var ok: Operations.CertificatesUpdateInstance.Output.Ok {
|
||||
get throws {
|
||||
switch self {
|
||||
case let .ok(response):
|
||||
return response
|
||||
default:
|
||||
try throwUnexpectedResponseStatus(
|
||||
expectedStatus: "ok",
|
||||
response: self
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
public struct BadRequest: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/responses/400/content`.
|
||||
@frozen public enum Body: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/responses/400/content/application\/json`.
|
||||
case json(Components.Schemas.ErrorResponse)
|
||||
/// The associated value of the enum case if `self` is `.json`.
|
||||
///
|
||||
/// - Throws: An error if `self` is not `.json`.
|
||||
/// - SeeAlso: `.json`.
|
||||
public var json: Components.Schemas.ErrorResponse {
|
||||
get throws {
|
||||
switch self {
|
||||
case let .json(body):
|
||||
return body
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
/// Received HTTP response body
|
||||
public var body: Operations.CertificatesUpdateInstance.Output.BadRequest.Body
|
||||
/// Creates a new `BadRequest`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - body: Received HTTP response body
|
||||
public init(body: Operations.CertificatesUpdateInstance.Output.BadRequest.Body) {
|
||||
self.body = body
|
||||
}
|
||||
}
|
||||
/// Parameter error(s)
|
||||
///
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/patch(certificates_updateInstance)/responses/400`.
|
||||
///
|
||||
/// HTTP response code: `400 badRequest`.
|
||||
case badRequest(Operations.CertificatesUpdateInstance.Output.BadRequest)
|
||||
/// The associated value of the enum case if `self` is `.badRequest`.
|
||||
///
|
||||
/// - Throws: An error if `self` is not `.badRequest`.
|
||||
/// - SeeAlso: `.badRequest`.
|
||||
public var badRequest: Operations.CertificatesUpdateInstance.Output.BadRequest {
|
||||
get throws {
|
||||
switch self {
|
||||
case let .badRequest(response):
|
||||
return response
|
||||
default:
|
||||
try throwUnexpectedResponseStatus(
|
||||
expectedStatus: "badRequest",
|
||||
response: self
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
public struct Unauthorized: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/responses/401/content`.
|
||||
@frozen public enum Body: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/responses/401/content/application\/json`.
|
||||
case json(Components.Schemas.ErrorResponse)
|
||||
/// The associated value of the enum case if `self` is `.json`.
|
||||
///
|
||||
/// - Throws: An error if `self` is not `.json`.
|
||||
/// - SeeAlso: `.json`.
|
||||
public var json: Components.Schemas.ErrorResponse {
|
||||
get throws {
|
||||
switch self {
|
||||
case let .json(body):
|
||||
return body
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
/// Received HTTP response body
|
||||
public var body: Operations.CertificatesUpdateInstance.Output.Unauthorized.Body
|
||||
/// Creates a new `Unauthorized`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - body: Received HTTP response body
|
||||
public init(body: Operations.CertificatesUpdateInstance.Output.Unauthorized.Body) {
|
||||
self.body = body
|
||||
}
|
||||
}
|
||||
/// Unauthorized error(s)
|
||||
///
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/patch(certificates_updateInstance)/responses/401`.
|
||||
///
|
||||
/// HTTP response code: `401 unauthorized`.
|
||||
case unauthorized(Operations.CertificatesUpdateInstance.Output.Unauthorized)
|
||||
/// The associated value of the enum case if `self` is `.unauthorized`.
|
||||
///
|
||||
/// - Throws: An error if `self` is not `.unauthorized`.
|
||||
/// - SeeAlso: `.unauthorized`.
|
||||
public var unauthorized: Operations.CertificatesUpdateInstance.Output.Unauthorized {
|
||||
get throws {
|
||||
switch self {
|
||||
case let .unauthorized(response):
|
||||
return response
|
||||
default:
|
||||
try throwUnexpectedResponseStatus(
|
||||
expectedStatus: "unauthorized",
|
||||
response: self
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
public struct Forbidden: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/responses/403/content`.
|
||||
@frozen public enum Body: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/responses/403/content/application\/json`.
|
||||
case json(Components.Schemas.ErrorResponse)
|
||||
/// The associated value of the enum case if `self` is `.json`.
|
||||
///
|
||||
/// - Throws: An error if `self` is not `.json`.
|
||||
/// - SeeAlso: `.json`.
|
||||
public var json: Components.Schemas.ErrorResponse {
|
||||
get throws {
|
||||
switch self {
|
||||
case let .json(body):
|
||||
return body
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
/// Received HTTP response body
|
||||
public var body: Operations.CertificatesUpdateInstance.Output.Forbidden.Body
|
||||
/// Creates a new `Forbidden`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - body: Received HTTP response body
|
||||
public init(body: Operations.CertificatesUpdateInstance.Output.Forbidden.Body) {
|
||||
self.body = body
|
||||
}
|
||||
}
|
||||
/// Forbidden error
|
||||
///
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/patch(certificates_updateInstance)/responses/403`.
|
||||
///
|
||||
/// HTTP response code: `403 forbidden`.
|
||||
case forbidden(Operations.CertificatesUpdateInstance.Output.Forbidden)
|
||||
/// The associated value of the enum case if `self` is `.forbidden`.
|
||||
///
|
||||
/// - Throws: An error if `self` is not `.forbidden`.
|
||||
/// - SeeAlso: `.forbidden`.
|
||||
public var forbidden: Operations.CertificatesUpdateInstance.Output.Forbidden {
|
||||
get throws {
|
||||
switch self {
|
||||
case let .forbidden(response):
|
||||
return response
|
||||
default:
|
||||
try throwUnexpectedResponseStatus(
|
||||
expectedStatus: "forbidden",
|
||||
response: self
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
public struct NotFound: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/responses/404/content`.
|
||||
@frozen public enum Body: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/responses/404/content/application\/json`.
|
||||
case json(Components.Schemas.ErrorResponse)
|
||||
/// The associated value of the enum case if `self` is `.json`.
|
||||
///
|
||||
/// - Throws: An error if `self` is not `.json`.
|
||||
/// - SeeAlso: `.json`.
|
||||
public var json: Components.Schemas.ErrorResponse {
|
||||
get throws {
|
||||
switch self {
|
||||
case let .json(body):
|
||||
return body
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
/// Received HTTP response body
|
||||
public var body: Operations.CertificatesUpdateInstance.Output.NotFound.Body
|
||||
/// Creates a new `NotFound`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - body: Received HTTP response body
|
||||
public init(body: Operations.CertificatesUpdateInstance.Output.NotFound.Body) {
|
||||
self.body = body
|
||||
}
|
||||
}
|
||||
/// Not found error
|
||||
///
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/patch(certificates_updateInstance)/responses/404`.
|
||||
///
|
||||
/// HTTP response code: `404 notFound`.
|
||||
case notFound(Operations.CertificatesUpdateInstance.Output.NotFound)
|
||||
/// The associated value of the enum case if `self` is `.notFound`.
|
||||
///
|
||||
/// - Throws: An error if `self` is not `.notFound`.
|
||||
/// - SeeAlso: `.notFound`.
|
||||
public var notFound: Operations.CertificatesUpdateInstance.Output.NotFound {
|
||||
get throws {
|
||||
switch self {
|
||||
case let .notFound(response):
|
||||
return response
|
||||
default:
|
||||
try throwUnexpectedResponseStatus(
|
||||
expectedStatus: "notFound",
|
||||
response: self
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
public struct Conflict: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/responses/409/content`.
|
||||
@frozen public enum Body: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/responses/409/content/application\/json`.
|
||||
case json(Components.Schemas.ErrorResponse)
|
||||
/// The associated value of the enum case if `self` is `.json`.
|
||||
///
|
||||
/// - Throws: An error if `self` is not `.json`.
|
||||
/// - SeeAlso: `.json`.
|
||||
public var json: Components.Schemas.ErrorResponse {
|
||||
get throws {
|
||||
switch self {
|
||||
case let .json(body):
|
||||
return body
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
/// Received HTTP response body
|
||||
public var body: Operations.CertificatesUpdateInstance.Output.Conflict.Body
|
||||
/// Creates a new `Conflict`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - body: Received HTTP response body
|
||||
public init(body: Operations.CertificatesUpdateInstance.Output.Conflict.Body) {
|
||||
self.body = body
|
||||
}
|
||||
}
|
||||
/// Request entity error(s)
|
||||
///
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/patch(certificates_updateInstance)/responses/409`.
|
||||
///
|
||||
/// HTTP response code: `409 conflict`.
|
||||
case conflict(Operations.CertificatesUpdateInstance.Output.Conflict)
|
||||
/// The associated value of the enum case if `self` is `.conflict`.
|
||||
///
|
||||
/// - Throws: An error if `self` is not `.conflict`.
|
||||
/// - SeeAlso: `.conflict`.
|
||||
public var conflict: Operations.CertificatesUpdateInstance.Output.Conflict {
|
||||
get throws {
|
||||
switch self {
|
||||
case let .conflict(response):
|
||||
return response
|
||||
default:
|
||||
try throwUnexpectedResponseStatus(
|
||||
expectedStatus: "conflict",
|
||||
response: self
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
public struct UnprocessableContent: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/responses/422/content`.
|
||||
@frozen public enum Body: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/responses/422/content/application\/json`.
|
||||
case json(Components.Schemas.ErrorResponse)
|
||||
/// The associated value of the enum case if `self` is `.json`.
|
||||
///
|
||||
/// - Throws: An error if `self` is not `.json`.
|
||||
/// - SeeAlso: `.json`.
|
||||
public var json: Components.Schemas.ErrorResponse {
|
||||
get throws {
|
||||
switch self {
|
||||
case let .json(body):
|
||||
return body
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
/// Received HTTP response body
|
||||
public var body: Operations.CertificatesUpdateInstance.Output.UnprocessableContent.Body
|
||||
/// Creates a new `UnprocessableContent`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - body: Received HTTP response body
|
||||
public init(body: Operations.CertificatesUpdateInstance.Output.UnprocessableContent.Body) {
|
||||
self.body = body
|
||||
}
|
||||
}
|
||||
/// Unprocessable request entity error(s)
|
||||
///
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/patch(certificates_updateInstance)/responses/422`.
|
||||
///
|
||||
/// HTTP response code: `422 unprocessableContent`.
|
||||
case unprocessableContent(Operations.CertificatesUpdateInstance.Output.UnprocessableContent)
|
||||
/// The associated value of the enum case if `self` is `.unprocessableContent`.
|
||||
///
|
||||
/// - Throws: An error if `self` is not `.unprocessableContent`.
|
||||
/// - SeeAlso: `.unprocessableContent`.
|
||||
public var unprocessableContent: Operations.CertificatesUpdateInstance.Output.UnprocessableContent {
|
||||
get throws {
|
||||
switch self {
|
||||
case let .unprocessableContent(response):
|
||||
return response
|
||||
default:
|
||||
try throwUnexpectedResponseStatus(
|
||||
expectedStatus: "unprocessableContent",
|
||||
response: self
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
/// Undocumented response.
|
||||
///
|
||||
/// A response with a code that is not documented in the OpenAPI document.
|
||||
case undocumented(statusCode: Swift.Int, OpenAPIRuntime.UndocumentedPayload)
|
||||
}
|
||||
@frozen public enum AcceptableContentType: AcceptableProtocol {
|
||||
case json
|
||||
case other(Swift.String)
|
||||
public init?(rawValue: Swift.String) {
|
||||
switch rawValue.lowercased() {
|
||||
case "application/json":
|
||||
self = .json
|
||||
default:
|
||||
self = .other(rawValue)
|
||||
}
|
||||
}
|
||||
public var rawValue: Swift.String {
|
||||
switch self {
|
||||
case let .other(string):
|
||||
return string
|
||||
case .json:
|
||||
return "application/json"
|
||||
}
|
||||
}
|
||||
public static var allCases: [Self] {
|
||||
[
|
||||
.json
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
/// - Remark: HTTP `DELETE /v1/certificates/{id}`.
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/delete(certificates_deleteInstance)`.
|
||||
public enum CertificatesDeleteInstance {
|
||||
@@ -11557,6 +12161,7 @@ public enum Operations {
|
||||
case platform = "platform"
|
||||
case expirationDate = "expirationDate"
|
||||
case certificateContent = "certificateContent"
|
||||
case activated = "activated"
|
||||
}
|
||||
/// - Remark: Generated from `#/paths/v1/profiles/GET/query/fields[certificates]`.
|
||||
public typealias Fields_lbrack_certificates_rbrack_Payload = [Operations.ProfilesGetCollection.Input.Query.FieldsLbrackCertificatesRbrackPayloadPayload]
|
||||
@@ -12353,6 +12958,7 @@ public enum Operations {
|
||||
case platform = "platform"
|
||||
case expirationDate = "expirationDate"
|
||||
case certificateContent = "certificateContent"
|
||||
case activated = "activated"
|
||||
}
|
||||
/// - Remark: Generated from `#/paths/v1/profiles/{id}/GET/query/fields[certificates]`.
|
||||
public typealias Fields_lbrack_certificates_rbrack_Payload = [Operations.ProfilesGetInstance.Input.Query.FieldsLbrackCertificatesRbrackPayloadPayload]
|
||||
@@ -14623,6 +15229,7 @@ public enum Operations {
|
||||
case platform = "platform"
|
||||
case expirationDate = "expirationDate"
|
||||
case certificateContent = "certificateContent"
|
||||
case activated = "activated"
|
||||
}
|
||||
/// - Remark: Generated from `#/paths/v1/profiles/{id}/certificates/GET/query/fields[certificates]`.
|
||||
public typealias Fields_lbrack_certificates_rbrack_Payload = [Operations.ProfilesCertificatesGetToManyRelated.Input.Query.FieldsLbrackCertificatesRbrackPayloadPayload]
|
||||
|
||||
@@ -20,3 +20,6 @@ actions:
|
||||
required: [id, type]
|
||||
required: [data]
|
||||
required: [capability]
|
||||
- target: '$.components.schemas.Device.properties.attributes.properties.deviceClass'
|
||||
update:
|
||||
enum: ["APPLE_VISION_PRO"]
|
||||
|
||||
@@ -13,7 +13,6 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
|
||||
|
||||
public enum Error: LocalizedError {
|
||||
case invalidApp(URL)
|
||||
case teamNotFound(DeveloperServicesTeam.ID)
|
||||
|
||||
public var errorDescription: String? {
|
||||
switch self {
|
||||
@@ -25,16 +24,6 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
|
||||
), $0
|
||||
)
|
||||
}
|
||||
case .teamNotFound(let id):
|
||||
return id.rawValue.withCString {
|
||||
String.localizedStringWithFormat(
|
||||
NSLocalizedString(
|
||||
"add_app_operation.error.team_not_found",
|
||||
value: "A team with the ID '%s' could not be found. Please select another team.",
|
||||
comment: ""
|
||||
), $0
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -115,9 +104,13 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
|
||||
.ok
|
||||
}
|
||||
} else {
|
||||
_ = try await context.developerAPIClient
|
||||
.bundleIdCapabilitiesDeleteInstance(path: .init(id: cap.id))
|
||||
.noContent
|
||||
// DeveloperServices doesn't allow deleting these capabilities
|
||||
let requiredCapabilities: Set<Components.Schemas.CapabilityType> = [.inAppPurchase]
|
||||
if let capType = cap.attributes?.capabilityType, !requiredCapabilities.contains(capType) {
|
||||
_ = try await context.developerAPIClient
|
||||
.bundleIdCapabilitiesDeleteInstance(path: .init(id: cap.id))
|
||||
.noContent
|
||||
}
|
||||
}
|
||||
}
|
||||
for (typ, settings) in wantedCapabilities {
|
||||
@@ -232,20 +225,6 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
|
||||
)
|
||||
}
|
||||
|
||||
private func getTeamIsFree() async throws -> Bool {
|
||||
switch context.auth {
|
||||
case .appStoreConnect:
|
||||
return false
|
||||
case .xcode(let authData):
|
||||
let client = DeveloperServicesClient(authData: authData)
|
||||
let request = DeveloperServicesListTeamsRequest()
|
||||
let teams = try await client.send(request)
|
||||
guard let team = teams.first(where: { $0.id == authData.teamID })
|
||||
else { throw Error.teamNotFound(authData.teamID) }
|
||||
return team.isFree
|
||||
}
|
||||
}
|
||||
|
||||
// keyed by sanitized bundle ID
|
||||
private func getCurrentAppIDs() async throws -> [String: Components.Schemas.BundleId] {
|
||||
let bundleIDs = try await context.developerAPIClient.bundleIdsGetCollection().ok.body.json.data
|
||||
@@ -265,7 +244,7 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
|
||||
apps += plugins.implicitContents.filter { $0.pathExtension.lowercased() == "appex" }
|
||||
}
|
||||
|
||||
async let isFreeTeamTask = getTeamIsFree()
|
||||
async let isFreeTeamTask = context.auth.team()?.isFree == true
|
||||
async let appIDsTask = getCurrentAppIDs()
|
||||
let (isFreeTeam, appIDs) = try await (isFreeTeamTask, appIDsTask)
|
||||
|
||||
|
||||
@@ -72,19 +72,21 @@ public struct DeveloperServicesFetchCertificateOperation: DeveloperServicesOpera
|
||||
_ certificates: [DeveloperServicesCertificate],
|
||||
requireConfirmation: Bool
|
||||
) async throws -> SigningInfo {
|
||||
if !certificates.isEmpty, requireConfirmation {
|
||||
guard await confirmRevocation(certificates)
|
||||
else { throw CancellationError() }
|
||||
}
|
||||
try await withThrowingTaskGroup(of: Void.self) { group in
|
||||
for certificate in certificates {
|
||||
group.addTask {
|
||||
_ = try await context.developerAPIClient
|
||||
.certificatesDeleteInstance(path: .init(id: certificate.id))
|
||||
.noContent
|
||||
}
|
||||
if try await context.auth.team()?.isFree == true {
|
||||
if !certificates.isEmpty, requireConfirmation {
|
||||
guard await confirmRevocation(certificates)
|
||||
else { throw CancellationError() }
|
||||
}
|
||||
try await withThrowingTaskGroup(of: Void.self) { group in
|
||||
for certificate in certificates {
|
||||
group.addTask {
|
||||
_ = try await context.developerAPIClient
|
||||
.certificatesDeleteInstance(path: .init(id: certificate.id))
|
||||
.noContent
|
||||
}
|
||||
}
|
||||
try await group.waitForAll()
|
||||
}
|
||||
try await group.waitForAll()
|
||||
}
|
||||
let signingInfo = try await createCertificate()
|
||||
signingInfoManager[self.context.auth.identityID] = signingInfo
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
import Foundation
|
||||
|
||||
private actor DeveloperServicesTeamFetcher {
|
||||
static let shared = DeveloperServicesTeamFetcher()
|
||||
|
||||
private var cache: [DeveloperServicesTeam.ID: Task<DeveloperServicesTeam, Error>] = [:]
|
||||
|
||||
private init() {}
|
||||
|
||||
func teams(forXcodeLogin auth: XcodeAuthData) async throws -> DeveloperServicesTeam {
|
||||
let teamID = auth.teamID
|
||||
if let cached = cache[teamID] {
|
||||
return try await cached.value
|
||||
}
|
||||
let task = Task {
|
||||
let client = DeveloperServicesClient(authData: auth)
|
||||
let teams = try await client.send(DeveloperServicesListTeamsRequest())
|
||||
guard let team = teams.first(where: { $0.id == teamID })
|
||||
else { throw Errors.teamNotFound(teamID) }
|
||||
return team
|
||||
}
|
||||
cache[auth.teamID] = task
|
||||
return try await task.value
|
||||
}
|
||||
|
||||
enum Errors: LocalizedError {
|
||||
case teamNotFound(DeveloperServicesTeam.ID)
|
||||
|
||||
public var errorDescription: String? {
|
||||
switch self {
|
||||
case .teamNotFound(let id):
|
||||
return id.rawValue.withCString {
|
||||
String.localizedStringWithFormat(
|
||||
NSLocalizedString(
|
||||
"add_app_operation.error.team_not_found",
|
||||
value: "A team with the ID '%s' could not be found. Please select another team.",
|
||||
comment: ""
|
||||
), $0
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extension XcodeAuthData {
|
||||
public func team() async throws -> DeveloperServicesTeam {
|
||||
try await DeveloperServicesTeamFetcher.shared.teams(forXcodeLogin: self)
|
||||
}
|
||||
}
|
||||
|
||||
extension DeveloperAPIAuthData {
|
||||
public func team() async throws -> DeveloperServicesTeam? {
|
||||
switch self {
|
||||
case .appStoreConnect: nil
|
||||
case .xcode(let auth): try await auth.team()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -78,7 +78,7 @@ public struct DeveloperServicesFetchProfileOperation: DeveloperServicesOperation
|
||||
data: .init(
|
||||
_type: .profiles,
|
||||
attributes: .init(
|
||||
name: "SC profile \(bundleID.id)",
|
||||
name: "XTL profile \(bundleID.id)",
|
||||
profileType: .iosAppDevelopment
|
||||
),
|
||||
relationships: .init(
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
import Foundation
|
||||
|
||||
public struct DeveloperServicesTeam: Decodable, Sendable {
|
||||
public struct ID: RawRepresentable, Decodable, Sendable {
|
||||
public struct ID: RawRepresentable, Decodable, Sendable, Hashable {
|
||||
public let rawValue: String
|
||||
public init(rawValue: String) { self.rawValue = rawValue }
|
||||
}
|
||||
|
||||
@@ -129,6 +129,15 @@ public actor XADIProvider: RawADIProvider {
|
||||
}
|
||||
})
|
||||
let file = adiDirectory.appending(path: "adi.pb")
|
||||
// adi saves the file as 0o034 (group wx, public r) by default
|
||||
// which is a... strange choice that prevents us from reading
|
||||
// or writing by default. Since we're the owner, we can easily
|
||||
// change this though.
|
||||
try FileManager.default.setAttributes(
|
||||
// rw for owner
|
||||
[.posixPermissions: 0o600],
|
||||
ofItemAtPath: file.path
|
||||
)
|
||||
return try Data(contentsOf: file)
|
||||
}
|
||||
}
|
||||
@@ -148,9 +157,6 @@ public actor XADIProvider: RawADIProvider {
|
||||
let adiDirectory = directory.appending(path: "adi")
|
||||
try? FileManager.default.createDirectory(at: adiDirectory, withIntermediateDirectories: true)
|
||||
let adiFile = adiDirectory.appending(path: "adi.pb")
|
||||
// this file may be saved as write-protected, but we can still remove it
|
||||
// and then overwrite it.
|
||||
try? FileManager.default.removeItem(at: adiFile)
|
||||
try provisioningInfo.write(to: adiFile)
|
||||
|
||||
try check(xadi_OTPRequest(
|
||||
|
||||
@@ -72,7 +72,7 @@ public actor Connection {
|
||||
private static let pool = WeakPool<ConnectionDescriptor, Connection, Error>()
|
||||
|
||||
private var handle: AnyObject?
|
||||
private let heartbeatHandler: HeartbeatHandler
|
||||
private let heartbeatHandler: HeartbeatHandler?
|
||||
private let udid: String
|
||||
public let device: Device
|
||||
public let client: LockdownClient
|
||||
@@ -101,8 +101,12 @@ public actor Connection {
|
||||
|
||||
client = try LockdownClient(device: device, label: Self.label, performHandshake: true)
|
||||
|
||||
#if os(iOS)
|
||||
progress(3/4)
|
||||
heartbeatHandler = try await HeartbeatHandler(device: device, client: client)
|
||||
#else
|
||||
heartbeatHandler = nil
|
||||
#endif
|
||||
|
||||
progress(4/4)
|
||||
}
|
||||
@@ -122,7 +126,7 @@ public actor Connection {
|
||||
}
|
||||
|
||||
deinit {
|
||||
heartbeatHandler.stop()
|
||||
heartbeatHandler?.stop()
|
||||
// we could nil out connections[udid] here but that might lead to
|
||||
// weird race conditions against Connection.connection that seem
|
||||
// like a nightmare to diagnose, and storing an empty box for a
|
||||
|
||||
@@ -55,7 +55,7 @@ public actor IntegratedInstaller {
|
||||
private var appInstaller: AppInstaller?
|
||||
|
||||
private let tempDir = FileManager.default.temporaryDirectoryShim
|
||||
.appendingPathComponent("com.kabiroberai.xtool.Staging")
|
||||
.appendingPathComponent("sh.xtool.Staging")
|
||||
|
||||
private var stage: String?
|
||||
|
||||
@@ -299,7 +299,7 @@ public actor IntegratedInstaller {
|
||||
try await self.updateStage(to: "Packaging", initialProgress: nil)
|
||||
|
||||
let ipa = try await compressor.compress(
|
||||
directory: appDir.deletingLastPathComponent(),
|
||||
directory: payload,
|
||||
progress: { progress in
|
||||
self.queueUpdateTask {
|
||||
$0.updateProgressIgnoringCancellation(to: progress)
|
||||
|
||||
@@ -21,7 +21,7 @@ You can update your app's bundle ID by editing the `bundleID` field in `xtool.ym
|
||||
|
||||
> Note:
|
||||
>
|
||||
> xtool adds a prefix to your bundle ID when signing and installing the app on a real device. For example, it may update the above bundle id to `SC-1234.com.example.Hello`. This is because, at least with free accounts (those not enrolled in the Apple Developer Program), two accounts cannot use the same bundle ID. Prefixing ensures that if you share your app with someone else, they won't run into a bundle ID conflict when installing it.
|
||||
> xtool adds a prefix to your bundle ID when signing and installing the app on a real device. For example, it may update the above bundle id to `XTL-1234.com.example.Hello`. This is because, at least with free accounts (those not enrolled in the Apple Developer Program), two accounts cannot use the same bundle ID. Prefixing ensures that if you share your app with someone else, they won't run into a bundle ID conflict when installing it.
|
||||
>
|
||||
> With additional engineering effort, this limitation could be lifted for paid Developer Program users by leveraging wildcard provisioning profiles. If you have a concrete use case for this and/or wish to contribute, please [file an issue](https://github.com/xtool-org/xtool/issues/new).
|
||||
|
||||
@@ -1,9 +1,15 @@
|
||||
# ``xtool``
|
||||
# ``XToolDocs``
|
||||
|
||||
@Metadata {
|
||||
@DisplayName("xtool")
|
||||
}
|
||||
|
||||
Cross-platform Xcode replacement.
|
||||
|
||||
## Overview
|
||||
|
||||
[View on GitHub](https://github.com/xtool-org/xtool)
|
||||
|
||||
xtool is a cross-platform (Linux/WSL/macOS) tool that replicates Xcode functionality with open standards.
|
||||
|
||||
✅ Build a SwiftPM package into an iOS app
|
||||
@@ -1,6 +1,6 @@
|
||||
@Tutorial(time: 30) {
|
||||
@Intro(title: "Build your first iOS app on Linux") {
|
||||
Once you've completed <doc:Installation-Linux>, use xtool to build and deploy an iOS app from your Linux machine.
|
||||
@Intro(title: "Build your first iOS app on Linux / Windows") {
|
||||
Once you've completed <doc:Installation-Linux>, use xtool to build and deploy an iOS app from your Linux/Windows machine.
|
||||
}
|
||||
|
||||
@Section(title: "Create an xtool project") {
|
||||
@@ -118,7 +118,7 @@
|
||||
@Step {
|
||||
Follow the instructions to configure [SourceKit-LSP](https://github.com/swiftlang/sourcekit-lsp/blob/242609dcad55824d9eb23269c0aeead187fd0faa/Documentation/Editor%20Integration.md) for your IDE.
|
||||
|
||||
For example, if you're using Visual Studio Code, this means you need to install the [Swift extension](https://marketplace.visualstudio.com/items?itemName=swiftlang.swift-vscode).
|
||||
For example, if you're using Visual Studio Code, this means you need to install the [Swift extension](https://marketplace.visualstudio.com/items?itemName=swiftlang.swift-vscode). If you're on Windows, make sure you're [connected to the WSL remote](https://code.visualstudio.com/docs/remote/wsl).
|
||||
|
||||
@Image(source: "SwiftExtension", alt: "Swift extension for VSCode")
|
||||
}
|
||||
@@ -1,13 +1,19 @@
|
||||
# Installation (Linux)
|
||||
# Installation (Linux/Windows)
|
||||
|
||||
Set up xtool for iOS app development on Linux.
|
||||
Set up xtool for iOS app development on Linux or Windows.
|
||||
|
||||
## Overview
|
||||
|
||||
This article outlines the steps to install `xtool` and begin developing iOS apps on Linux.
|
||||
This article outlines the steps to install `xtool` and begin developing iOS apps on Linux (or Windows via WSL).
|
||||
|
||||
## Prerequisites
|
||||
|
||||
### WSL (for Windows users)
|
||||
|
||||
If you're on Windows, you can use xtool via [Windows Subsystem for Linux](https://learn.microsoft.com/en-us/windows/wsl/install) (WSL).
|
||||
|
||||
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.
|
||||
|
||||
### Swift
|
||||
|
||||
Install the Swift 6.1 toolchain for your Linux distribution from <https://swift.org/install/linux>.
|
||||
@@ -58,6 +64,10 @@ sudo apt-get install usbmuxd
|
||||
|
||||
Download **Xcode 16.3** from <https://developer.apple.com/services-account/download?path=/Developer_Tools/Xcode_16.3/Xcode_16.3.xip>. Note the path where `Xcode_16.3.xip` is saved.
|
||||
|
||||
> Note:
|
||||
>
|
||||
> The URL above requires authentication, so make sure to visit it in your browser rather than running `curl`. You'll be asked to log in with your Apple ID and accept the license agreement to download Xcode.
|
||||
|
||||
## Installation
|
||||
|
||||
### 1. Download xtool
|
||||
@@ -29,27 +29,19 @@ swift --version
|
||||
|
||||
## Installation
|
||||
|
||||
### 1. Build xtool
|
||||
### 1. Download xtool
|
||||
|
||||
You currently have to build xtool from source on macOS, via Swift Package Manager.
|
||||
If you have [Homebrew](https://brew.sh), you can install xtool with
|
||||
|
||||
```bash
|
||||
git clone https://github.com/xtool-org/xtool
|
||||
# Cloning into 'xtool'...
|
||||
# Resolving deltas: 100% (1795/1795), done.
|
||||
cd xtool
|
||||
swift build -c release --product xtool
|
||||
# Building for production...
|
||||
# [503/503] Linking xtool
|
||||
# Build of product 'xtool' complete! (67.64s)
|
||||
sudo ln -s "$PWD/.build/release/xtool" /usr/local/bin/xtool
|
||||
brew install xtool-org/tap/xtool
|
||||
```
|
||||
|
||||
> Important:
|
||||
Otherwise, you can download `xtool.app` from the [latest GitHub release](https://github.com/xtool-org/xtool/releases/latest). After moving it into `/Applications`, launch it and run the suggested script to add the `xtool` command to your `PATH`.
|
||||
|
||||
> Note:
|
||||
>
|
||||
> The SwiftPM build currently references relative libraries and resources. This means you can't just `mv` the built `xtool` binary, hence the usage of `ln` to symlink instead. Make sure you **don't delete the directory where you cloned xtool**.
|
||||
>
|
||||
> The plan is to make macOS installation easier and more self-contained in the future by shipping xtool as a `.app`, Homebrew Cask, etc. If you would like to contribute, feel free to reach out via [GitHub Issues](https://github.com/xtool-org/xtool/issues/new).
|
||||
> If you install xtool manually, you'll also need to check for new GitHub releases and update it yourself. If you're interested in contributing support for auto-updates through Sparkle, pull requests are appreciated. See [issue #34 on GitHub](https://github.com/xtool-org/xtool/issues/34).
|
||||
|
||||
Confirm that xtool is installed correctly:
|
||||
|
||||
|
Before Width: | Height: | Size: 286 KiB After Width: | Height: | Size: 286 KiB |
|
Before Width: | Height: | Size: 948 KiB After Width: | Height: | Size: 948 KiB |
|
Before Width: | Height: | Size: 84 KiB After Width: | Height: | Size: 84 KiB |
|
Before Width: | Height: | Size: 61 KiB After Width: | Height: | Size: 61 KiB |
|
Before Width: | Height: | Size: 61 KiB After Width: | Height: | Size: 61 KiB |
|
Before Width: | Height: | Size: 5.0 MiB After Width: | Height: | Size: 5.0 MiB |
|
Before Width: | Height: | Size: 222 KiB After Width: | Height: | Size: 222 KiB |
|
Before Width: | Height: | Size: 316 KiB After Width: | Height: | Size: 316 KiB |
|
Before Width: | Height: | Size: 232 KiB After Width: | Height: | Size: 232 KiB |
|
Before Width: | Height: | Size: 142 KiB After Width: | Height: | Size: 142 KiB |
|
Before Width: | Height: | Size: 2.3 MiB After Width: | Height: | Size: 2.3 MiB |
|
Before Width: | Height: | Size: 127 KiB After Width: | Height: | Size: 127 KiB |
@@ -2,6 +2,7 @@ import Foundation
|
||||
import ArgumentParser
|
||||
import PackLib
|
||||
import XKit
|
||||
import Dependencies
|
||||
|
||||
struct PackOperation {
|
||||
struct BuildOptions: ParsableArguments {
|
||||
@@ -85,8 +86,42 @@ struct DevBuildCommand: AsyncParsableCommand {
|
||||
|
||||
@OptionGroup var packOptions: PackOperation.BuildOptions
|
||||
|
||||
@Flag(
|
||||
help: "Output a .ipa file instead of a .app"
|
||||
) var ipa = false
|
||||
|
||||
func run() async throws {
|
||||
try await PackOperation(buildOptions: packOptions).run()
|
||||
let url = try await PackOperation(
|
||||
buildOptions: packOptions
|
||||
).run()
|
||||
|
||||
let finalURL: URL
|
||||
if ipa {
|
||||
@Dependency(\.zipCompressor) var compressor
|
||||
finalURL = url.deletingPathExtension().appendingPathExtension("ipa")
|
||||
let tmpDir = try TemporaryDirectory(name: "sh.xtool.tmp")
|
||||
let payloadDir = tmpDir.url.appendingPathComponent("Payload", isDirectory: true)
|
||||
try FileManager.default.createDirectory(
|
||||
at: payloadDir,
|
||||
withIntermediateDirectories: true
|
||||
)
|
||||
try FileManager.default.moveItem(at: url, to: payloadDir.appendingPathComponent(url.lastPathComponent))
|
||||
let ipaURL = try await compressor.compress(directory: payloadDir) { progress in
|
||||
if let progress {
|
||||
let percent = Int(progress * 100)
|
||||
print("\rPackaging... \(percent)%", terminator: "")
|
||||
} else {
|
||||
print("\rPackaging...", terminator: "")
|
||||
}
|
||||
}
|
||||
print()
|
||||
try? FileManager.default.removeItem(at: finalURL)
|
||||
try FileManager.default.moveItem(at: ipaURL, to: finalURL)
|
||||
} else {
|
||||
finalURL = url
|
||||
}
|
||||
|
||||
print("Wrote to \(finalURL.path)")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -79,7 +79,7 @@ struct NewCommand: AsyncParsableCommand {
|
||||
.macOS(.v14),
|
||||
],
|
||||
products: [
|
||||
// An xtool project should contain exactly one library target,
|
||||
// An xtool project should contain exactly one library product,
|
||||
// representing the main app.
|
||||
.library(
|
||||
name: "\(moduleName)",
|
||||
@@ -116,7 +116,6 @@ struct NewCommand: AsyncParsableCommand {
|
||||
.netrc
|
||||
|
||||
/xtool
|
||||
/.sourcekit-lsp
|
||||
"""
|
||||
),
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ extension ZIPCompressor: DependencyKey {
|
||||
let zip = Process()
|
||||
zip.executableURL = try await ToolRegistry.locate("zip")
|
||||
zip.currentDirectoryURL = dir.deletingLastPathComponent()
|
||||
zip.arguments = ["-yqru0", dest.path, "Payload"]
|
||||
zip.arguments = ["-yqru0", dest.path, dir.lastPathComponent]
|
||||
try await zip.runUntilExit()
|
||||
|
||||
return dest
|
||||
|
||||
@@ -149,7 +149,7 @@ struct SDKBuilder {
|
||||
}
|
||||
|
||||
private func installToolset(in output: URL) async throws {
|
||||
// tag from https://github.com/kabiroberai/darwin-tools-linux-llvm
|
||||
// tag from https://github.com/xtool-org/darwin-tools-linux-llvm
|
||||
let darwinToolsVersion = "1.0.1"
|
||||
|
||||
let toolsetDir = output.appendingPathComponent("toolset")
|
||||
@@ -169,7 +169,7 @@ struct SDKBuilder {
|
||||
|
||||
@Dependency(\.httpClient) var httpClient
|
||||
let url = URL(string: """
|
||||
https://github.com/kabiroberai/darwin-tools-linux-llvm/releases/download/\
|
||||
https://github.com/xtool-org/darwin-tools-linux-llvm/releases/download/\
|
||||
v\(darwinToolsVersion)/toolset-\(arch.rawValue).tar.gz
|
||||
""")!
|
||||
let (response, body) = try await httpClient.send(HTTPRequest(url: url))
|
||||
|
||||
@@ -13,6 +13,7 @@ struct SDKCommand: AsyncParsableCommand {
|
||||
DevSDKInstallCommand.self,
|
||||
DevSDKRemoveCommand.self,
|
||||
DevSDKBuildCommand.self,
|
||||
DevSDKStatusCommand.self,
|
||||
],
|
||||
defaultSubcommand: DevSDKInstallCommand.self
|
||||
)
|
||||
@@ -98,7 +99,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()
|
||||
@@ -106,11 +107,22 @@ struct DevSDKRemoveCommand: AsyncParsableCommand {
|
||||
}
|
||||
}
|
||||
|
||||
struct DarwinSDK {
|
||||
private static let sdksDir = URL(fileURLWithPath: NSHomeDirectory())
|
||||
.appendingPathComponent(".swiftpm/swift-sdks")
|
||||
.resolvingSymlinksInPath()
|
||||
struct DevSDKStatusCommand: AsyncParsableCommand {
|
||||
static let configuration = CommandConfiguration(
|
||||
commandName: "status",
|
||||
abstract: "Get the status of the Darwin Swift SDK"
|
||||
)
|
||||
|
||||
func run() async throws {
|
||||
if let sdk = try await DarwinSDK.current() {
|
||||
print("Installed at \(sdk.bundle.path)")
|
||||
} else {
|
||||
print("Not installed")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct DarwinSDK {
|
||||
let bundle: URL
|
||||
let version: String
|
||||
|
||||
@@ -126,35 +138,55 @@ struct DarwinSDK {
|
||||
}
|
||||
}
|
||||
|
||||
@discardableResult
|
||||
static func install(movingFrom path: String) throws -> DarwinSDK {
|
||||
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)'")}
|
||||
let targetURL = sdksDir.appendingPathComponent("darwin.artifactbundle")
|
||||
if targetURL.exists {
|
||||
throw Console.Error("Darwin SDK is already installed at '\(targetURL.path)'. Please remove it first.")
|
||||
}
|
||||
try FileManager.default.moveItem(at: url, to: targetURL)
|
||||
guard let sdk = DarwinSDK(bundle: targetURL) else {
|
||||
throw Console.Error("Darwin SDK failed to install")
|
||||
}
|
||||
return sdk
|
||||
|
||||
let process = Process()
|
||||
process.executableURL = try await ToolRegistry.locate("swift")
|
||||
process.arguments = ["sdk", "install", url.path]
|
||||
try await process.runUntilExit()
|
||||
}
|
||||
|
||||
static func current() throws -> DarwinSDK? {
|
||||
let sdks = (try? FileManager.default.contentsOfDirectory(at: sdksDir, includingPropertiesForKeys: nil)) ?? []
|
||||
let darwinSDKs = sdks.compactMap { DarwinSDK(bundle: $0) }
|
||||
switch darwinSDKs.count {
|
||||
case 0:
|
||||
static func current() async throws -> DarwinSDK? {
|
||||
let output = Pipe()
|
||||
|
||||
let process = Process()
|
||||
process.executableURL = try await ToolRegistry.locate("swift")
|
||||
process.arguments = ["sdk", "configure", "darwin", "arm64-apple-ios", "--show-configuration"]
|
||||
process.standardOutput = output
|
||||
process.standardError = FileHandle.nullDevice
|
||||
|
||||
async let outputData = Data(reading: output.fileHandleForReading)
|
||||
|
||||
do {
|
||||
try await process.runUntilExit()
|
||||
} catch Process.Failure.exit {
|
||||
return nil
|
||||
case 1:
|
||||
return darwinSDKs[0]
|
||||
default:
|
||||
throw Console.Error("""
|
||||
You have multiple copies of the Darwin SDK installed. Please delete all but one to continue.
|
||||
\(darwinSDKs.map { "- \($0.bundle.path) (version '\($0.version)')" }.joined(separator: "\n"))
|
||||
""")
|
||||
}
|
||||
|
||||
// should be something like
|
||||
// swiftResourcesPath: /home/user/.swiftpm/swift-sdks/darwin.artifactbundle/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift
|
||||
let resourcesPathPrefix = "swiftResourcesPath: "
|
||||
let outputString = String(decoding: try await outputData, as: UTF8.self)
|
||||
|
||||
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 {
|
||||
@@ -209,7 +241,7 @@ struct InstallSDKOperation {
|
||||
#if os(macOS)
|
||||
print("Skipping SDK install; the iOS SDK ships with Xcode on macOS")
|
||||
#else
|
||||
if let sdk = try DarwinSDK.current() {
|
||||
if let sdk = try await DarwinSDK.current() {
|
||||
print("Removing existing SDK...")
|
||||
try sdk.remove()
|
||||
}
|
||||
@@ -221,12 +253,10 @@ struct InstallSDKOperation {
|
||||
let builder = SDKBuilder(input: input, outputPath: tempDir.url.path, arch: arch)
|
||||
let sdkPath = try await builder.buildSDK()
|
||||
|
||||
try DarwinSDK.install(movingFrom: sdkPath)
|
||||
try await DarwinSDK.install(from: sdkPath)
|
||||
|
||||
// don't destroy tempDir before this point
|
||||
withExtendedLifetime(tempDir) {}
|
||||
|
||||
print("Installed darwin.artifactbundle")
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,9 +25,11 @@ struct SetupOperation {
|
||||
try await AuthOperation(logoutFromExisting: false, quiet: quiet).run()
|
||||
|
||||
#if os(macOS)
|
||||
print("Skipping Darwin SDK setup since we're on macOS.")
|
||||
if !quiet {
|
||||
print("Skipping Darwin SDK setup since we're on macOS.")
|
||||
}
|
||||
#else
|
||||
switch try DarwinSDK.current()?.isUpToDate() {
|
||||
switch try await DarwinSDK.current()?.isUpToDate() {
|
||||
case true?:
|
||||
if !quiet {
|
||||
print("Darwin SDK is up to date.")
|
||||
|
||||
@@ -9,13 +9,9 @@ enum XToolMain {
|
||||
static func main() async throws {
|
||||
prepareDependencies { dependencies in
|
||||
#warning("Improve persistence mechanism")
|
||||
// for macOS, we can use KeychainStorage but we need to sign with entitlements.
|
||||
// for Windows, we could use dpapi.h or wincred.h.
|
||||
// for Linux, maybe use libsecret?
|
||||
// see https://github.com/atom/node-keytar
|
||||
// #if os(macOS)
|
||||
// dependencies.keyValueStorage = KeychainStorage(service: "com.kabiroberai.xtool-keychain.credentials")
|
||||
// #endif
|
||||
}
|
||||
try await XTool.run()
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
/XToolMac.xcodeproj
|
||||
Private*.xcconfig
|
||||
|
||||
/fastlane/README.md
|
||||
/fastlane/report.xml
|
||||
/Build
|
||||
/Private
|
||||
@@ -0,0 +1 @@
|
||||
3.4.3
|
||||
@@ -0,0 +1,9 @@
|
||||
source 'https://rubygems.org'
|
||||
|
||||
gem 'fastlane'
|
||||
gem 'fastlane-plugin-xcodegen'
|
||||
|
||||
# https://github.com/fastlane/fastlane/issues/29183#issuecomment-2567093826
|
||||
gem "abbrev"
|
||||
gem "mutex_m"
|
||||
gem "ostruct"
|
||||
@@ -0,0 +1,236 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
CFPropertyList (3.0.7)
|
||||
base64
|
||||
nkf
|
||||
rexml
|
||||
abbrev (0.1.2)
|
||||
addressable (2.8.7)
|
||||
public_suffix (>= 2.0.2, < 7.0)
|
||||
artifactory (3.0.17)
|
||||
atomos (0.1.3)
|
||||
aws-eventstream (1.3.2)
|
||||
aws-partitions (1.1102.0)
|
||||
aws-sdk-core (3.223.0)
|
||||
aws-eventstream (~> 1, >= 1.3.0)
|
||||
aws-partitions (~> 1, >= 1.992.0)
|
||||
aws-sigv4 (~> 1.9)
|
||||
base64
|
||||
jmespath (~> 1, >= 1.6.1)
|
||||
logger
|
||||
aws-sdk-kms (1.100.0)
|
||||
aws-sdk-core (~> 3, >= 3.216.0)
|
||||
aws-sigv4 (~> 1.5)
|
||||
aws-sdk-s3 (1.185.0)
|
||||
aws-sdk-core (~> 3, >= 3.216.0)
|
||||
aws-sdk-kms (~> 1)
|
||||
aws-sigv4 (~> 1.5)
|
||||
aws-sigv4 (1.11.0)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
babosa (1.0.4)
|
||||
base64 (0.2.0)
|
||||
claide (1.1.0)
|
||||
colored (1.2)
|
||||
colored2 (3.1.2)
|
||||
commander (4.6.0)
|
||||
highline (~> 2.0.0)
|
||||
declarative (0.0.20)
|
||||
digest-crc (0.7.0)
|
||||
rake (>= 12.0.0, < 14.0.0)
|
||||
domain_name (0.6.20240107)
|
||||
dotenv (2.8.1)
|
||||
emoji_regex (3.2.3)
|
||||
excon (0.112.0)
|
||||
faraday (1.10.4)
|
||||
faraday-em_http (~> 1.0)
|
||||
faraday-em_synchrony (~> 1.0)
|
||||
faraday-excon (~> 1.1)
|
||||
faraday-httpclient (~> 1.0)
|
||||
faraday-multipart (~> 1.0)
|
||||
faraday-net_http (~> 1.0)
|
||||
faraday-net_http_persistent (~> 1.0)
|
||||
faraday-patron (~> 1.0)
|
||||
faraday-rack (~> 1.0)
|
||||
faraday-retry (~> 1.0)
|
||||
ruby2_keywords (>= 0.0.4)
|
||||
faraday-cookie_jar (0.0.7)
|
||||
faraday (>= 0.8.0)
|
||||
http-cookie (~> 1.0.0)
|
||||
faraday-em_http (1.0.0)
|
||||
faraday-em_synchrony (1.0.0)
|
||||
faraday-excon (1.1.0)
|
||||
faraday-httpclient (1.0.1)
|
||||
faraday-multipart (1.1.0)
|
||||
multipart-post (~> 2.0)
|
||||
faraday-net_http (1.0.2)
|
||||
faraday-net_http_persistent (1.2.0)
|
||||
faraday-patron (1.0.0)
|
||||
faraday-rack (1.0.0)
|
||||
faraday-retry (1.0.3)
|
||||
faraday_middleware (1.2.1)
|
||||
faraday (~> 1.0)
|
||||
fastimage (2.4.0)
|
||||
fastlane (2.227.2)
|
||||
CFPropertyList (>= 2.3, < 4.0.0)
|
||||
addressable (>= 2.8, < 3.0.0)
|
||||
artifactory (~> 3.0)
|
||||
aws-sdk-s3 (~> 1.0)
|
||||
babosa (>= 1.0.3, < 2.0.0)
|
||||
bundler (>= 1.12.0, < 3.0.0)
|
||||
colored (~> 1.2)
|
||||
commander (~> 4.6)
|
||||
dotenv (>= 2.1.1, < 3.0.0)
|
||||
emoji_regex (>= 0.1, < 4.0)
|
||||
excon (>= 0.71.0, < 1.0.0)
|
||||
faraday (~> 1.0)
|
||||
faraday-cookie_jar (~> 0.0.6)
|
||||
faraday_middleware (~> 1.0)
|
||||
fastimage (>= 2.1.0, < 3.0.0)
|
||||
fastlane-sirp (>= 1.0.0)
|
||||
gh_inspector (>= 1.1.2, < 2.0.0)
|
||||
google-apis-androidpublisher_v3 (~> 0.3)
|
||||
google-apis-playcustomapp_v1 (~> 0.1)
|
||||
google-cloud-env (>= 1.6.0, < 2.0.0)
|
||||
google-cloud-storage (~> 1.31)
|
||||
highline (~> 2.0)
|
||||
http-cookie (~> 1.0.5)
|
||||
json (< 3.0.0)
|
||||
jwt (>= 2.1.0, < 3)
|
||||
mini_magick (>= 4.9.4, < 5.0.0)
|
||||
multipart-post (>= 2.0.0, < 3.0.0)
|
||||
naturally (~> 2.2)
|
||||
optparse (>= 0.1.1, < 1.0.0)
|
||||
plist (>= 3.1.0, < 4.0.0)
|
||||
rubyzip (>= 2.0.0, < 3.0.0)
|
||||
security (= 0.1.5)
|
||||
simctl (~> 1.6.3)
|
||||
terminal-notifier (>= 2.0.0, < 3.0.0)
|
||||
terminal-table (~> 3)
|
||||
tty-screen (>= 0.6.3, < 1.0.0)
|
||||
tty-spinner (>= 0.8.0, < 1.0.0)
|
||||
word_wrap (~> 1.0.0)
|
||||
xcodeproj (>= 1.13.0, < 2.0.0)
|
||||
xcpretty (~> 0.4.1)
|
||||
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
|
||||
fastlane-plugin-brew (0.1.1)
|
||||
fastlane-plugin-xcodegen (1.1.0)
|
||||
fastlane-plugin-brew (~> 0.1.1)
|
||||
fastlane-sirp (1.0.0)
|
||||
sysrandom (~> 1.0)
|
||||
gh_inspector (1.1.3)
|
||||
google-apis-androidpublisher_v3 (0.54.0)
|
||||
google-apis-core (>= 0.11.0, < 2.a)
|
||||
google-apis-core (0.11.3)
|
||||
addressable (~> 2.5, >= 2.5.1)
|
||||
googleauth (>= 0.16.2, < 2.a)
|
||||
httpclient (>= 2.8.1, < 3.a)
|
||||
mini_mime (~> 1.0)
|
||||
representable (~> 3.0)
|
||||
retriable (>= 2.0, < 4.a)
|
||||
rexml
|
||||
google-apis-iamcredentials_v1 (0.17.0)
|
||||
google-apis-core (>= 0.11.0, < 2.a)
|
||||
google-apis-playcustomapp_v1 (0.13.0)
|
||||
google-apis-core (>= 0.11.0, < 2.a)
|
||||
google-apis-storage_v1 (0.31.0)
|
||||
google-apis-core (>= 0.11.0, < 2.a)
|
||||
google-cloud-core (1.8.0)
|
||||
google-cloud-env (>= 1.0, < 3.a)
|
||||
google-cloud-errors (~> 1.0)
|
||||
google-cloud-env (1.6.0)
|
||||
faraday (>= 0.17.3, < 3.0)
|
||||
google-cloud-errors (1.5.0)
|
||||
google-cloud-storage (1.47.0)
|
||||
addressable (~> 2.8)
|
||||
digest-crc (~> 0.4)
|
||||
google-apis-iamcredentials_v1 (~> 0.1)
|
||||
google-apis-storage_v1 (~> 0.31.0)
|
||||
google-cloud-core (~> 1.6)
|
||||
googleauth (>= 0.16.2, < 2.a)
|
||||
mini_mime (~> 1.0)
|
||||
googleauth (1.8.1)
|
||||
faraday (>= 0.17.3, < 3.a)
|
||||
jwt (>= 1.4, < 3.0)
|
||||
multi_json (~> 1.11)
|
||||
os (>= 0.9, < 2.0)
|
||||
signet (>= 0.16, < 2.a)
|
||||
highline (2.0.3)
|
||||
http-cookie (1.0.8)
|
||||
domain_name (~> 0.5)
|
||||
httpclient (2.9.0)
|
||||
mutex_m
|
||||
jmespath (1.6.2)
|
||||
json (2.11.3)
|
||||
jwt (2.10.1)
|
||||
base64
|
||||
logger (1.7.0)
|
||||
mini_magick (4.13.2)
|
||||
mini_mime (1.1.5)
|
||||
multi_json (1.15.0)
|
||||
multipart-post (2.4.1)
|
||||
mutex_m (0.3.0)
|
||||
nanaimo (0.4.0)
|
||||
naturally (2.2.1)
|
||||
nkf (0.2.0)
|
||||
optparse (0.6.0)
|
||||
os (1.1.4)
|
||||
ostruct (0.6.1)
|
||||
plist (3.7.2)
|
||||
public_suffix (6.0.2)
|
||||
rake (13.2.1)
|
||||
representable (3.2.0)
|
||||
declarative (< 0.1.0)
|
||||
trailblazer-option (>= 0.1.1, < 0.2.0)
|
||||
uber (< 0.2.0)
|
||||
retriable (3.1.2)
|
||||
rexml (3.4.1)
|
||||
rouge (3.28.0)
|
||||
ruby2_keywords (0.0.5)
|
||||
rubyzip (2.4.1)
|
||||
security (0.1.5)
|
||||
signet (0.20.0)
|
||||
addressable (~> 2.8)
|
||||
faraday (>= 0.17.5, < 3.a)
|
||||
jwt (>= 1.5, < 3.0)
|
||||
multi_json (~> 1.10)
|
||||
simctl (1.6.10)
|
||||
CFPropertyList
|
||||
naturally
|
||||
sysrandom (1.0.5)
|
||||
terminal-notifier (2.0.0)
|
||||
terminal-table (3.0.2)
|
||||
unicode-display_width (>= 1.1.1, < 3)
|
||||
trailblazer-option (0.1.2)
|
||||
tty-cursor (0.7.1)
|
||||
tty-screen (0.8.2)
|
||||
tty-spinner (0.9.3)
|
||||
tty-cursor (~> 0.7)
|
||||
uber (0.1.0)
|
||||
unicode-display_width (2.6.0)
|
||||
word_wrap (1.0.0)
|
||||
xcodeproj (1.27.0)
|
||||
CFPropertyList (>= 2.3.3, < 4.0)
|
||||
atomos (~> 0.1.3)
|
||||
claide (>= 1.0.2, < 2.0)
|
||||
colored2 (~> 3.1)
|
||||
nanaimo (~> 0.4.0)
|
||||
rexml (>= 3.3.6, < 4.0)
|
||||
xcpretty (0.4.1)
|
||||
rouge (~> 3.28.0)
|
||||
xcpretty-travis-formatter (1.0.1)
|
||||
xcpretty (~> 0.2, >= 0.0.7)
|
||||
|
||||
PLATFORMS
|
||||
arm64-darwin-24
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
abbrev
|
||||
fastlane
|
||||
fastlane-plugin-xcodegen
|
||||
mutex_m
|
||||
ostruct
|
||||
|
||||
BUNDLED WITH
|
||||
2.6.7
|
||||
@@ -0,0 +1,11 @@
|
||||
# macOS Packaging
|
||||
|
||||
xtool is packaged as a .app bundle on macOS, so that we can add entitlements and use the keychain.
|
||||
|
||||
Ideally we'd dogfood xtool to package xtool, but it only supports iOS apps right now. Someday, hopefully.
|
||||
|
||||
## Building
|
||||
|
||||
1. Install [XcodeGen](https://github.com/yonaskolb/XcodeGen)
|
||||
2. Run `xcodegen` inside this (`./macOS`) directory
|
||||
3. Open the Xcode project and build the `XToolMac` scheme
|
||||
@@ -0,0 +1,22 @@
|
||||
#!/bin/bash
|
||||
|
||||
# https://github.com/microsoft/vscode/blob/509cc674f24d87a298d56518c318de67bda357cb/resources/darwin/bin/code.sh
|
||||
|
||||
function app_realpath() {
|
||||
SOURCE="$1"
|
||||
while [ -h "$SOURCE" ]; do
|
||||
DIR=$(/usr/bin/dirname "$SOURCE")
|
||||
SOURCE=$(/usr/bin/readlink "$SOURCE")
|
||||
[[ "$SOURCE" != /* ]] && SOURCE="$DIR/$SOURCE"
|
||||
done
|
||||
SOURCE_DIR="$( cd -P "$( /usr/bin/dirname "$SOURCE" )" >/dev/null 2>&1 && echo "$PWD" )"
|
||||
echo "${SOURCE_DIR%%${SOURCE_DIR#*.app}}"
|
||||
}
|
||||
|
||||
APP_PATH="$(app_realpath "${BASH_SOURCE[0]}")"
|
||||
if [ -z "$APP_PATH" ]; then
|
||||
echo "Unable to determine app path from symlink : ${BASH_SOURCE[0]}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
XTL_CLI=1 "$APP_PATH/Contents/MacOS/xtool" "$@"
|
||||
@@ -0,0 +1,9 @@
|
||||
GENERATE_INFOPLIST_FILE = YES
|
||||
CODE_SIGN_ENTITLEMENTS = Support/XToolMac.entitlements
|
||||
CODE_SIGN_STYLE = Automatic
|
||||
ENABLE_HARDENED_RUNTIME = YES
|
||||
|
||||
PRODUCT_NAME = xtool
|
||||
PRODUCT_MODULE_NAME = XToolMac
|
||||
|
||||
#include? "Private.xcconfig"
|
||||
@@ -0,0 +1 @@
|
||||
#include "Base.xcconfig"
|
||||
@@ -0,0 +1 @@
|
||||
#include "Base.xcconfig"
|
||||
@@ -0,0 +1,10 @@
|
||||
<?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>keychain-access-groups</key>
|
||||
<array>
|
||||
<string>$(AppIdentifierPrefix)sh.xtool.keychain</string>
|
||||
</array>
|
||||
</dict>
|
||||
</plist>
|
||||
@@ -0,0 +1,24 @@
|
||||
import Foundation
|
||||
import Dependencies
|
||||
import XToolSupport
|
||||
import XKit
|
||||
|
||||
@main enum XToolMacMain {
|
||||
static func main() async throws {
|
||||
// the bin/xtool script invokes us with this env var, allowing us to
|
||||
// detect command-line invocations vs a UI app launch
|
||||
if ProcessInfo.processInfo.environment["XTL_CLI"] == "1" {
|
||||
try await runXTool()
|
||||
} else {
|
||||
XToolMacUI.main()
|
||||
}
|
||||
}
|
||||
|
||||
private static func runXTool() async throws {
|
||||
try await withDependencies {
|
||||
$0.keyValueStorage = KeychainStorage(service: "sh.xtool.keychain.credentials")
|
||||
} operation: {
|
||||
try await XTool.run()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,79 @@
|
||||
import SwiftUI
|
||||
|
||||
struct XToolMacUI: App {
|
||||
var body: some Scene {
|
||||
WindowGroup {
|
||||
ContentView()
|
||||
}
|
||||
.disableWindowResizingIfPossible()
|
||||
}
|
||||
}
|
||||
|
||||
private struct ContentView: View {
|
||||
private static let command = """
|
||||
sudo ln -fs /Applications/xtool.app/Contents/Resources/bin/xtool /usr/local/bin/xtool
|
||||
"""
|
||||
|
||||
var body: some View {
|
||||
VStack(alignment: .leading, spacing: 16) {
|
||||
StepView(1) {
|
||||
Text("Move this app into your `/Applications` folder.")
|
||||
}
|
||||
|
||||
StepView(2) {
|
||||
VStack(alignment: .leading, spacing: 16) {
|
||||
Text("Symlink xtool into a location on your `PATH`.")
|
||||
|
||||
Text(Self.command)
|
||||
.font(.body.monospaced())
|
||||
.textSelection(.enabled)
|
||||
|
||||
Button("Copy Command") {
|
||||
NSPasteboard.general.clearContents()
|
||||
NSPasteboard.general.setString(Self.command, forType: .string)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.padding()
|
||||
.padding(.vertical)
|
||||
.frame(width: 500)
|
||||
.fixedSize()
|
||||
.navigationTitle("xtool")
|
||||
}
|
||||
}
|
||||
|
||||
private struct StepView<Content: View>: View {
|
||||
let number: Int
|
||||
let content: Content
|
||||
|
||||
init(_ number: Int, @ViewBuilder content: () -> Content) {
|
||||
self.number = number
|
||||
self.content = content()
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
HStack(alignment: .firstTextBaseline) {
|
||||
Text("\(number)")
|
||||
.foregroundStyle(.background)
|
||||
.padding(8)
|
||||
.background(.secondary, in: .circle)
|
||||
|
||||
content
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extension Scene {
|
||||
fileprivate func disableWindowResizingIfPossible() -> some Scene {
|
||||
if #available(macOS 13, *) {
|
||||
return self.windowResizability(.contentSize)
|
||||
} else {
|
||||
return self
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#Preview {
|
||||
ContentView()
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
app_identifier("sh.xtool.XToolMac")
|
||||
@@ -0,0 +1,66 @@
|
||||
default_platform(:mac)
|
||||
|
||||
ENV["FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT"] = "120"
|
||||
|
||||
lane :package do
|
||||
xcodegen
|
||||
|
||||
# Config is controlled via env vars
|
||||
app_store_connect_api_key(
|
||||
is_key_content_base64: true,
|
||||
)
|
||||
|
||||
create_keychain(
|
||||
name: "xtool.keychain",
|
||||
password: "",
|
||||
unlock: true,
|
||||
)
|
||||
|
||||
unlock_keychain(
|
||||
path: "xtool.keychain",
|
||||
password: "",
|
||||
)
|
||||
|
||||
Tempfile.create(["Identity", ".p12"]) do |file|
|
||||
file.write(Base64.decode64(ENV["IDENTITY_P12"]))
|
||||
file.close
|
||||
import_certificate(
|
||||
certificate_path: file.path,
|
||||
keychain_name: "xtool.keychain",
|
||||
keychain_password: "",
|
||||
)
|
||||
end
|
||||
|
||||
sigh(
|
||||
platform: "macos",
|
||||
output_path: "./Build/Signing",
|
||||
force: true,
|
||||
developer_id: true,
|
||||
)
|
||||
|
||||
update_code_signing_settings(
|
||||
use_automatic_signing: false,
|
||||
team_id: ENV["DEVELOPMENT_TEAM"],
|
||||
code_sign_identity: "Developer ID Application",
|
||||
profile_name: lane_context[SharedValues::SIGH_NAME],
|
||||
)
|
||||
|
||||
gym(
|
||||
export_method: "developer-id",
|
||||
output_directory: "./Build/Output",
|
||||
)
|
||||
|
||||
notarize(
|
||||
package: "./Build/Output/xtool.app",
|
||||
)
|
||||
|
||||
# we need to re-package after notarization and stapling.
|
||||
# we have to use `ditto --sequesterRsrc` rather than zip
|
||||
# because the default strategy stores resource forks as
|
||||
# ._Foo but codesigning doesn't like that, and instead
|
||||
# wants them in __MACOSX.
|
||||
sh(
|
||||
"ditto", "-c", "-k", "--keepParent", "--sequesterRsrc",
|
||||
"../Build/Output/xtool.app", "../Build/Output/xtool.app.zip",
|
||||
)
|
||||
end
|
||||
@@ -0,0 +1,27 @@
|
||||
name: XToolMac
|
||||
options:
|
||||
bundleIdPrefix: sh.xtool
|
||||
packages:
|
||||
xtool:
|
||||
path: ..
|
||||
group: ""
|
||||
fileGroups:
|
||||
- Support
|
||||
targets:
|
||||
XToolMac:
|
||||
type: application
|
||||
platform: macOS
|
||||
deploymentTarget: "12.0"
|
||||
sources:
|
||||
- path: XToolMac
|
||||
- path: Resources/xtool
|
||||
buildPhase:
|
||||
copyFiles:
|
||||
destination: resources
|
||||
subpath: bin
|
||||
configFiles:
|
||||
Debug: Support/Debug.xcconfig
|
||||
Release: Support/Release.xcconfig
|
||||
dependencies:
|
||||
- package: xtool
|
||||
product: XToolSupport
|
||||
@@ -0,0 +1,37 @@
|
||||
[build]
|
||||
# by setting a custom base directory, we prevent Netlify from running
|
||||
# `swift build` in the root directory, which builds more targets than
|
||||
# we need.
|
||||
base = "Netlify/"
|
||||
publish = "docs/"
|
||||
command = "./build.sh"
|
||||
environment = { SWIFT_VERSION = "6.1" }
|
||||
ignore = "git -C .. diff --quiet $CACHED_COMMIT_REF $COMMIT_REF -- Sources/XToolDocs Netlify netlify.toml"
|
||||
|
||||
[[redirects]]
|
||||
from = "/"
|
||||
to = "/documentation/xtooldocs/"
|
||||
status = 302
|
||||
force = true
|
||||
|
||||
[[redirects]]
|
||||
from = "/documentation"
|
||||
to = "/documentation/xtooldocs/"
|
||||
status = 302
|
||||
force = true
|
||||
|
||||
[[redirects]]
|
||||
from = "/tutorials"
|
||||
to = "/tutorials/toc"
|
||||
status = 302
|
||||
force = true
|
||||
|
||||
[[redirects]]
|
||||
from = "/documentation/xtool/*"
|
||||
to = "/documentation/xtooldocs/:splat"
|
||||
status = 302
|
||||
|
||||
[[redirects]]
|
||||
from = "/tutorials/xtool/*"
|
||||
to = "/tutorials/xtooldocs/:splat"
|
||||
status = 302
|
||||