Compare commits
1 Commits
@@ -13,25 +13,6 @@ 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$' -->
|
||||
- Host OS (macOS/Linux/WSL):
|
||||
- Host OS version:
|
||||
- Target iOS version:
|
||||
|
||||
@@ -1,11 +1,5 @@
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
pull_request:
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
- push
|
||||
jobs:
|
||||
build-linux:
|
||||
strategy:
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- "*"
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
build-linux:
|
||||
@@ -21,9 +19,7 @@ jobs:
|
||||
uses: actions/checkout@v4
|
||||
- name: Build
|
||||
run: |
|
||||
docker compose run --build \
|
||||
-e XTOOL_VERSION=${{ github.ref_name }} \
|
||||
--rm xtool Linux/build.sh
|
||||
docker compose run --build --rm xtool Linux/build.sh
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
@@ -50,7 +46,6 @@ jobs:
|
||||
APP_STORE_CONNECT_API_KEY_KEY: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY }}
|
||||
IDENTITY_P12: ${{ secrets.IDENTITY_P12 }}
|
||||
DEVELOPMENT_TEAM: ${{ secrets.DEVELOPMENT_TEAM }}
|
||||
XTOOL_VERSION: ${{ github.ref_name }}
|
||||
run: |
|
||||
cd macOS
|
||||
bundle exec fastlane package
|
||||
@@ -77,6 +72,6 @@ jobs:
|
||||
path: output
|
||||
- name: Create and publish release
|
||||
run: |
|
||||
TAG="${{ github.ref_name }}"
|
||||
gh release create "$TAG" --draft --title "v$TAG"
|
||||
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}
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
version: 1
|
||||
builder:
|
||||
configs:
|
||||
- scheme: xtool
|
||||
platform: macosSpm
|
||||
documentation_targets:
|
||||
- xtool
|
||||
- scheme: xtool
|
||||
platform: macosXcodebuild
|
||||
- scheme: xtool
|
||||
platform: linux
|
||||
image: kabiroberai/xtool-dev:latest
|
||||
- scheme: XKit
|
||||
platform: ios
|
||||
@@ -60,7 +60,7 @@ representative at an online or offline event.
|
||||
|
||||
Instances of abusive, harassing, or otherwise unacceptable behavior may be
|
||||
reported to the community leaders responsible for enforcement at
|
||||
conduct@xtool.sh.
|
||||
xtool@kabiroberai.com.
|
||||
All complaints will be reviewed and investigated promptly and fairly.
|
||||
|
||||
All community leaders are obligated to respect the privacy and security of the
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
# Contributing to xtool
|
||||
|
||||
## Bug reports and feature requests
|
||||
|
||||
We welcome all bug reports and feature requests! Please create a [new issue](https://github.com/xtool-org/xtool/issues/new/choose) via GitHub.
|
||||
|
||||
## Documentation
|
||||
|
||||
The xtool documentation at <https://xtool.sh> is built with [swift-docc](https://github.com/swiftlang/swift-docc) and resides at [Documentation/xtool.docc](/Documentation/xtool.docc). It's hosted on Netlify, the configuration for which is in [netlify.toml](/netlify.toml).
|
||||
|
||||
When editing the DocC bundle, you can preview it with `make docs-preview`.
|
||||
|
||||
Once you make a pull request with your changes, we'll also generate a [Netlify Deploy Preview](https://docs.netlify.com/site-deploys/deploy-previews/) under your pull request. You can open this preview to see how the changes will look in production.
|
||||
|
||||
## Code
|
||||
|
||||
When making code changes, please make sure to test them on both macOS and Linux if possible. If you can also test on Windows with WSL, that is ideal.
|
||||
|
||||
To build xtool for debugging, run `make` in the project directory. There are a few considerations depending on your host OS:
|
||||
|
||||
### macOS
|
||||
|
||||
On macOS, you'll firstly need to have Xcode set up.
|
||||
|
||||
The first time you run `make`, we'll try to detect your codesigning identity. If you have multiple, you'll see an interactive prompt to select the team you want to use. The team ID is saved to `./macOS/Support/Private-Team.xcconfig`. You can run `make team` to update it (or do so by hand).
|
||||
|
||||
After building, a symlink to the product will be created at `./macOS/Build/xtool`. We generate an Xcode project at `./macOS/XToolMac.xcodeproj` that you can open in order to work in Xcode.
|
||||
|
||||
### Linux
|
||||
|
||||
You need to have a few dependencies on Linux; see [Dockerfile](/Dockerfile) for specifics. It's often easiest to develop within Docker itself: see [Linux/README.md](/Linux/README.md) for details.
|
||||
@@ -1,25 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
cd "$(dirname "$0")"
|
||||
|
||||
rm -rf docs
|
||||
|
||||
if type -p xcrun &>/dev/null; then
|
||||
docc="$(xcrun -f docc)"
|
||||
else
|
||||
docc="docc"
|
||||
fi
|
||||
|
||||
if [[ $# == 0 ]]; then
|
||||
command="convert"
|
||||
elif [[ $# == 1 && ( "$1" == "preview" || "$1" == "convert" ) ]]; then
|
||||
command="$1"
|
||||
else
|
||||
echo "Usage: $0 [convert|preview]"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
"$docc" "$command" xtool.docc \
|
||||
--experimental-enable-custom-templates
|
||||
@@ -1,19 +0,0 @@
|
||||
<style>
|
||||
footer {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
padding: 0.5rem 0.8rem;
|
||||
background-color: var(--color-fill-secondary);
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
a, a:visited {
|
||||
color: var(--color-text);
|
||||
}
|
||||
</style>
|
||||
|
||||
<footer>
|
||||
<span>
|
||||
© xtool maintainers. This site is powered by <a href="https://www.netlify.com">Netlify</a>.
|
||||
</span>
|
||||
</footer>
|
||||
@@ -5,6 +5,9 @@ shopt -s nullglob
|
||||
|
||||
cd "$(dirname "$0")"
|
||||
|
||||
# release version
|
||||
export LINUXDEPLOY_OUTPUT_VERSION="latest"
|
||||
|
||||
if ! command -v fusermount &>/dev/null; then
|
||||
# Docker doesn't support FUSE
|
||||
export APPIMAGE_EXTRACT_AND_RUN=1
|
||||
@@ -40,10 +43,10 @@ fi
|
||||
mkdir -p staging/tmp/AppDir/usr/bin
|
||||
find "${bin}"/ -name '*.resources' -print0 | xargs -0 -I {} cp -a {} "${PWD}/staging/tmp/AppDir/usr/bin/"
|
||||
|
||||
export LINUXDEPLOY_OUTPUT_VERSION="${XTOOL_VERSION:-unversioned}"
|
||||
export LDAI_OUTPUT="staging/tmp/xtool-${curr_arch}.AppImage"
|
||||
export LDAI_UPDATE_INFORMATION="gh-releases-zsync|xtool-org|xtool|latest|xtool-${curr_arch}.AppImage.zsync"
|
||||
./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" \
|
||||
|
||||
@@ -1,135 +1,7 @@
|
||||
ifeq ($(shell uname -s),Darwin)
|
||||
|
||||
IS_MAC = 1
|
||||
|
||||
ifneq ($(VERBOSE),1)
|
||||
ifeq ($(shell type -p xcbeautify &>/dev/null && echo 1),1)
|
||||
XC_FORMAT = | xcbeautify
|
||||
endif
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
ifeq ($(RELEASE),1)
|
||||
INTERNAL_SWIFTFLAGS = -c release
|
||||
INTERNAL_XCFLAGS = -configuration Release
|
||||
else
|
||||
INTERNAL_SWIFTFLAGS = -c debug
|
||||
INTERNAL_XCFLAGS = -configuration Debug
|
||||
endif
|
||||
|
||||
ALL_SWIFTFLAGS = $(INTERNAL_SWIFTFLAGS) $(SWIFTFLAGS)
|
||||
ALL_XCFLAGS = $(INTERNAL_XCFLAGS) $(XCFLAGS)
|
||||
|
||||
TEAM_CONFIG = macOS/Support/Private-Team.xcconfig
|
||||
|
||||
.PHONY: all
|
||||
# dev build for the current platform
|
||||
all:
|
||||
ifeq ($(IS_MAC),1)
|
||||
@+$(MAKE) mac
|
||||
else
|
||||
@+$(MAKE) linux
|
||||
endif
|
||||
|
||||
.PHONY: clean
|
||||
# clean build artifacts
|
||||
clean:
|
||||
ifeq ($(IS_MAC),1)
|
||||
@+$(MAKE) mac-clean
|
||||
else
|
||||
@+$(MAKE) linux-clean
|
||||
endif
|
||||
|
||||
.PHONY: linux
|
||||
# dev build for Linux
|
||||
linux:
|
||||
swift build --product xtool $(ALL_SWIFTFLAGS)
|
||||
|
||||
.PHONY: linux-clean
|
||||
# clean build artifacts for Linux
|
||||
linux-clean:
|
||||
rm -rf .build
|
||||
|
||||
.PHONY: linux-dist
|
||||
# dist build for Linux
|
||||
linux-dist:
|
||||
docker compose run --build --rm xtool Linux/build.sh
|
||||
|
||||
.PHONY: mac
|
||||
# dev build for macOS
|
||||
mac: project
|
||||
@rm -rf macOS/Build/XcodeInstall
|
||||
@set -o pipefail && cd macOS && \
|
||||
xcodebuild install \
|
||||
-skipMacroValidation -skipPackagePluginValidation \
|
||||
-scheme XToolMac -destination generic/platform=macOS \
|
||||
-derivedDataPath Build/DerivedData \
|
||||
DSTROOT="$$PWD"/Build/XcodeInstall INSTALL_PATH=/ \
|
||||
$(ALL_XCFLAGS) $(XC_FORMAT)
|
||||
@ln -fs XcodeInstall/xtool.app/Contents/Resources/bin/xtool macOS/Build/xtool
|
||||
@echo "Output: ./macOS/Build/xtool"
|
||||
|
||||
.PHONY: mac-clean
|
||||
# clean build artifacts for macOS
|
||||
mac-clean:
|
||||
rm -rf macOS/Build
|
||||
|
||||
.PHONY: mac-dist
|
||||
# dist build for macOS
|
||||
# requires a few secrets in the env (see .github/workflows/release.yml)
|
||||
mac-dist:
|
||||
@echo "bundle exec fastlane package"
|
||||
@cd macOS && bundle exec fastlane package
|
||||
|
||||
.PHONY: reload
|
||||
# update Xcode project and restart Xcode
|
||||
reload:
|
||||
killall Xcode || :
|
||||
@+$(MAKE) project
|
||||
xed macOS/XToolMac.xcodeproj
|
||||
|
||||
.PHONY: project
|
||||
# update Xcode project
|
||||
project: $(TEAM_CONFIG)
|
||||
@echo "xcodegen"
|
||||
@cd macOS && xcodegen
|
||||
|
||||
.PHONY: team
|
||||
# update development team
|
||||
team:
|
||||
@+$(MAKE) -B $(TEAM_CONFIG)
|
||||
|
||||
# update development team if needed.
|
||||
#
|
||||
# will prompt interactively if there are multiple valid options.
|
||||
# set DEVELOPMENT_TEAM=... to force a specific value.
|
||||
$(TEAM_CONFIG):
|
||||
ifeq ($(DEVELOPMENT_TEAM),)
|
||||
@mkdir -p macOS/Support
|
||||
@team=$$(./scripts/select-identity.sh); \
|
||||
echo "echo \"DEVELOPMENT_TEAM = $$team\" > $@"; \
|
||||
echo "DEVELOPMENT_TEAM = $$team" > $@
|
||||
else
|
||||
@mkdir -p macOS/Support
|
||||
echo "DEVELOPMENT_TEAM = $(DEVELOPMENT_TEAM)" > $@
|
||||
.PHONY: $(TEAM_CONFIG)
|
||||
endif
|
||||
|
||||
.PHONY: docs
|
||||
# build documentation
|
||||
docs:
|
||||
./Documentation/build.sh
|
||||
|
||||
.PHONY: docs-preview
|
||||
# preview documentation
|
||||
docs-preview:
|
||||
./Documentation/build.sh preview
|
||||
|
||||
SPEC_URL = https://developer.apple.com/sample-code/app-store-connect/app-store-connect-openapi-specification.zip
|
||||
|
||||
.PHONY: api
|
||||
# Regenerate the OpenAPI client code
|
||||
.PHONY: api update-api
|
||||
|
||||
api: openapi/openapi.json
|
||||
swift run swift-openapi-generator generate \
|
||||
openapi/openapi.json \
|
||||
@@ -139,13 +11,11 @@ api: openapi/openapi.json
|
||||
sed -i '' -e 's/[[:<:]]Client[[:>:]]/DeveloperAPIClient/g' $$file; \
|
||||
done
|
||||
|
||||
.PHONY: update-api
|
||||
# Update OpenAPI spec and regenerate the client code
|
||||
update-api:
|
||||
@+$(MAKE) -B api
|
||||
|
||||
openapi/openapi.json: openapi/base.json Sources/DeveloperAPI/patch.js
|
||||
node Sources/DeveloperAPI/patch.js < openapi/base.json > openapi/openapi.json
|
||||
openapi/openapi.json: openapi/base.json Sources/DeveloperAPI/openapi-overlay.yaml
|
||||
npx --yes bump-cli overlay openapi/base.json Sources/DeveloperAPI/openapi-overlay.yaml > openapi/openapi.json
|
||||
|
||||
openapi/base.json:
|
||||
@mkdir -p openapi
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"originHash" : "d08ba8535e09303ac5be5621b8aea1a2409ebcb2ab566d661a63ec8ab5825189",
|
||||
"originHash" : "6980154be7e8da0aace058cc72033471d7d9573fa77fdbf53972129e4cd1d0a2",
|
||||
"pins" : [
|
||||
{
|
||||
"identity" : "aexml",
|
||||
@@ -420,8 +420,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/xtool-org/zsign",
|
||||
"state" : {
|
||||
"revision" : "7c669ed2423c53076d511b875a914f01ba7de062",
|
||||
"version" : "1.5.2"
|
||||
"revision" : "e9853fd3be36ea1a61fa9d4b7f71f4b4d8244369",
|
||||
"version" : "1.4.0"
|
||||
}
|
||||
}
|
||||
],
|
||||
|
||||
@@ -2,19 +2,6 @@
|
||||
|
||||
import PackageDescription
|
||||
|
||||
let xtoolVersion: String? = {
|
||||
if let explicitVersion = Context.environment["XTOOL_VERSION"] {
|
||||
return explicitVersion
|
||||
} else if let info = Context.gitInformation {
|
||||
let gitCommit = info.currentCommit
|
||||
let gitTag = info.currentTag
|
||||
let gitRef = gitTag ?? "commit \(gitCommit)"
|
||||
return "\(gitRef)\(info.hasUncommittedChanges ? " (dirty)" : "")"
|
||||
} else {
|
||||
return nil
|
||||
}
|
||||
}()
|
||||
|
||||
let cSettings: [CSetting] = [
|
||||
.define("_GNU_SOURCE", .when(platforms: [.linux])),
|
||||
]
|
||||
@@ -42,7 +29,7 @@ let package = Package(
|
||||
dependencies: [
|
||||
.package(url: "https://github.com/xtool-org/xtool-core", .upToNextMinor(from: "1.3.0")),
|
||||
.package(url: "https://github.com/xtool-org/SwiftyMobileDevice", .upToNextMinor(from: "1.4.0")),
|
||||
.package(url: "https://github.com/xtool-org/zsign", .upToNextMinor(from: "1.5.2")),
|
||||
.package(url: "https://github.com/xtool-org/zsign", .upToNextMinor(from: "1.4.0")),
|
||||
|
||||
.package(url: "https://github.com/apple/swift-system", from: "1.4.0"),
|
||||
.package(url: "https://github.com/apple/swift-http-types", from: "1.3.1"),
|
||||
@@ -77,18 +64,14 @@ let package = Package(
|
||||
dependencies: [
|
||||
.product(name: "OpenSSL", package: "xtool-core")
|
||||
],
|
||||
cSettings: cSettings + (
|
||||
xtoolVersion
|
||||
.map { [.define("XTOOL_VERSION", to: "\"\($0)\"")] }
|
||||
?? []
|
||||
)
|
||||
cSettings: cSettings
|
||||
),
|
||||
.target(
|
||||
name: "DeveloperAPI",
|
||||
dependencies: [
|
||||
.product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"),
|
||||
],
|
||||
exclude: ["openapi-generator-config.yaml", "patch.js"]
|
||||
exclude: ["openapi-generator-config.yaml", "openapi-overlay.yaml"]
|
||||
),
|
||||
.target(
|
||||
name: "XKit",
|
||||
|
||||
@@ -15,15 +15,15 @@ xtool is a cross-platform (Linux/WSL/macOS) tool that replicates Xcode functiona
|
||||
## Getting Started
|
||||
|
||||
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)!
|
||||
- [Installation (Linux/Windows)](https://swiftpackageindex.com/xtool-org/xtool/documentation/xtool/installation-linux)
|
||||
- [Installation (macOS)](https://swiftpackageindex.com/xtool-org/xtool/documentation/xtool/installation-macos)
|
||||
2. Create and run your first xtool-powered app by following the [tutorial](https://swiftpackageindex.com/xtool-org/xtool/tutorials/xtool/first-app)!
|
||||
|
||||
## Examples
|
||||
|
||||
### Screenshot
|
||||
|
||||

|
||||

|
||||
|
||||
### Command line interface
|
||||
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
const char * _Nonnull xtl_version(void);
|
||||
@@ -1,9 +0,0 @@
|
||||
#include "version.h"
|
||||
|
||||
const char *xtl_version(void) {
|
||||
#ifdef XTOOL_VERSION
|
||||
return XTOOL_VERSION;
|
||||
#else
|
||||
return "unversioned";
|
||||
#endif
|
||||
}
|
||||
@@ -477,56 +477,9 @@ public enum Components {
|
||||
/// - Remark: Generated from `#/components/schemas/App/attributes/subscriptionStatusUrlVersionForSandbox`.
|
||||
public var subscriptionStatusUrlVersionForSandbox: Components.Schemas.SubscriptionStatusUrlVersion?
|
||||
/// - Remark: Generated from `#/components/schemas/App/attributes/contentRightsDeclaration`.
|
||||
public struct ContentRightsDeclarationPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/App/attributes/contentRightsDeclaration/value1`.
|
||||
@frozen public enum Value1Payload: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case doesNotUseThirdPartyContent = "DOES_NOT_USE_THIRD_PARTY_CONTENT"
|
||||
case usesThirdPartyContent = "USES_THIRD_PARTY_CONTENT"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/App/attributes/contentRightsDeclaration/value1`.
|
||||
public var value1: Components.Schemas.App.AttributesPayload.ContentRightsDeclarationPayload.Value1Payload?
|
||||
/// - Remark: Generated from `#/components/schemas/App/attributes/contentRightsDeclaration/value2`.
|
||||
public var value2: Swift.String?
|
||||
/// Creates a new `ContentRightsDeclarationPayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - value1:
|
||||
/// - value2:
|
||||
public init(
|
||||
value1: Components.Schemas.App.AttributesPayload.ContentRightsDeclarationPayload.Value1Payload? = nil,
|
||||
value2: Swift.String? = nil
|
||||
) {
|
||||
self.value1 = value1
|
||||
self.value2 = value2
|
||||
}
|
||||
public init(from decoder: any Decoder) throws {
|
||||
var errors: [any Error] = []
|
||||
do {
|
||||
self.value1 = try decoder.decodeFromSingleValueContainer()
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
do {
|
||||
self.value2 = try decoder.decodeFromSingleValueContainer()
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
try Swift.DecodingError.verifyAtLeastOneSchemaIsNotNil(
|
||||
[
|
||||
self.value1,
|
||||
self.value2
|
||||
],
|
||||
type: Self.self,
|
||||
codingPath: decoder.codingPath,
|
||||
errors: errors
|
||||
)
|
||||
}
|
||||
public func encode(to encoder: any Encoder) throws {
|
||||
try encoder.encodeFirstNonNilValueToSingleValueContainer([
|
||||
self.value1,
|
||||
self.value2
|
||||
])
|
||||
}
|
||||
@frozen public enum ContentRightsDeclarationPayload: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case doesNotUseThirdPartyContent = "DOES_NOT_USE_THIRD_PARTY_CONTENT"
|
||||
case usesThirdPartyContent = "USES_THIRD_PARTY_CONTENT"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/App/attributes/contentRightsDeclaration`.
|
||||
public var contentRightsDeclaration: Components.Schemas.App.AttributesPayload.ContentRightsDeclarationPayload?
|
||||
@@ -1346,6 +1299,7 @@ public enum Components {
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/appAvailabilityV2`.
|
||||
public var appAvailabilityV2: Components.Schemas.App.RelationshipsPayload.AppAvailabilityV2Payload?
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/inAppPurchases`.
|
||||
@available(*, deprecated)
|
||||
public struct InAppPurchasesPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/inAppPurchases/links`.
|
||||
public var links: Components.Schemas.RelationshipLinks?
|
||||
@@ -1404,6 +1358,7 @@ public enum Components {
|
||||
}
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/inAppPurchases`.
|
||||
@available(*, deprecated)
|
||||
public var inAppPurchases: Components.Schemas.App.RelationshipsPayload.InAppPurchasesPayload?
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/subscriptionGroups`.
|
||||
public struct SubscriptionGroupsPayload: Codable, Hashable, Sendable {
|
||||
@@ -3511,114 +3466,21 @@ public enum Components {
|
||||
/// - Remark: Generated from `#/components/schemas/Device/attributes/udid`.
|
||||
public var udid: Swift.String?
|
||||
/// - Remark: Generated from `#/components/schemas/Device/attributes/deviceClass`.
|
||||
public struct DeviceClassPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/Device/attributes/deviceClass/value1`.
|
||||
@frozen public enum Value1Payload: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case appleWatch = "APPLE_WATCH"
|
||||
case ipad = "IPAD"
|
||||
case iphone = "IPHONE"
|
||||
case ipod = "IPOD"
|
||||
case appleTv = "APPLE_TV"
|
||||
case mac = "MAC"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/Device/attributes/deviceClass/value1`.
|
||||
public var value1: Components.Schemas.Device.AttributesPayload.DeviceClassPayload.Value1Payload?
|
||||
/// - Remark: Generated from `#/components/schemas/Device/attributes/deviceClass/value2`.
|
||||
public var value2: Swift.String?
|
||||
/// Creates a new `DeviceClassPayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - value1:
|
||||
/// - value2:
|
||||
public init(
|
||||
value1: Components.Schemas.Device.AttributesPayload.DeviceClassPayload.Value1Payload? = nil,
|
||||
value2: Swift.String? = nil
|
||||
) {
|
||||
self.value1 = value1
|
||||
self.value2 = value2
|
||||
}
|
||||
public init(from decoder: any Decoder) throws {
|
||||
var errors: [any Error] = []
|
||||
do {
|
||||
self.value1 = try decoder.decodeFromSingleValueContainer()
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
do {
|
||||
self.value2 = try decoder.decodeFromSingleValueContainer()
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
try Swift.DecodingError.verifyAtLeastOneSchemaIsNotNil(
|
||||
[
|
||||
self.value1,
|
||||
self.value2
|
||||
],
|
||||
type: Self.self,
|
||||
codingPath: decoder.codingPath,
|
||||
errors: errors
|
||||
)
|
||||
}
|
||||
public func encode(to encoder: any Encoder) throws {
|
||||
try encoder.encodeFirstNonNilValueToSingleValueContainer([
|
||||
self.value1,
|
||||
self.value2
|
||||
])
|
||||
}
|
||||
@frozen public enum DeviceClassPayload: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case appleWatch = "APPLE_WATCH"
|
||||
case ipad = "IPAD"
|
||||
case iphone = "IPHONE"
|
||||
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?
|
||||
/// - Remark: Generated from `#/components/schemas/Device/attributes/status`.
|
||||
public struct StatusPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/Device/attributes/status/value1`.
|
||||
@frozen public enum Value1Payload: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case enabled = "ENABLED"
|
||||
case disabled = "DISABLED"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/Device/attributes/status/value1`.
|
||||
public var value1: Components.Schemas.Device.AttributesPayload.StatusPayload.Value1Payload?
|
||||
/// - Remark: Generated from `#/components/schemas/Device/attributes/status/value2`.
|
||||
public var value2: Swift.String?
|
||||
/// Creates a new `StatusPayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - value1:
|
||||
/// - value2:
|
||||
public init(
|
||||
value1: Components.Schemas.Device.AttributesPayload.StatusPayload.Value1Payload? = nil,
|
||||
value2: Swift.String? = nil
|
||||
) {
|
||||
self.value1 = value1
|
||||
self.value2 = value2
|
||||
}
|
||||
public init(from decoder: any Decoder) throws {
|
||||
var errors: [any Error] = []
|
||||
do {
|
||||
self.value1 = try decoder.decodeFromSingleValueContainer()
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
do {
|
||||
self.value2 = try decoder.decodeFromSingleValueContainer()
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
try Swift.DecodingError.verifyAtLeastOneSchemaIsNotNil(
|
||||
[
|
||||
self.value1,
|
||||
self.value2
|
||||
],
|
||||
type: Self.self,
|
||||
codingPath: decoder.codingPath,
|
||||
errors: errors
|
||||
)
|
||||
}
|
||||
public func encode(to encoder: any Encoder) throws {
|
||||
try encoder.encodeFirstNonNilValueToSingleValueContainer([
|
||||
self.value1,
|
||||
self.value2
|
||||
])
|
||||
}
|
||||
@frozen public enum StatusPayload: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case enabled = "ENABLED"
|
||||
case disabled = "DISABLED"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/Device/attributes/status`.
|
||||
public var status: Components.Schemas.Device.AttributesPayload.StatusPayload?
|
||||
@@ -3832,56 +3694,9 @@ public enum Components {
|
||||
/// - Remark: Generated from `#/components/schemas/DeviceUpdateRequest/data/attributes/name`.
|
||||
public var name: Swift.String?
|
||||
/// - Remark: Generated from `#/components/schemas/DeviceUpdateRequest/data/attributes/status`.
|
||||
public struct StatusPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/DeviceUpdateRequest/data/attributes/status/value1`.
|
||||
@frozen public enum Value1Payload: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case enabled = "ENABLED"
|
||||
case disabled = "DISABLED"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/DeviceUpdateRequest/data/attributes/status/value1`.
|
||||
public var value1: Components.Schemas.DeviceUpdateRequest.DataPayload.AttributesPayload.StatusPayload.Value1Payload?
|
||||
/// - Remark: Generated from `#/components/schemas/DeviceUpdateRequest/data/attributes/status/value2`.
|
||||
public var value2: Swift.String?
|
||||
/// Creates a new `StatusPayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - value1:
|
||||
/// - value2:
|
||||
public init(
|
||||
value1: Components.Schemas.DeviceUpdateRequest.DataPayload.AttributesPayload.StatusPayload.Value1Payload? = nil,
|
||||
value2: Swift.String? = nil
|
||||
) {
|
||||
self.value1 = value1
|
||||
self.value2 = value2
|
||||
}
|
||||
public init(from decoder: any Decoder) throws {
|
||||
var errors: [any Error] = []
|
||||
do {
|
||||
self.value1 = try decoder.decodeFromSingleValueContainer()
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
do {
|
||||
self.value2 = try decoder.decodeFromSingleValueContainer()
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
try Swift.DecodingError.verifyAtLeastOneSchemaIsNotNil(
|
||||
[
|
||||
self.value1,
|
||||
self.value2
|
||||
],
|
||||
type: Self.self,
|
||||
codingPath: decoder.codingPath,
|
||||
errors: errors
|
||||
)
|
||||
}
|
||||
public func encode(to encoder: any Encoder) throws {
|
||||
try encoder.encodeFirstNonNilValueToSingleValueContainer([
|
||||
self.value1,
|
||||
self.value2
|
||||
])
|
||||
}
|
||||
@frozen public enum StatusPayload: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case enabled = "ENABLED"
|
||||
case disabled = "DISABLED"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/DeviceUpdateRequest/data/attributes/status`.
|
||||
public var status: Components.Schemas.DeviceUpdateRequest.DataPayload.AttributesPayload.StatusPayload?
|
||||
@@ -3955,122 +3770,28 @@ public enum Components {
|
||||
/// - Remark: Generated from `#/components/schemas/Profile/attributes/platform`.
|
||||
public var platform: Components.Schemas.BundleIdPlatform?
|
||||
/// - Remark: Generated from `#/components/schemas/Profile/attributes/profileType`.
|
||||
public struct ProfileTypePayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/Profile/attributes/profileType/value1`.
|
||||
@frozen public enum Value1Payload: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case iosAppDevelopment = "IOS_APP_DEVELOPMENT"
|
||||
case iosAppStore = "IOS_APP_STORE"
|
||||
case iosAppAdhoc = "IOS_APP_ADHOC"
|
||||
case iosAppInhouse = "IOS_APP_INHOUSE"
|
||||
case macAppDevelopment = "MAC_APP_DEVELOPMENT"
|
||||
case macAppStore = "MAC_APP_STORE"
|
||||
case macAppDirect = "MAC_APP_DIRECT"
|
||||
case tvosAppDevelopment = "TVOS_APP_DEVELOPMENT"
|
||||
case tvosAppStore = "TVOS_APP_STORE"
|
||||
case tvosAppAdhoc = "TVOS_APP_ADHOC"
|
||||
case tvosAppInhouse = "TVOS_APP_INHOUSE"
|
||||
case macCatalystAppDevelopment = "MAC_CATALYST_APP_DEVELOPMENT"
|
||||
case macCatalystAppStore = "MAC_CATALYST_APP_STORE"
|
||||
case macCatalystAppDirect = "MAC_CATALYST_APP_DIRECT"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/Profile/attributes/profileType/value1`.
|
||||
public var value1: Components.Schemas.Profile.AttributesPayload.ProfileTypePayload.Value1Payload?
|
||||
/// - Remark: Generated from `#/components/schemas/Profile/attributes/profileType/value2`.
|
||||
public var value2: Swift.String?
|
||||
/// Creates a new `ProfileTypePayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - value1:
|
||||
/// - value2:
|
||||
public init(
|
||||
value1: Components.Schemas.Profile.AttributesPayload.ProfileTypePayload.Value1Payload? = nil,
|
||||
value2: Swift.String? = nil
|
||||
) {
|
||||
self.value1 = value1
|
||||
self.value2 = value2
|
||||
}
|
||||
public init(from decoder: any Decoder) throws {
|
||||
var errors: [any Error] = []
|
||||
do {
|
||||
self.value1 = try decoder.decodeFromSingleValueContainer()
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
do {
|
||||
self.value2 = try decoder.decodeFromSingleValueContainer()
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
try Swift.DecodingError.verifyAtLeastOneSchemaIsNotNil(
|
||||
[
|
||||
self.value1,
|
||||
self.value2
|
||||
],
|
||||
type: Self.self,
|
||||
codingPath: decoder.codingPath,
|
||||
errors: errors
|
||||
)
|
||||
}
|
||||
public func encode(to encoder: any Encoder) throws {
|
||||
try encoder.encodeFirstNonNilValueToSingleValueContainer([
|
||||
self.value1,
|
||||
self.value2
|
||||
])
|
||||
}
|
||||
@frozen public enum ProfileTypePayload: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case iosAppDevelopment = "IOS_APP_DEVELOPMENT"
|
||||
case iosAppStore = "IOS_APP_STORE"
|
||||
case iosAppAdhoc = "IOS_APP_ADHOC"
|
||||
case iosAppInhouse = "IOS_APP_INHOUSE"
|
||||
case macAppDevelopment = "MAC_APP_DEVELOPMENT"
|
||||
case macAppStore = "MAC_APP_STORE"
|
||||
case macAppDirect = "MAC_APP_DIRECT"
|
||||
case tvosAppDevelopment = "TVOS_APP_DEVELOPMENT"
|
||||
case tvosAppStore = "TVOS_APP_STORE"
|
||||
case tvosAppAdhoc = "TVOS_APP_ADHOC"
|
||||
case tvosAppInhouse = "TVOS_APP_INHOUSE"
|
||||
case macCatalystAppDevelopment = "MAC_CATALYST_APP_DEVELOPMENT"
|
||||
case macCatalystAppStore = "MAC_CATALYST_APP_STORE"
|
||||
case macCatalystAppDirect = "MAC_CATALYST_APP_DIRECT"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/Profile/attributes/profileType`.
|
||||
public var profileType: Components.Schemas.Profile.AttributesPayload.ProfileTypePayload?
|
||||
/// - Remark: Generated from `#/components/schemas/Profile/attributes/profileState`.
|
||||
public struct ProfileStatePayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/Profile/attributes/profileState/value1`.
|
||||
@frozen public enum Value1Payload: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case active = "ACTIVE"
|
||||
case invalid = "INVALID"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/Profile/attributes/profileState/value1`.
|
||||
public var value1: Components.Schemas.Profile.AttributesPayload.ProfileStatePayload.Value1Payload?
|
||||
/// - Remark: Generated from `#/components/schemas/Profile/attributes/profileState/value2`.
|
||||
public var value2: Swift.String?
|
||||
/// Creates a new `ProfileStatePayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - value1:
|
||||
/// - value2:
|
||||
public init(
|
||||
value1: Components.Schemas.Profile.AttributesPayload.ProfileStatePayload.Value1Payload? = nil,
|
||||
value2: Swift.String? = nil
|
||||
) {
|
||||
self.value1 = value1
|
||||
self.value2 = value2
|
||||
}
|
||||
public init(from decoder: any Decoder) throws {
|
||||
var errors: [any Error] = []
|
||||
do {
|
||||
self.value1 = try decoder.decodeFromSingleValueContainer()
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
do {
|
||||
self.value2 = try decoder.decodeFromSingleValueContainer()
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
try Swift.DecodingError.verifyAtLeastOneSchemaIsNotNil(
|
||||
[
|
||||
self.value1,
|
||||
self.value2
|
||||
],
|
||||
type: Self.self,
|
||||
codingPath: decoder.codingPath,
|
||||
errors: errors
|
||||
)
|
||||
}
|
||||
public func encode(to encoder: any Encoder) throws {
|
||||
try encoder.encodeFirstNonNilValueToSingleValueContainer([
|
||||
self.value1,
|
||||
self.value2
|
||||
])
|
||||
}
|
||||
@frozen public enum ProfileStatePayload: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case active = "ACTIVE"
|
||||
case invalid = "INVALID"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/Profile/attributes/profileState`.
|
||||
public var profileState: Components.Schemas.Profile.AttributesPayload.ProfileStatePayload?
|
||||
@@ -4526,68 +4247,21 @@ public enum Components {
|
||||
/// - Remark: Generated from `#/components/schemas/ProfileCreateRequest/data/attributes/name`.
|
||||
public var name: Swift.String
|
||||
/// - Remark: Generated from `#/components/schemas/ProfileCreateRequest/data/attributes/profileType`.
|
||||
public struct ProfileTypePayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/ProfileCreateRequest/data/attributes/profileType/value1`.
|
||||
@frozen public enum Value1Payload: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case iosAppDevelopment = "IOS_APP_DEVELOPMENT"
|
||||
case iosAppStore = "IOS_APP_STORE"
|
||||
case iosAppAdhoc = "IOS_APP_ADHOC"
|
||||
case iosAppInhouse = "IOS_APP_INHOUSE"
|
||||
case macAppDevelopment = "MAC_APP_DEVELOPMENT"
|
||||
case macAppStore = "MAC_APP_STORE"
|
||||
case macAppDirect = "MAC_APP_DIRECT"
|
||||
case tvosAppDevelopment = "TVOS_APP_DEVELOPMENT"
|
||||
case tvosAppStore = "TVOS_APP_STORE"
|
||||
case tvosAppAdhoc = "TVOS_APP_ADHOC"
|
||||
case tvosAppInhouse = "TVOS_APP_INHOUSE"
|
||||
case macCatalystAppDevelopment = "MAC_CATALYST_APP_DEVELOPMENT"
|
||||
case macCatalystAppStore = "MAC_CATALYST_APP_STORE"
|
||||
case macCatalystAppDirect = "MAC_CATALYST_APP_DIRECT"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/ProfileCreateRequest/data/attributes/profileType/value1`.
|
||||
public var value1: Components.Schemas.ProfileCreateRequest.DataPayload.AttributesPayload.ProfileTypePayload.Value1Payload?
|
||||
/// - Remark: Generated from `#/components/schemas/ProfileCreateRequest/data/attributes/profileType/value2`.
|
||||
public var value2: Swift.String?
|
||||
/// Creates a new `ProfileTypePayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - value1:
|
||||
/// - value2:
|
||||
public init(
|
||||
value1: Components.Schemas.ProfileCreateRequest.DataPayload.AttributesPayload.ProfileTypePayload.Value1Payload? = nil,
|
||||
value2: Swift.String? = nil
|
||||
) {
|
||||
self.value1 = value1
|
||||
self.value2 = value2
|
||||
}
|
||||
public init(from decoder: any Decoder) throws {
|
||||
var errors: [any Error] = []
|
||||
do {
|
||||
self.value1 = try decoder.decodeFromSingleValueContainer()
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
do {
|
||||
self.value2 = try decoder.decodeFromSingleValueContainer()
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
try Swift.DecodingError.verifyAtLeastOneSchemaIsNotNil(
|
||||
[
|
||||
self.value1,
|
||||
self.value2
|
||||
],
|
||||
type: Self.self,
|
||||
codingPath: decoder.codingPath,
|
||||
errors: errors
|
||||
)
|
||||
}
|
||||
public func encode(to encoder: any Encoder) throws {
|
||||
try encoder.encodeFirstNonNilValueToSingleValueContainer([
|
||||
self.value1,
|
||||
self.value2
|
||||
])
|
||||
}
|
||||
@frozen public enum ProfileTypePayload: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case iosAppDevelopment = "IOS_APP_DEVELOPMENT"
|
||||
case iosAppStore = "IOS_APP_STORE"
|
||||
case iosAppAdhoc = "IOS_APP_ADHOC"
|
||||
case iosAppInhouse = "IOS_APP_INHOUSE"
|
||||
case macAppDevelopment = "MAC_APP_DEVELOPMENT"
|
||||
case macAppStore = "MAC_APP_STORE"
|
||||
case macAppDirect = "MAC_APP_DIRECT"
|
||||
case tvosAppDevelopment = "TVOS_APP_DEVELOPMENT"
|
||||
case tvosAppStore = "TVOS_APP_STORE"
|
||||
case tvosAppAdhoc = "TVOS_APP_ADHOC"
|
||||
case tvosAppInhouse = "TVOS_APP_INHOUSE"
|
||||
case macCatalystAppDevelopment = "MAC_CATALYST_APP_DEVELOPMENT"
|
||||
case macCatalystAppStore = "MAC_CATALYST_APP_STORE"
|
||||
case macCatalystAppDirect = "MAC_CATALYST_APP_DIRECT"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/ProfileCreateRequest/data/attributes/profileType`.
|
||||
public var profileType: Components.Schemas.ProfileCreateRequest.DataPayload.AttributesPayload.ProfileTypePayload
|
||||
@@ -5343,115 +5017,21 @@ public enum Components {
|
||||
}
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/BundleIdPlatform`.
|
||||
public struct BundleIdPlatform: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/BundleIdPlatform/value1`.
|
||||
@frozen public enum Value1Payload: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case ios = "IOS"
|
||||
case macOs = "MAC_OS"
|
||||
case universal = "UNIVERSAL"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/BundleIdPlatform/value1`.
|
||||
public var value1: Components.Schemas.BundleIdPlatform.Value1Payload?
|
||||
/// - Remark: Generated from `#/components/schemas/BundleIdPlatform/value2`.
|
||||
public var value2: Swift.String?
|
||||
/// Creates a new `BundleIdPlatform`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - value1:
|
||||
/// - value2:
|
||||
public init(
|
||||
value1: Components.Schemas.BundleIdPlatform.Value1Payload? = nil,
|
||||
value2: Swift.String? = nil
|
||||
) {
|
||||
self.value1 = value1
|
||||
self.value2 = value2
|
||||
}
|
||||
public init(from decoder: any Decoder) throws {
|
||||
var errors: [any Error] = []
|
||||
do {
|
||||
self.value1 = try decoder.decodeFromSingleValueContainer()
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
do {
|
||||
self.value2 = try decoder.decodeFromSingleValueContainer()
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
try Swift.DecodingError.verifyAtLeastOneSchemaIsNotNil(
|
||||
[
|
||||
self.value1,
|
||||
self.value2
|
||||
],
|
||||
type: Self.self,
|
||||
codingPath: decoder.codingPath,
|
||||
errors: errors
|
||||
)
|
||||
}
|
||||
public func encode(to encoder: any Encoder) throws {
|
||||
try encoder.encodeFirstNonNilValueToSingleValueContainer([
|
||||
self.value1,
|
||||
self.value2
|
||||
])
|
||||
}
|
||||
@frozen public enum BundleIdPlatform: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case ios = "IOS"
|
||||
case macOs = "MAC_OS"
|
||||
case universal = "UNIVERSAL"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CapabilityOption`.
|
||||
public struct CapabilityOption: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/CapabilityOption/key`.
|
||||
public struct KeyPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/CapabilityOption/key/value1`.
|
||||
@frozen public enum Value1Payload: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case xcode5 = "XCODE_5"
|
||||
case xcode6 = "XCODE_6"
|
||||
case completeProtection = "COMPLETE_PROTECTION"
|
||||
case protectedUnlessOpen = "PROTECTED_UNLESS_OPEN"
|
||||
case protectedUntilFirstUserAuth = "PROTECTED_UNTIL_FIRST_USER_AUTH"
|
||||
case primaryAppConsent = "PRIMARY_APP_CONSENT"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CapabilityOption/key/value1`.
|
||||
public var value1: Components.Schemas.CapabilityOption.KeyPayload.Value1Payload?
|
||||
/// - Remark: Generated from `#/components/schemas/CapabilityOption/key/value2`.
|
||||
public var value2: Swift.String?
|
||||
/// Creates a new `KeyPayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - value1:
|
||||
/// - value2:
|
||||
public init(
|
||||
value1: Components.Schemas.CapabilityOption.KeyPayload.Value1Payload? = nil,
|
||||
value2: Swift.String? = nil
|
||||
) {
|
||||
self.value1 = value1
|
||||
self.value2 = value2
|
||||
}
|
||||
public init(from decoder: any Decoder) throws {
|
||||
var errors: [any Error] = []
|
||||
do {
|
||||
self.value1 = try decoder.decodeFromSingleValueContainer()
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
do {
|
||||
self.value2 = try decoder.decodeFromSingleValueContainer()
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
try Swift.DecodingError.verifyAtLeastOneSchemaIsNotNil(
|
||||
[
|
||||
self.value1,
|
||||
self.value2
|
||||
],
|
||||
type: Self.self,
|
||||
codingPath: decoder.codingPath,
|
||||
errors: errors
|
||||
)
|
||||
}
|
||||
public func encode(to encoder: any Encoder) throws {
|
||||
try encoder.encodeFirstNonNilValueToSingleValueContainer([
|
||||
self.value1,
|
||||
self.value2
|
||||
])
|
||||
}
|
||||
@frozen public enum KeyPayload: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case xcode5 = "XCODE_5"
|
||||
case xcode6 = "XCODE_6"
|
||||
case completeProtection = "COMPLETE_PROTECTION"
|
||||
case protectedUnlessOpen = "PROTECTED_UNLESS_OPEN"
|
||||
case protectedUntilFirstUserAuth = "PROTECTED_UNTIL_FIRST_USER_AUTH"
|
||||
case primaryAppConsent = "PRIMARY_APP_CONSENT"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CapabilityOption/key`.
|
||||
public var key: Components.Schemas.CapabilityOption.KeyPayload?
|
||||
@@ -5501,57 +5081,10 @@ public enum Components {
|
||||
/// - Remark: Generated from `#/components/schemas/CapabilitySetting`.
|
||||
public struct CapabilitySetting: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/CapabilitySetting/key`.
|
||||
public struct KeyPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/CapabilitySetting/key/value1`.
|
||||
@frozen public enum Value1Payload: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case icloudVersion = "ICLOUD_VERSION"
|
||||
case dataProtectionPermissionLevel = "DATA_PROTECTION_PERMISSION_LEVEL"
|
||||
case appleIdAuthAppConsent = "APPLE_ID_AUTH_APP_CONSENT"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CapabilitySetting/key/value1`.
|
||||
public var value1: Components.Schemas.CapabilitySetting.KeyPayload.Value1Payload?
|
||||
/// - Remark: Generated from `#/components/schemas/CapabilitySetting/key/value2`.
|
||||
public var value2: Swift.String?
|
||||
/// Creates a new `KeyPayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - value1:
|
||||
/// - value2:
|
||||
public init(
|
||||
value1: Components.Schemas.CapabilitySetting.KeyPayload.Value1Payload? = nil,
|
||||
value2: Swift.String? = nil
|
||||
) {
|
||||
self.value1 = value1
|
||||
self.value2 = value2
|
||||
}
|
||||
public init(from decoder: any Decoder) throws {
|
||||
var errors: [any Error] = []
|
||||
do {
|
||||
self.value1 = try decoder.decodeFromSingleValueContainer()
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
do {
|
||||
self.value2 = try decoder.decodeFromSingleValueContainer()
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
try Swift.DecodingError.verifyAtLeastOneSchemaIsNotNil(
|
||||
[
|
||||
self.value1,
|
||||
self.value2
|
||||
],
|
||||
type: Self.self,
|
||||
codingPath: decoder.codingPath,
|
||||
errors: errors
|
||||
)
|
||||
}
|
||||
public func encode(to encoder: any Encoder) throws {
|
||||
try encoder.encodeFirstNonNilValueToSingleValueContainer([
|
||||
self.value1,
|
||||
self.value2
|
||||
])
|
||||
}
|
||||
@frozen public enum KeyPayload: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case icloudVersion = "ICLOUD_VERSION"
|
||||
case dataProtectionPermissionLevel = "DATA_PROTECTION_PERMISSION_LEVEL"
|
||||
case appleIdAuthAppConsent = "APPLE_ID_AUTH_APP_CONSENT"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CapabilitySetting/key`.
|
||||
public var key: Components.Schemas.CapabilitySetting.KeyPayload?
|
||||
@@ -5564,57 +5097,10 @@ public enum Components {
|
||||
/// - Remark: Generated from `#/components/schemas/CapabilitySetting/visible`.
|
||||
public var visible: Swift.Bool?
|
||||
/// - Remark: Generated from `#/components/schemas/CapabilitySetting/allowedInstances`.
|
||||
public struct AllowedInstancesPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/CapabilitySetting/allowedInstances/value1`.
|
||||
@frozen public enum Value1Payload: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case entry = "ENTRY"
|
||||
case single = "SINGLE"
|
||||
case multiple = "MULTIPLE"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CapabilitySetting/allowedInstances/value1`.
|
||||
public var value1: Components.Schemas.CapabilitySetting.AllowedInstancesPayload.Value1Payload?
|
||||
/// - Remark: Generated from `#/components/schemas/CapabilitySetting/allowedInstances/value2`.
|
||||
public var value2: Swift.String?
|
||||
/// Creates a new `AllowedInstancesPayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - value1:
|
||||
/// - value2:
|
||||
public init(
|
||||
value1: Components.Schemas.CapabilitySetting.AllowedInstancesPayload.Value1Payload? = nil,
|
||||
value2: Swift.String? = nil
|
||||
) {
|
||||
self.value1 = value1
|
||||
self.value2 = value2
|
||||
}
|
||||
public init(from decoder: any Decoder) throws {
|
||||
var errors: [any Error] = []
|
||||
do {
|
||||
self.value1 = try decoder.decodeFromSingleValueContainer()
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
do {
|
||||
self.value2 = try decoder.decodeFromSingleValueContainer()
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
try Swift.DecodingError.verifyAtLeastOneSchemaIsNotNil(
|
||||
[
|
||||
self.value1,
|
||||
self.value2
|
||||
],
|
||||
type: Self.self,
|
||||
codingPath: decoder.codingPath,
|
||||
errors: errors
|
||||
)
|
||||
}
|
||||
public func encode(to encoder: any Encoder) throws {
|
||||
try encoder.encodeFirstNonNilValueToSingleValueContainer([
|
||||
self.value1,
|
||||
self.value2
|
||||
])
|
||||
}
|
||||
@frozen public enum AllowedInstancesPayload: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case entry = "ENTRY"
|
||||
case single = "SINGLE"
|
||||
case multiple = "MULTIPLE"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CapabilitySetting/allowedInstances`.
|
||||
public var allowedInstances: Components.Schemas.CapabilitySetting.AllowedInstancesPayload?
|
||||
@@ -5664,202 +5150,61 @@ public enum Components {
|
||||
}
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CapabilityType`.
|
||||
public struct CapabilityType: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/CapabilityType/value1`.
|
||||
@frozen public enum Value1Payload: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case icloud = "ICLOUD"
|
||||
case inAppPurchase = "IN_APP_PURCHASE"
|
||||
case gameCenter = "GAME_CENTER"
|
||||
case pushNotifications = "PUSH_NOTIFICATIONS"
|
||||
case wallet = "WALLET"
|
||||
case interAppAudio = "INTER_APP_AUDIO"
|
||||
case maps = "MAPS"
|
||||
case associatedDomains = "ASSOCIATED_DOMAINS"
|
||||
case personalVpn = "PERSONAL_VPN"
|
||||
case appGroups = "APP_GROUPS"
|
||||
case healthkit = "HEALTHKIT"
|
||||
case homekit = "HOMEKIT"
|
||||
case wirelessAccessoryConfiguration = "WIRELESS_ACCESSORY_CONFIGURATION"
|
||||
case applePay = "APPLE_PAY"
|
||||
case dataProtection = "DATA_PROTECTION"
|
||||
case sirikit = "SIRIKIT"
|
||||
case networkExtensions = "NETWORK_EXTENSIONS"
|
||||
case multipath = "MULTIPATH"
|
||||
case hotSpot = "HOT_SPOT"
|
||||
case nfcTagReading = "NFC_TAG_READING"
|
||||
case classkit = "CLASSKIT"
|
||||
case autofillCredentialProvider = "AUTOFILL_CREDENTIAL_PROVIDER"
|
||||
case accessWifiInformation = "ACCESS_WIFI_INFORMATION"
|
||||
case networkCustomProtocol = "NETWORK_CUSTOM_PROTOCOL"
|
||||
case coremediaHlsLowLatency = "COREMEDIA_HLS_LOW_LATENCY"
|
||||
case systemExtensionInstall = "SYSTEM_EXTENSION_INSTALL"
|
||||
case userManagement = "USER_MANAGEMENT"
|
||||
case appleIdAuth = "APPLE_ID_AUTH"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CapabilityType/value1`.
|
||||
public var value1: Components.Schemas.CapabilityType.Value1Payload?
|
||||
/// - Remark: Generated from `#/components/schemas/CapabilityType/value2`.
|
||||
public var value2: Swift.String?
|
||||
/// Creates a new `CapabilityType`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - value1:
|
||||
/// - value2:
|
||||
public init(
|
||||
value1: Components.Schemas.CapabilityType.Value1Payload? = nil,
|
||||
value2: Swift.String? = nil
|
||||
) {
|
||||
self.value1 = value1
|
||||
self.value2 = value2
|
||||
}
|
||||
public init(from decoder: any Decoder) throws {
|
||||
var errors: [any Error] = []
|
||||
do {
|
||||
self.value1 = try decoder.decodeFromSingleValueContainer()
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
do {
|
||||
self.value2 = try decoder.decodeFromSingleValueContainer()
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
try Swift.DecodingError.verifyAtLeastOneSchemaIsNotNil(
|
||||
[
|
||||
self.value1,
|
||||
self.value2
|
||||
],
|
||||
type: Self.self,
|
||||
codingPath: decoder.codingPath,
|
||||
errors: errors
|
||||
)
|
||||
}
|
||||
public func encode(to encoder: any Encoder) throws {
|
||||
try encoder.encodeFirstNonNilValueToSingleValueContainer([
|
||||
self.value1,
|
||||
self.value2
|
||||
])
|
||||
}
|
||||
@frozen public enum CapabilityType: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case icloud = "ICLOUD"
|
||||
case inAppPurchase = "IN_APP_PURCHASE"
|
||||
case gameCenter = "GAME_CENTER"
|
||||
case pushNotifications = "PUSH_NOTIFICATIONS"
|
||||
case wallet = "WALLET"
|
||||
case interAppAudio = "INTER_APP_AUDIO"
|
||||
case maps = "MAPS"
|
||||
case associatedDomains = "ASSOCIATED_DOMAINS"
|
||||
case personalVpn = "PERSONAL_VPN"
|
||||
case appGroups = "APP_GROUPS"
|
||||
case healthkit = "HEALTHKIT"
|
||||
case homekit = "HOMEKIT"
|
||||
case wirelessAccessoryConfiguration = "WIRELESS_ACCESSORY_CONFIGURATION"
|
||||
case applePay = "APPLE_PAY"
|
||||
case dataProtection = "DATA_PROTECTION"
|
||||
case sirikit = "SIRIKIT"
|
||||
case networkExtensions = "NETWORK_EXTENSIONS"
|
||||
case multipath = "MULTIPATH"
|
||||
case hotSpot = "HOT_SPOT"
|
||||
case nfcTagReading = "NFC_TAG_READING"
|
||||
case classkit = "CLASSKIT"
|
||||
case autofillCredentialProvider = "AUTOFILL_CREDENTIAL_PROVIDER"
|
||||
case accessWifiInformation = "ACCESS_WIFI_INFORMATION"
|
||||
case networkCustomProtocol = "NETWORK_CUSTOM_PROTOCOL"
|
||||
case coremediaHlsLowLatency = "COREMEDIA_HLS_LOW_LATENCY"
|
||||
case systemExtensionInstall = "SYSTEM_EXTENSION_INSTALL"
|
||||
case userManagement = "USER_MANAGEMENT"
|
||||
case appleIdAuth = "APPLE_ID_AUTH"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateType`.
|
||||
public struct CertificateType: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateType/value1`.
|
||||
@frozen public enum Value1Payload: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
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"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateType/value1`.
|
||||
public var value1: Components.Schemas.CertificateType.Value1Payload?
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateType/value2`.
|
||||
public var value2: Swift.String?
|
||||
/// Creates a new `CertificateType`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - value1:
|
||||
/// - value2:
|
||||
public init(
|
||||
value1: Components.Schemas.CertificateType.Value1Payload? = nil,
|
||||
value2: Swift.String? = nil
|
||||
) {
|
||||
self.value1 = value1
|
||||
self.value2 = value2
|
||||
}
|
||||
public init(from decoder: any Decoder) throws {
|
||||
var errors: [any Error] = []
|
||||
do {
|
||||
self.value1 = try decoder.decodeFromSingleValueContainer()
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
do {
|
||||
self.value2 = try decoder.decodeFromSingleValueContainer()
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
try Swift.DecodingError.verifyAtLeastOneSchemaIsNotNil(
|
||||
[
|
||||
self.value1,
|
||||
self.value2
|
||||
],
|
||||
type: Self.self,
|
||||
codingPath: decoder.codingPath,
|
||||
errors: errors
|
||||
)
|
||||
}
|
||||
public func encode(to encoder: any Encoder) throws {
|
||||
try encoder.encodeFirstNonNilValueToSingleValueContainer([
|
||||
self.value1,
|
||||
self.value2
|
||||
])
|
||||
}
|
||||
@frozen public enum CertificateType: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
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"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/SubscriptionStatusUrlVersion`.
|
||||
public struct SubscriptionStatusUrlVersion: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/SubscriptionStatusUrlVersion/value1`.
|
||||
@frozen public enum Value1Payload: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case v1 = "V1"
|
||||
case v2 = "V2"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/SubscriptionStatusUrlVersion/value1`.
|
||||
public var value1: Components.Schemas.SubscriptionStatusUrlVersion.Value1Payload?
|
||||
/// - Remark: Generated from `#/components/schemas/SubscriptionStatusUrlVersion/value2`.
|
||||
public var value2: Swift.String?
|
||||
/// Creates a new `SubscriptionStatusUrlVersion`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - value1:
|
||||
/// - value2:
|
||||
public init(
|
||||
value1: Components.Schemas.SubscriptionStatusUrlVersion.Value1Payload? = nil,
|
||||
value2: Swift.String? = nil
|
||||
) {
|
||||
self.value1 = value1
|
||||
self.value2 = value2
|
||||
}
|
||||
public init(from decoder: any Decoder) throws {
|
||||
var errors: [any Error] = []
|
||||
do {
|
||||
self.value1 = try decoder.decodeFromSingleValueContainer()
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
do {
|
||||
self.value2 = try decoder.decodeFromSingleValueContainer()
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
try Swift.DecodingError.verifyAtLeastOneSchemaIsNotNil(
|
||||
[
|
||||
self.value1,
|
||||
self.value2
|
||||
],
|
||||
type: Self.self,
|
||||
codingPath: decoder.codingPath,
|
||||
errors: errors
|
||||
)
|
||||
}
|
||||
public func encode(to encoder: any Encoder) throws {
|
||||
try encoder.encodeFirstNonNilValueToSingleValueContainer([
|
||||
self.value1,
|
||||
self.value2
|
||||
])
|
||||
}
|
||||
@frozen public enum SubscriptionStatusUrlVersion: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case v1 = "V1"
|
||||
case v2 = "V2"
|
||||
}
|
||||
}
|
||||
/// Types generated from the `#/components/parameters` section of the OpenAPI document.
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
overlay: 1.0.0
|
||||
info:
|
||||
title: Overlay for App Store Connect API
|
||||
version: 1.0.0
|
||||
actions:
|
||||
- target: '$.components.schemas.BundleIdCapabilityCreateRequest.properties.data.properties.relationships'
|
||||
update:
|
||||
properties:
|
||||
capability:
|
||||
type: object
|
||||
properties:
|
||||
data:
|
||||
type: object
|
||||
properties:
|
||||
type:
|
||||
type: string
|
||||
enum: [capabilities]
|
||||
id:
|
||||
"$ref": "#/components/schemas/CapabilityType"
|
||||
required: [id, type]
|
||||
required: [data]
|
||||
required: [capability]
|
||||
- target: '$.components.schemas.Device.properties.attributes.properties.deviceClass'
|
||||
update:
|
||||
enum: ["APPLE_VISION_PRO"]
|
||||
@@ -1,110 +0,0 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
import fs from 'fs';
|
||||
|
||||
function update(schema, value) {
|
||||
for (const key in value) {
|
||||
const val = value[key];
|
||||
if (val === null) {
|
||||
delete schema[key];
|
||||
} else if (Array.isArray(val)) {
|
||||
schema[key] = (schema[key] ?? []).concat(val);
|
||||
} else if (typeof val === 'object') {
|
||||
if (schema[key] === undefined) {
|
||||
schema[key] = {};
|
||||
}
|
||||
update(schema[key], val);
|
||||
} else {
|
||||
schema[key] = val;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// in-place update
|
||||
function replace(schema, value) {
|
||||
Object.keys(schema).forEach(k => delete schema[k]);
|
||||
Object.assign(schema, value);
|
||||
}
|
||||
|
||||
function clone(schema) {
|
||||
return JSON.parse(JSON.stringify(schema));
|
||||
}
|
||||
|
||||
function makeOpen(enumSchema) {
|
||||
replace(enumSchema, {
|
||||
anyOf: [
|
||||
clone(enumSchema),
|
||||
{ type: 'string' },
|
||||
]
|
||||
});
|
||||
}
|
||||
|
||||
function openAll(schema, path = []) {
|
||||
if (Array.isArray(schema)) {
|
||||
schema.forEach((s, i) => openAll(s, [...path, i]))
|
||||
} else if (typeof schema === 'object' && schema !== null) {
|
||||
const keys = new Set(Object.keys(schema))
|
||||
if (keys.size === 2
|
||||
&& keys.has('type')
|
||||
&& keys.has('enum')
|
||||
&& schema.type === 'string'
|
||||
&& Array.isArray(schema.enum)) {
|
||||
// several polymorphic schemas have a field literally named 'type', that always has a single case.
|
||||
// skip that instance, but make all other enums open.
|
||||
if (!(path[path.length - 1] === 'type' && schema.enum.length === 1)) {
|
||||
makeOpen(schema);
|
||||
}
|
||||
} else {
|
||||
for (const key in schema) {
|
||||
openAll(schema[key], [...path, key]);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function patch(schema) {
|
||||
const schemas = schema.components.schemas;
|
||||
|
||||
// this field is required when using the private Xcode API
|
||||
update(schemas.BundleIdCapabilityCreateRequest.properties.data.properties.relationships, {
|
||||
properties: {
|
||||
capability: {
|
||||
type: 'object',
|
||||
properties: {
|
||||
data: {
|
||||
type: 'object',
|
||||
properties: {
|
||||
type: {
|
||||
type: 'string',
|
||||
enum: ['capabilities'],
|
||||
},
|
||||
id: { $ref: '#/components/schemas/CapabilityType' },
|
||||
},
|
||||
required: ['id', 'type'],
|
||||
},
|
||||
},
|
||||
required: ['data'],
|
||||
}
|
||||
},
|
||||
required: ['capability'],
|
||||
})
|
||||
|
||||
// we don't use this but it triggers a deprecation warning. see:
|
||||
// https://github.com/apple/swift-openapi-generator/issues/715
|
||||
schemas.App.properties.relationships.properties.inAppPurchases.deprecated = false;
|
||||
|
||||
// openapi-generator expects response enums to be exhaustive. Apple's ASC OpenAPI spec
|
||||
// misses some cases that they do, actually, return. So we make all bona fide enums in
|
||||
// schema.components.schemas open. We don't do this on the schema.paths side because
|
||||
// most (all?) of the enums in there are on the request side rather than the response.
|
||||
// https://swiftpackageindex.com/apple/swift-openapi-generator/1.7.2/documentation/swift-openapi-generator/useful-openapi-patterns#Open-enums-and-oneOfs
|
||||
openAll(schemas);
|
||||
|
||||
return schema;
|
||||
}
|
||||
|
||||
const text = fs.readFileSync(process.stdin.fd, 'utf8');
|
||||
const json = JSON.parse(text);
|
||||
const patched = patch(json);
|
||||
const patchedText = JSON.stringify(patched);
|
||||
console.log(patchedText);
|
||||
@@ -15,14 +15,15 @@ public struct BuildSettings: Sendable {
|
||||
|
||||
public init(
|
||||
configuration: BuildConfiguration,
|
||||
triple: String,
|
||||
packagePath: String = ".",
|
||||
options: [String] = []
|
||||
) async throws {
|
||||
self.packagePath = packagePath
|
||||
self.configuration = configuration
|
||||
self.options = options
|
||||
self.triple = triple
|
||||
|
||||
// TODO: allow customizing?
|
||||
self.triple = "arm64-apple-ios"
|
||||
|
||||
// on macOS we don't explicitly install a Swift SDK but
|
||||
// SwiftPM vends "implicit" Darwin SDKs as of Swift 6.1,
|
||||
|
||||
@@ -14,8 +14,6 @@ public struct PackSchemaBase: Codable, Sendable {
|
||||
public var product: String?
|
||||
|
||||
public var infoPath: String?
|
||||
public var entitlementsPath: String?
|
||||
|
||||
public var iconPath: String?
|
||||
public var resources: [String]?
|
||||
}
|
||||
|
||||
@@ -153,8 +153,7 @@ public struct Planner: Sendable {
|
||||
bundleID: bundleID,
|
||||
infoPlist: infoPlist,
|
||||
resources: resources,
|
||||
iconPath: self.schema.base.iconPath,
|
||||
entitlementsPath: self.schema.base.entitlementsPath
|
||||
iconPath: self.schema.base.iconPath
|
||||
)
|
||||
}
|
||||
|
||||
@@ -218,7 +217,6 @@ public struct Plan: Sendable {
|
||||
public var infoPlist: [String: any Sendable]
|
||||
public var resources: [Resource]
|
||||
public var iconPath: String?
|
||||
public var entitlementsPath: String?
|
||||
}
|
||||
|
||||
public enum Resource: Codable, Sendable {
|
||||
|
||||
@@ -42,15 +42,6 @@ public struct XcodePacker {
|
||||
throw StringError("Could not parse deployment target '\(plan.deploymentTarget)'")
|
||||
}
|
||||
|
||||
var buildSettings: [String: Any] = [
|
||||
"PRODUCT_BUNDLE_IDENTIFIER": plan.bundleID,
|
||||
"TARGETED_DEVICE_FAMILY": families.map { "\($0)" }.joined(separator: ","),
|
||||
]
|
||||
|
||||
if let entitlementsPath = plan.entitlementsPath {
|
||||
buildSettings["CODE_SIGN_ENTITLEMENTS"] = fromProjectToRoot + Path(entitlementsPath)
|
||||
}
|
||||
|
||||
let project = Project(
|
||||
name: plan.product,
|
||||
targets: [
|
||||
@@ -59,7 +50,10 @@ public struct XcodePacker {
|
||||
type: .application,
|
||||
platform: .iOS,
|
||||
deploymentTarget: deploymentTarget,
|
||||
settings: Settings(buildSettings: buildSettings),
|
||||
settings: Settings(buildSettings: [
|
||||
"PRODUCT_BUNDLE_IDENTIFIER": plan.bundleID,
|
||||
"TARGETED_DEVICE_FAMILY": families.map { "\($0)" }.joined(separator: ","),
|
||||
]),
|
||||
sources: [
|
||||
TargetSource(path: (fromProjectToRoot + emptyFile).string),
|
||||
],
|
||||
|
||||
@@ -41,22 +41,14 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
|
||||
private func upsertApp(
|
||||
bundleID: String,
|
||||
entitlements: Entitlements,
|
||||
isFreeTeam: Bool
|
||||
isFreeTeam: Bool,
|
||||
appIDs: [String: Components.Schemas.BundleId]
|
||||
) async throws -> Components.Schemas.BundleId {
|
||||
let newBundleID = ProvisioningIdentifiers.identifier(fromSanitized: bundleID, context: self.context)
|
||||
|
||||
let existing = try await context.developerAPIClient
|
||||
.bundleIdsGetCollection(query: .init(
|
||||
filter_lbrack_identifier_rbrack_: [bundleID]
|
||||
))
|
||||
.ok.body.json.data
|
||||
// filter[identifier] is a prefix filter so we need to manually upgrade to equality
|
||||
.first(where: { $0.attributes?.identifier == newBundleID })
|
||||
|
||||
let appID: Components.Schemas.BundleId
|
||||
if let existing {
|
||||
if let existing = appIDs[bundleID] {
|
||||
appID = existing
|
||||
} else {
|
||||
let newBundleID = ProvisioningIdentifiers.identifier(fromSanitized: bundleID, context: self.context)
|
||||
let name = ProvisioningIdentifiers.appName(fromSanitized: bundleID)
|
||||
let createResponse = try await context.developerAPIClient.bundleIdsCreateInstance(
|
||||
body: .json(
|
||||
@@ -65,7 +57,7 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
|
||||
_type: .bundleIds,
|
||||
attributes: .init(
|
||||
name: name,
|
||||
platform: .init(.ios),
|
||||
platform: .ios,
|
||||
identifier: newBundleID
|
||||
)
|
||||
)
|
||||
@@ -113,8 +105,8 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
|
||||
}
|
||||
} else {
|
||||
// DeveloperServices doesn't allow deleting these capabilities
|
||||
let requiredCapabilities: Set<Components.Schemas.CapabilityType.Value1Payload> = [.inAppPurchase]
|
||||
if let capType = cap.attributes?.capabilityType?.value1, !requiredCapabilities.contains(capType) {
|
||||
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
|
||||
@@ -158,7 +150,8 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
|
||||
/// that the app has).
|
||||
private func addApp(
|
||||
_ app: URL,
|
||||
isFreeTeam: Bool
|
||||
isFreeTeam: Bool,
|
||||
appIDs: [String: Components.Schemas.BundleId]
|
||||
) async throws -> ProvisioningInfo {
|
||||
let infoURL = app.appendingPathComponent("Info.plist")
|
||||
guard let data = try? Data(contentsOf: infoURL),
|
||||
@@ -172,7 +165,7 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
|
||||
var entitlements: Entitlements
|
||||
// if the executable doesn't already have entitlements, that's
|
||||
// okay. We don't have to throw an error.
|
||||
if let entitlementsData = try? await context.signer.analyze(executable: executableURL),
|
||||
if let entitlementsData = try? await context.signerImpl.analyze(executable: executableURL),
|
||||
let decodedEntitlements = try? PropertyListDecoder().decode(Entitlements.self, from: entitlementsData) {
|
||||
entitlements = decodedEntitlements
|
||||
|
||||
@@ -186,7 +179,7 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
|
||||
entitlements = try Entitlements(entitlements: [])
|
||||
}
|
||||
|
||||
let appID = try await upsertApp(bundleID: bundleID, entitlements: entitlements, isFreeTeam: isFreeTeam)
|
||||
let appID = try await upsertApp(bundleID: bundleID, entitlements: entitlements, isFreeTeam: isFreeTeam, appIDs: appIDs)
|
||||
let newBundleID = appID.attributes!.identifier!
|
||||
|
||||
let teamID = try signingInfo.certificate.teamID()
|
||||
@@ -232,6 +225,17 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
|
||||
)
|
||||
}
|
||||
|
||||
// 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
|
||||
let keyedIDs = bundleIDs
|
||||
.compactMap { id -> (String, Components.Schemas.BundleId)? in
|
||||
guard let bundleID = id.attributes?.identifier else { return nil }
|
||||
return (ProvisioningIdentifiers.sanitize(identifier: bundleID), id)
|
||||
}
|
||||
return Dictionary(keyedIDs, uniquingKeysWith: { $1 })
|
||||
}
|
||||
|
||||
/// Registers the app + its extensions, returning the profile and entitlements of each
|
||||
public func perform() async throws -> [URL: ProvisioningInfo] {
|
||||
var apps: [URL] = [root]
|
||||
@@ -240,7 +244,9 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
|
||||
apps += plugins.implicitContents.filter { $0.pathExtension.lowercased() == "appex" }
|
||||
}
|
||||
|
||||
let isFreeTeam = try await context.auth.team()?.isFree == true
|
||||
async let isFreeTeamTask = context.auth.team()?.isFree == true
|
||||
async let appIDsTask = getCurrentAppIDs()
|
||||
let (isFreeTeam, appIDs) = try await (isFreeTeamTask, appIDsTask)
|
||||
|
||||
return try await withThrowingTaskGroup(
|
||||
of: (URL, ProvisioningInfo).self,
|
||||
@@ -248,7 +254,7 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
|
||||
) { group in
|
||||
for app in apps {
|
||||
group.addTask {
|
||||
let info = try await addApp(app, isFreeTeam: isFreeTeam)
|
||||
let info = try await addApp(app, isFreeTeam: isFreeTeam, appIDs: appIDs)
|
||||
return (app, info)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,11 +15,11 @@ public struct DeveloperServicesCapability: Sendable, Hashable {
|
||||
public var settings: [Components.Schemas.CapabilitySetting]?
|
||||
|
||||
public init(
|
||||
_ capabilityType: Components.Schemas.CapabilityType.Value1Payload,
|
||||
_ capabilityType: Components.Schemas.CapabilityType,
|
||||
isFree: Bool,
|
||||
settings: [Components.Schemas.CapabilitySetting]? = nil
|
||||
) {
|
||||
self.capabilityType = .init(capabilityType)
|
||||
self.capabilityType = capabilityType
|
||||
self.isFree = isFree
|
||||
self.settings = settings
|
||||
}
|
||||
@@ -39,7 +39,7 @@ extension Entitlement {
|
||||
|
||||
extension DataProtectionEntitlement: EntitlementWithCapability {
|
||||
var capability: DeveloperServicesCapability {
|
||||
let option: Components.Schemas.CapabilityOption.KeyPayload.Value1Payload = switch self {
|
||||
let option: Components.Schemas.CapabilityOption.KeyPayload = switch self {
|
||||
case .complete: .completeProtection
|
||||
case .unlessOpen: .protectedUnlessOpen
|
||||
case .untilFirstAuth: .protectedUntilFirstUserAuth
|
||||
@@ -49,8 +49,8 @@ extension DataProtectionEntitlement: EntitlementWithCapability {
|
||||
isFree: true,
|
||||
settings: [
|
||||
.init(
|
||||
key: .init(.dataProtectionPermissionLevel),
|
||||
options: [.init(key: .init(option))]
|
||||
key: .dataProtectionPermissionLevel,
|
||||
options: [.init(key: option)]
|
||||
)
|
||||
]
|
||||
)
|
||||
|
||||
@@ -54,7 +54,7 @@ public struct DeveloperServicesFetchCertificateOperation: DeveloperServicesOpera
|
||||
_type: .certificates,
|
||||
attributes: .init(
|
||||
csrContent: csr.pemString,
|
||||
certificateType: .init(.development)
|
||||
certificateType: .development
|
||||
)
|
||||
)))
|
||||
)
|
||||
|
||||
@@ -6,8 +6,6 @@ import OpenAPIURLSession
|
||||
import Dependencies
|
||||
|
||||
extension DeveloperAPIClient {
|
||||
@TaskLocal fileprivate static var cursor: [URLQueryItem] = []
|
||||
|
||||
public init(
|
||||
auth: DeveloperAPIAuthData
|
||||
) {
|
||||
@@ -19,44 +17,10 @@ extension DeveloperAPIClient {
|
||||
),
|
||||
transport: httpClient.asOpenAPITransport,
|
||||
middlewares: [
|
||||
auth.middleware,
|
||||
LoggingMiddleware(),
|
||||
auth.middleware
|
||||
]
|
||||
)
|
||||
}
|
||||
|
||||
/// Perform a paginated request, starting at the page given by `link`.
|
||||
///
|
||||
/// `link` should be a URL that contains a `cursor` query parameter. The
|
||||
/// cursor will be applied to any requests made inside the closure.
|
||||
public static func withNextLink<T>(
|
||||
_ link: String?,
|
||||
isolation: isolated (any Actor)? = #isolation,
|
||||
perform action: () async throws -> T
|
||||
) async throws -> T {
|
||||
let cursor: [URLQueryItem]
|
||||
|
||||
if let link {
|
||||
guard let components = URLComponents(string: link),
|
||||
let newOffset = components.queryItems?.first(where: { $0.name == "cursor" }),
|
||||
let newLimit = components.queryItems?.first(where: { $0.name == "limit" })
|
||||
else { throw Errors.badNextLink(link) }
|
||||
// the next value will contain a cursor (offset) *and* a limit even if we didn't
|
||||
// provide a limit in our initial request. we need to include the limit in subsequent
|
||||
// requests, otherwise the cursor isn't respected.
|
||||
cursor = [newOffset, newLimit]
|
||||
} else {
|
||||
cursor = []
|
||||
}
|
||||
|
||||
return try await $cursor.withValue(cursor) {
|
||||
try await action()
|
||||
}
|
||||
}
|
||||
|
||||
public enum Errors: Error {
|
||||
case badNextLink(String)
|
||||
}
|
||||
}
|
||||
|
||||
public enum DeveloperAPIAuthData: Sendable {
|
||||
@@ -161,13 +125,9 @@ public struct DeveloperAPIXcodeAuthMiddleware: ClientMiddleware {
|
||||
|
||||
let path = request.path ?? "/"
|
||||
var components = URLComponents(string: path) ?? .init()
|
||||
|
||||
var items = components.queryItems ?? []
|
||||
items.upsertQueryItems(DeveloperAPIClient.cursor + [
|
||||
components.queryItems = (components.queryItems ?? []) + [
|
||||
URLQueryItem(name: "teamId", value: authData.teamID.rawValue)
|
||||
])
|
||||
components.queryItems = items
|
||||
|
||||
]
|
||||
let query = components.percentEncodedQuery ?? ""
|
||||
|
||||
components.query = nil
|
||||
@@ -253,28 +213,9 @@ public struct DeveloperAPIASCAuthMiddleware: ClientMiddleware {
|
||||
_ baseURL: URL
|
||||
) async throws -> (HTTPResponse, HTTPBody?)
|
||||
) async throws -> (HTTPResponse, HTTPBody?) {
|
||||
var request = request
|
||||
|
||||
let jwt = try await generator.generate()
|
||||
var request = request
|
||||
request.headerFields[.authorization] = "Bearer \(jwt)"
|
||||
|
||||
let cursor = DeveloperAPIClient.cursor
|
||||
if !cursor.isEmpty {
|
||||
var components = URLComponents(string: request.path ?? "") ?? .init()
|
||||
var items = components.queryItems ?? []
|
||||
items.upsertQueryItems(cursor)
|
||||
components.queryItems = items
|
||||
request.path = components.string
|
||||
}
|
||||
|
||||
return try await next(request, body, baseURL)
|
||||
}
|
||||
}
|
||||
|
||||
extension [URLQueryItem] {
|
||||
fileprivate mutating func upsertQueryItems(_ items: [URLQueryItem]) {
|
||||
let newNames = Set(items.map(\.name))
|
||||
removeAll { newNames.contains($0.name) }
|
||||
append(contentsOf: items)
|
||||
}
|
||||
}
|
||||
@@ -39,7 +39,7 @@ public struct DeveloperServicesProvisioningOperation: DeveloperServicesOperation
|
||||
|
||||
public func perform() async throws -> Response {
|
||||
progress(0/3)
|
||||
try await DeveloperServicesAddDeviceOperation(context: context).perform()
|
||||
_ = try await DeveloperServicesFetchDeviceOperation(context: context).perform()
|
||||
|
||||
progress(1/3)
|
||||
let signingInfo = try await DeveloperServicesFetchCertificateOperation(
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
import Foundation
|
||||
import DeveloperAPI
|
||||
|
||||
public struct DeveloperServicesAddDeviceOperation: DeveloperServicesOperation {
|
||||
public let context: SigningContext
|
||||
public init(context: SigningContext) {
|
||||
self.context = context
|
||||
}
|
||||
|
||||
public func perform() async throws {
|
||||
guard let targetDevice = context.targetDevice else { return }
|
||||
|
||||
// try to register the device
|
||||
let response = try await context.developerAPIClient.devicesCreateInstance(
|
||||
body: .json(.init(data: .init(
|
||||
_type: .devices,
|
||||
attributes: .init(
|
||||
name: targetDevice.name,
|
||||
platform: .init(.ios),
|
||||
udid: targetDevice.udid
|
||||
)
|
||||
)))
|
||||
)
|
||||
|
||||
// we get a 409 CONFLICT if the device was already registered.
|
||||
// handle this by returning gracefully.
|
||||
if (try? response.conflict) != nil {
|
||||
return
|
||||
}
|
||||
|
||||
// otherwise, we should get a 201 CREATED to indicate that the device
|
||||
// was added. any other case is unexpected, and this will throw.
|
||||
_ = try response.created
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
//
|
||||
// DeveloperServicesFetchDeviceOperation.swift
|
||||
// XKit
|
||||
//
|
||||
// Created by Kabir Oberai on 13/10/19.
|
||||
// Copyright © 2019 Kabir Oberai. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import DeveloperAPI
|
||||
|
||||
public struct DeveloperServicesFetchDeviceOperation: DeveloperServicesOperation {
|
||||
public let context: SigningContext
|
||||
public init(context: SigningContext) {
|
||||
self.context = context
|
||||
}
|
||||
|
||||
public func perform() async throws -> Components.Schemas.Device {
|
||||
let devices = try await context.developerAPIClient.devicesGetCollection().ok.body.json.data
|
||||
|
||||
if let device = devices.first(where: { $0.attributes?.udid == self.context.udid }) {
|
||||
return device
|
||||
}
|
||||
|
||||
let response = try await context.developerAPIClient.devicesCreateInstance(
|
||||
body: .json(.init(data: .init(
|
||||
_type: .devices,
|
||||
attributes: .init(
|
||||
name: self.context.deviceName,
|
||||
platform: .ios,
|
||||
udid: self.context.udid
|
||||
)
|
||||
)))
|
||||
)
|
||||
|
||||
return try response.created.body.json.data
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,78 +0,0 @@
|
||||
import DeveloperAPI
|
||||
|
||||
/// An `AsyncSequence` that unfolds a paginated DeveloperAPI request.
|
||||
///
|
||||
/// Some Developer API GET requests are paginated. Each response contains
|
||||
/// a `links.next` field that points to the next page. This API allows you to
|
||||
/// consume all pages as an `AsyncSequence`. For example, you can
|
||||
/// enumerate all devices with
|
||||
///
|
||||
/// ```swift
|
||||
/// let pages = DeveloperAPIPages {
|
||||
/// try await client.devicesGetCollection().ok.body.json
|
||||
/// } next: {
|
||||
/// $0.links.next
|
||||
/// }
|
||||
/// for try await page in pages {
|
||||
/// print(page.data)
|
||||
/// }
|
||||
/// ```
|
||||
public struct DeveloperAPIPages<Page>: AsyncSequence {
|
||||
// inspired by PagedRequest from
|
||||
// https://github.com/AvdLee/appstoreconnect-swift-sdk
|
||||
|
||||
public var request: @Sendable () async throws -> Page
|
||||
public var getNext: @Sendable (Page) -> String?
|
||||
|
||||
public init(
|
||||
request: @escaping @Sendable () async throws -> Page,
|
||||
next getNext: @escaping @Sendable (Page) -> String?
|
||||
) {
|
||||
self.request = request
|
||||
self.getNext = getNext
|
||||
}
|
||||
|
||||
public func makeAsyncIterator() -> AsyncIterator {
|
||||
AsyncIterator(request: request, getNext: getNext)
|
||||
}
|
||||
|
||||
public struct AsyncIterator: AsyncIteratorProtocol {
|
||||
fileprivate enum State {
|
||||
case initial
|
||||
case hasNext(String)
|
||||
case end
|
||||
}
|
||||
|
||||
fileprivate let request: @Sendable () async throws -> Page
|
||||
fileprivate let getNext: @Sendable (Page) -> String?
|
||||
|
||||
fileprivate var state: State = .initial
|
||||
|
||||
public mutating func next() async throws -> Page? {
|
||||
guard !Task.isCancelled else { return nil }
|
||||
|
||||
let cursor: String?
|
||||
|
||||
switch state {
|
||||
case .initial:
|
||||
cursor = nil
|
||||
case .hasNext(let next):
|
||||
cursor = next
|
||||
case .end:
|
||||
return nil
|
||||
}
|
||||
|
||||
let page = try await DeveloperAPIClient.withNextLink(cursor) {
|
||||
try await request()
|
||||
}
|
||||
|
||||
if let next = getNext(page), next != cursor {
|
||||
state = .hasNext(next)
|
||||
} else {
|
||||
state = .end
|
||||
}
|
||||
|
||||
return page
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,39 +0,0 @@
|
||||
import Foundation
|
||||
import OpenAPIRuntime
|
||||
import HTTPTypes
|
||||
|
||||
struct LoggingMiddleware: ClientMiddleware {
|
||||
static let regex: NSRegularExpression? = {
|
||||
guard let pat = ProcessInfo.processInfo.environment["XTL_DEV_LOG"] else { return nil }
|
||||
return try? NSRegularExpression(pattern: pat)
|
||||
}()
|
||||
|
||||
func intercept(
|
||||
_ request: HTTPRequest,
|
||||
body: HTTPBody?,
|
||||
baseURL: URL,
|
||||
operationID: String,
|
||||
next: (HTTPRequest, HTTPBody?, URL) async throws -> (HTTPResponse, HTTPBody?)
|
||||
) async throws -> (HTTPResponse, HTTPBody?) {
|
||||
var (response, body) = try await next(request, body, baseURL)
|
||||
|
||||
guard Self.regex?.firstMatch(
|
||||
in: operationID,
|
||||
range: NSRange(operationID.startIndex..., in: operationID)
|
||||
) != nil
|
||||
else { return (response, body) }
|
||||
|
||||
print("\n\(operationID) response status -> \(response.status)")
|
||||
|
||||
if let unwrapped = body {
|
||||
let data = try await Data(collecting: unwrapped, upTo: .max)
|
||||
// body may only be consumable once, replace it with the collected data
|
||||
body = .init(data)
|
||||
|
||||
let text = String(decoding: data, as: UTF8.self)
|
||||
print("\(operationID) response body -> \(text)")
|
||||
}
|
||||
|
||||
return (response, body)
|
||||
}
|
||||
}
|
||||
@@ -1,31 +0,0 @@
|
||||
import DeveloperAPI
|
||||
|
||||
// syntactic sugar to make it nicer to work with `anyOf:` types
|
||||
public protocol OpenAPIExtensibleEnum {
|
||||
associatedtype Value1Payload: RawRepresentable<String>, Codable, Hashable, Sendable, CaseIterable
|
||||
var value1: Value1Payload? { get set }
|
||||
var value2: String? { get set }
|
||||
|
||||
init(value1: Value1Payload?, value2: String?)
|
||||
}
|
||||
|
||||
extension OpenAPIExtensibleEnum {
|
||||
public var rawValue: String {
|
||||
value2!
|
||||
}
|
||||
|
||||
public init(_ value: Value1Payload) {
|
||||
self.init(value1: value, value2: nil)
|
||||
}
|
||||
}
|
||||
|
||||
extension Components.Schemas.BundleIdPlatform: OpenAPIExtensibleEnum {}
|
||||
extension Components.Schemas.CapabilityOption.KeyPayload: OpenAPIExtensibleEnum {}
|
||||
extension Components.Schemas.CapabilitySetting.KeyPayload: OpenAPIExtensibleEnum {}
|
||||
extension Components.Schemas.CapabilityType: OpenAPIExtensibleEnum {}
|
||||
extension Components.Schemas.CertificateType: OpenAPIExtensibleEnum {}
|
||||
extension Components.Schemas.Device.AttributesPayload.DeviceClassPayload: OpenAPIExtensibleEnum {}
|
||||
extension Components.Schemas.Device.AttributesPayload.StatusPayload: OpenAPIExtensibleEnum {}
|
||||
extension Components.Schemas.Profile.AttributesPayload.ProfileStatePayload: OpenAPIExtensibleEnum {}
|
||||
extension Components.Schemas.Profile.AttributesPayload.ProfileTypePayload: OpenAPIExtensibleEnum {}
|
||||
extension Components.Schemas.ProfileCreateRequest.DataPayload.AttributesPayload.ProfileTypePayload: OpenAPIExtensibleEnum {}
|
||||
@@ -71,7 +71,6 @@ public struct DeveloperServicesFetchProfileOperation: DeveloperServicesOperation
|
||||
|
||||
let allDevices = try await context.developerAPIClient.devicesGetCollection()
|
||||
.ok.body.json.data
|
||||
.filter { $0.attributes?.deviceClass?.value1?.supportsIOSApps == true }
|
||||
|
||||
let response = try await context.developerAPIClient.profilesCreateInstance(
|
||||
body: .json(
|
||||
@@ -79,8 +78,8 @@ public struct DeveloperServicesFetchProfileOperation: DeveloperServicesOperation
|
||||
data: .init(
|
||||
_type: .profiles,
|
||||
attributes: .init(
|
||||
name: "XTL profile \(bundleID.id)",
|
||||
profileType: .init(.iosAppDevelopment)
|
||||
name: "SC profile \(bundleID.id)",
|
||||
profileType: .iosAppDevelopment
|
||||
),
|
||||
relationships: .init(
|
||||
bundleId: .init(
|
||||
@@ -107,12 +106,3 @@ public struct DeveloperServicesFetchProfileOperation: DeveloperServicesOperation
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
extension Components.Schemas.Device.AttributesPayload.DeviceClassPayload.Value1Payload {
|
||||
fileprivate var supportsIOSApps: Bool {
|
||||
switch self {
|
||||
case .ipad, .iphone, .ipod: true
|
||||
default: false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -75,6 +75,11 @@ public actor AppInstaller {
|
||||
}
|
||||
}
|
||||
|
||||
// serial queue
|
||||
private let installQueue = DispatchQueue(
|
||||
label: "com.kabiroberai.xtool.install-queue"
|
||||
)
|
||||
|
||||
public let ipa: URL
|
||||
public let udid: String
|
||||
public let connectionPreferences: Connection.Preferences
|
||||
|
||||
@@ -239,7 +239,9 @@ public actor IntegratedInstaller {
|
||||
guard let appDir = payload.implicitContents.first(where: { $0.pathExtension == "app" })
|
||||
else { throw Error.appExtractionFailed }
|
||||
|
||||
try await updateStage(to: "Preparing device")
|
||||
try await updateStage(to: "Logging in")
|
||||
|
||||
try await self.updateStage(to: "Preparing device")
|
||||
|
||||
// TODO: Maybe use `Connection` here instead of creating the lockdown
|
||||
// client manually?
|
||||
@@ -268,11 +270,12 @@ public actor IntegratedInstaller {
|
||||
try await updateProgress(to: 1)
|
||||
|
||||
let context = try SigningContext(
|
||||
auth: auth,
|
||||
targetDevice: .init(udid: udid, name: deviceName)
|
||||
udid: udid,
|
||||
deviceName: deviceName,
|
||||
auth: auth
|
||||
)
|
||||
|
||||
let signer = AutoSigner(context: context) { certs in
|
||||
let signer = Signer(context: context) { certs in
|
||||
await self.delegate?.confirmRevocation(of: certs) ?? false
|
||||
}
|
||||
let bundleID = try await signer.sign(
|
||||
|
||||
@@ -1,7 +1,14 @@
|
||||
//
|
||||
// Signer.swift
|
||||
// XKit
|
||||
//
|
||||
// Created by Kabir Oberai on 13/10/19.
|
||||
// Copyright © 2019 Kabir Oberai. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
/// Provisions and codesigns.
|
||||
public struct AutoSigner {
|
||||
public struct Signer {
|
||||
|
||||
public enum Error: LocalizedError {
|
||||
case noSigners
|
||||
@@ -85,9 +92,10 @@ public struct AutoSigner {
|
||||
let entitlements = provisioningDict.mapValues(\.entitlements)
|
||||
|
||||
status(NSLocalizedString("signer.signing", value: "Signing", comment: ""))
|
||||
try await context.signer.sign(
|
||||
try await context.signerImpl.sign(
|
||||
app: app,
|
||||
identity: .real(signingInfo.certificate, signingInfo.privateKey),
|
||||
certificate: signingInfo.certificate,
|
||||
privateKey: signingInfo.privateKey,
|
||||
entitlementMapping: entitlements,
|
||||
progress: progress
|
||||
)
|
||||
@@ -1,10 +1,23 @@
|
||||
//
|
||||
// SignerImpl.swift
|
||||
// XKit
|
||||
//
|
||||
// Created by Kabir Oberai on 10/10/19.
|
||||
// Copyright © 2019 Kabir Oberai. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import CXKit
|
||||
import SignerSupport
|
||||
import ConcurrencyExtras
|
||||
|
||||
/// a wrapper around `signer_t`
|
||||
public actor Signer {
|
||||
/// a wrapper around signer_t
|
||||
public actor SignerImpl {
|
||||
|
||||
private static let signingQueue = DispatchQueue(
|
||||
label: "com.kabiroberai.xtool.signing-queue",
|
||||
attributes: .concurrent
|
||||
)
|
||||
|
||||
public enum Error: LocalizedError {
|
||||
case notFound
|
||||
@@ -31,11 +44,6 @@ public actor Signer {
|
||||
}
|
||||
}
|
||||
|
||||
public enum Identity {
|
||||
case real(Certificate, PrivateKey)
|
||||
case adhoc
|
||||
}
|
||||
|
||||
private let signer: UnsafePointer<signer_t>
|
||||
public var name: String {
|
||||
String(cString: signer.pointee.name)
|
||||
@@ -45,23 +53,24 @@ public actor Signer {
|
||||
self.signer = signer.value
|
||||
}
|
||||
|
||||
public static func all() -> some Collection<Signer> {
|
||||
public static func all() -> some Collection<SignerImpl> {
|
||||
var list = get_signers()
|
||||
var arr: [Signer] = []
|
||||
var arr: [SignerImpl] = []
|
||||
while let curr = list {
|
||||
arr.append(Signer(signer: UncheckedSendable(curr)))
|
||||
arr.append(SignerImpl(signer: UncheckedSendable(curr)))
|
||||
list = curr.pointee.next
|
||||
}
|
||||
return arr
|
||||
}
|
||||
|
||||
public static func first() throws -> Signer {
|
||||
public static func first() throws -> SignerImpl {
|
||||
try all().first.orThrow(Error.notFound)
|
||||
}
|
||||
|
||||
private func _sign(
|
||||
app: URL,
|
||||
identity: Identity,
|
||||
certificate: Certificate,
|
||||
privateKey: PrivateKey,
|
||||
entitlementMapping: [URL: Entitlements],
|
||||
progress: @escaping (Double?) -> Void
|
||||
) throws {
|
||||
@@ -90,32 +99,14 @@ public actor Signer {
|
||||
}
|
||||
let sendableProgress = UncheckedSendable(progress)
|
||||
let sendableEntsArray = UncheckedSendable(entsArray)
|
||||
|
||||
let certificateData: Data
|
||||
let privateKeyData: Data
|
||||
let lengthOverride: Int?
|
||||
switch identity {
|
||||
case .real(let certificate, let privateKey):
|
||||
certificateData = try certificate.data()
|
||||
privateKeyData = privateKey.data
|
||||
lengthOverride = nil
|
||||
case .adhoc:
|
||||
// we can't use empty data here because withUnsafeBytes
|
||||
// might return a bufferpointer with a nil base address,
|
||||
// but signer.h expects non-null values. The real fix is
|
||||
// updating xtool-core/SignerSupport/signer.h to annotate
|
||||
// the pointers as nullable, but alas that requires effort.
|
||||
certificateData = Data([0])
|
||||
privateKeyData = Data([0])
|
||||
lengthOverride = 0
|
||||
}
|
||||
|
||||
try certificateData.withUnsafeBytes { cert in
|
||||
try privateKeyData.withUnsafeBytes { priv in
|
||||
try certificate.data().withUnsafeBytes { cert in
|
||||
let sendableCert = UncheckedSendable(cert)
|
||||
try privateKey.data.withUnsafeBytes { priv in
|
||||
var exception: UnsafeMutablePointer<Int8>?
|
||||
defer { exception.map { free($0) } }
|
||||
|
||||
let progress = sendableProgress.value
|
||||
let cert = sendableCert.value
|
||||
let entsArray = sendableEntsArray.value
|
||||
|
||||
guard let certBase = cert.baseAddress,
|
||||
@@ -126,8 +117,8 @@ public actor Signer {
|
||||
defer { box.release() }
|
||||
guard signer.pointee.sign(
|
||||
app.path,
|
||||
certBase, lengthOverride ?? cert.count,
|
||||
privBase, lengthOverride ?? priv.count,
|
||||
certBase, cert.count,
|
||||
privBase, priv.count,
|
||||
entsArray, entsArray.count,
|
||||
{
|
||||
// swiftlint:disable:previous opening_brace
|
||||
@@ -149,13 +140,15 @@ public actor Signer {
|
||||
|
||||
public func sign(
|
||||
app: URL,
|
||||
identity: Identity,
|
||||
certificate: Certificate,
|
||||
privateKey: PrivateKey,
|
||||
entitlementMapping: [URL: Entitlements],
|
||||
progress: @escaping (Double?) -> Void
|
||||
) async throws {
|
||||
try self._sign(
|
||||
app: app,
|
||||
identity: identity,
|
||||
certificate: certificate,
|
||||
privateKey: privateKey,
|
||||
entitlementMapping: entitlementMapping,
|
||||
progress: progress
|
||||
)
|
||||
|
||||
@@ -11,27 +11,25 @@ import DeveloperAPI
|
||||
|
||||
public struct SigningContext: Sendable {
|
||||
|
||||
public struct TargetDevice: Sendable, Hashable {
|
||||
public var udid: String
|
||||
public var name: String
|
||||
}
|
||||
|
||||
public var auth: DeveloperAPIAuthData
|
||||
public var targetDevice: TargetDevice?
|
||||
public var signer: Signer
|
||||
public let udid: String
|
||||
public let deviceName: String
|
||||
public let auth: DeveloperAPIAuthData
|
||||
public let signerImpl: SignerImpl
|
||||
|
||||
public var developerAPIClient: DeveloperAPIClient {
|
||||
DeveloperAPIClient(auth: auth)
|
||||
}
|
||||
|
||||
public init(
|
||||
udid: String,
|
||||
deviceName: String,
|
||||
auth: DeveloperAPIAuthData,
|
||||
targetDevice: TargetDevice? = nil,
|
||||
signer: Signer? = nil
|
||||
signerImpl: SignerImpl? = nil
|
||||
) throws {
|
||||
self.udid = udid
|
||||
self.deviceName = deviceName
|
||||
self.auth = auth
|
||||
self.targetDevice = targetDevice
|
||||
self.signer = try signer ?? .first()
|
||||
self.signerImpl = try signerImpl ?? .first()
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -21,8 +21,8 @@ extension ProvisioningIdentifiers {
|
||||
return identifier.split(separator: ".").dropFirst().joined(separator: ".")
|
||||
}
|
||||
|
||||
static func identifier(fromSanitized sanitized: String, context: SigningContext) -> String {
|
||||
let uuid = context.auth.identityID.split(separator: "-")[0].uppercased()
|
||||
static func identifier(fromSanitized sanitized: String, context: SigningContext? = nil) -> String {
|
||||
let uuid = (context?.auth.identityID ?? UUID().uuidString).split(separator: "-")[0].uppercased()
|
||||
return "\(Self.idPrefix)\(uuid).\(sanitized)"
|
||||
}
|
||||
|
||||
@@ -36,7 +36,7 @@ extension ProvisioningIdentifiers {
|
||||
return sanitize(identifier: id)
|
||||
}
|
||||
|
||||
static func groupID(fromSanitized sanitized: String, context: SigningContext) -> DeveloperServicesAppGroup.GroupID {
|
||||
static func groupID(fromSanitized sanitized: String, context: SigningContext? = nil) -> DeveloperServicesAppGroup.GroupID {
|
||||
.init(rawValue: "\(Self.groupPrefix)\(identifier(fromSanitized: sanitized, context: context))")
|
||||
}
|
||||
|
||||
|
||||
@@ -22,15 +22,7 @@ struct DSCertificatesListCommand: AsyncParsableCommand {
|
||||
|
||||
func run() async throws {
|
||||
let client = DeveloperAPIClient(auth: try AuthToken.saved().authData())
|
||||
|
||||
let certificates = try await DeveloperAPIPages {
|
||||
try await client.certificatesGetCollection().ok.body.json
|
||||
} next: {
|
||||
$0.links.next
|
||||
}
|
||||
.map(\.data)
|
||||
.reduce(into: [], +=)
|
||||
|
||||
let certificates = try await client.certificatesGetCollection().ok.body.json.data
|
||||
for certificate in certificates {
|
||||
print("- id: \(certificate.id)")
|
||||
guard let attributes = certificate.attributes else {
|
||||
|
||||
@@ -22,15 +22,7 @@ struct DSDevicesListCommand: AsyncParsableCommand {
|
||||
|
||||
func run() async throws {
|
||||
let client = DeveloperAPIClient(auth: try AuthToken.saved().authData())
|
||||
|
||||
let devices = try await DeveloperAPIPages {
|
||||
try await client.devicesGetCollection().ok.body.json
|
||||
} next: {
|
||||
$0.links.next
|
||||
}
|
||||
.map(\.data)
|
||||
.reduce(into: [], +=)
|
||||
|
||||
let devices = try await client.devicesGetCollection().ok.body.json.data
|
||||
for device in devices {
|
||||
print("- id: \(device.id)")
|
||||
guard let attributes = device.attributes else {
|
||||
|
||||
@@ -22,15 +22,7 @@ struct DSIdentifiersListCommand: AsyncParsableCommand {
|
||||
|
||||
func run() async throws {
|
||||
let client = DeveloperAPIClient(auth: try AuthToken.saved().authData())
|
||||
|
||||
let bundleIDs = try await DeveloperAPIPages {
|
||||
try await client.bundleIdsGetCollection().ok.body.json
|
||||
} next: {
|
||||
$0.links.next
|
||||
}
|
||||
.map(\.data)
|
||||
.reduce(into: [], +=)
|
||||
|
||||
let bundleIDs = try await client.bundleIdsGetCollection().ok.body.json.data
|
||||
for bundleID in bundleIDs {
|
||||
print("- id: \(bundleID.id)")
|
||||
guard let attributes = bundleID.attributes else {
|
||||
|
||||
@@ -24,15 +24,7 @@ struct DSProfilesListCommand: AsyncParsableCommand {
|
||||
|
||||
func run() async throws {
|
||||
let client = DeveloperAPIClient(auth: try AuthToken.saved().authData())
|
||||
|
||||
let profiles = try await DeveloperAPIPages {
|
||||
try await client.profilesGetCollection().ok.body.json
|
||||
} next: {
|
||||
$0.links.next
|
||||
}
|
||||
.map(\.data)
|
||||
.reduce(into: [], +=)
|
||||
|
||||
let profiles = try await client.profilesGetCollection().ok.body.json.data
|
||||
for profile in profiles {
|
||||
print("- id: \(profile.id)")
|
||||
guard let attributes = profile.attributes else {
|
||||
|
||||
@@ -18,9 +18,6 @@ struct PackOperation {
|
||||
}
|
||||
}
|
||||
|
||||
static let defaultTriple = "arm64-apple-ios"
|
||||
|
||||
var triple: String?
|
||||
var buildOptions = BuildOptions(configuration: .debug)
|
||||
var xcode = false
|
||||
|
||||
@@ -42,7 +39,6 @@ struct PackOperation {
|
||||
|
||||
let buildSettings = try await BuildSettings(
|
||||
configuration: buildOptions.configuration,
|
||||
triple: triple ?? Self.defaultTriple,
|
||||
options: []
|
||||
)
|
||||
|
||||
@@ -62,22 +58,7 @@ struct PackOperation {
|
||||
buildSettings: buildSettings,
|
||||
plan: plan
|
||||
)
|
||||
let bundle = try await packer.pack()
|
||||
|
||||
if let entitlementsPath = plan.entitlementsPath {
|
||||
let data = try await Data(reading: URL(fileURLWithPath: entitlementsPath))
|
||||
let decoder = PropertyListDecoder()
|
||||
let entitlements = try decoder.decode(Entitlements.self, from: data)
|
||||
print("Pseudo-signing...")
|
||||
try await Signer.first().sign(
|
||||
app: bundle,
|
||||
identity: .adhoc,
|
||||
entitlementMapping: [bundle: entitlements],
|
||||
progress: { _ in }
|
||||
)
|
||||
}
|
||||
|
||||
return bundle
|
||||
return try await packer.pack()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -109,16 +90,8 @@ struct DevBuildCommand: AsyncParsableCommand {
|
||||
help: "Output a .ipa file instead of a .app"
|
||||
) var ipa = false
|
||||
|
||||
@Option(
|
||||
help: ArgumentHelp(
|
||||
"Custom target triple to build for",
|
||||
discussion: "Defaults to '\(PackOperation.defaultTriple)'"
|
||||
)
|
||||
) var triple: String?
|
||||
|
||||
func run() async throws {
|
||||
let url = try await PackOperation(
|
||||
triple: triple,
|
||||
buildOptions: packOptions
|
||||
).run()
|
||||
|
||||
@@ -163,39 +136,10 @@ struct DevRunCommand: AsyncParsableCommand {
|
||||
|
||||
@OptionGroup var packOptions: PackOperation.BuildOptions
|
||||
|
||||
#if os(macOS)
|
||||
@Flag(
|
||||
name: .shortAndLong,
|
||||
help: "Target the iOS Simulator"
|
||||
) var simulator = false
|
||||
|
||||
var triple: String? {
|
||||
if simulator {
|
||||
#if arch(arm64)
|
||||
return "arm64-apple-ios-simulator"
|
||||
#elseif arch(x86_64)
|
||||
return "x86_64-apple-ios-simulator"
|
||||
#else
|
||||
#error("Unsupported architecture")
|
||||
#endif
|
||||
}
|
||||
return nil
|
||||
}
|
||||
#else
|
||||
var triple: String? { nil }
|
||||
#endif
|
||||
|
||||
@OptionGroup var connectionOptions: ConnectionOptions
|
||||
|
||||
func run() async throws {
|
||||
let output = try await PackOperation(triple: triple, buildOptions: packOptions).run()
|
||||
|
||||
#if os(macOS)
|
||||
if simulator {
|
||||
try await SimInstallOperation(path: output).run()
|
||||
return
|
||||
}
|
||||
#endif
|
||||
let output = try await PackOperation(buildOptions: packOptions).run()
|
||||
|
||||
let token = try AuthToken.saved()
|
||||
|
||||
@@ -213,14 +157,7 @@ struct DevRunCommand: AsyncParsableCommand {
|
||||
|
||||
defer { print() }
|
||||
|
||||
do {
|
||||
try await installer.install(app: output)
|
||||
} catch let error as CancellationError {
|
||||
throw error
|
||||
} catch {
|
||||
print("\nError: \(error)")
|
||||
throw ExitCode.failure
|
||||
}
|
||||
try await installer.install(app: output)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -238,20 +175,3 @@ struct DevCommand: AsyncParsableCommand {
|
||||
}
|
||||
|
||||
extension BuildConfiguration: ExpressibleByArgument {}
|
||||
|
||||
#if os(macOS)
|
||||
struct SimInstallOperation {
|
||||
var path: URL
|
||||
|
||||
// TODO: allow customizing this
|
||||
var simulator = "booted"
|
||||
|
||||
func run() async throws {
|
||||
let process = Process()
|
||||
process.executableURL = URL(fileURLWithPath: "/usr/bin/xcrun")
|
||||
process.arguments = ["simctl", "install", simulator, path.path]
|
||||
try await process.runUntilExit()
|
||||
print("Installed to simulator")
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -34,11 +34,9 @@ struct InstallCommand: AsyncParsableCommand {
|
||||
do {
|
||||
try await installer.install(app: URL(fileURLWithPath: path))
|
||||
print("\nSuccessfully installed!")
|
||||
} catch let error as CancellationError {
|
||||
throw error
|
||||
} catch {
|
||||
print("\nError: \(error)")
|
||||
throw ExitCode.failure
|
||||
print("\nFailed :(")
|
||||
print("Error: \(error)")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,35 +16,12 @@ struct SDKBuilder {
|
||||
case app(String)
|
||||
|
||||
init(path: String) throws {
|
||||
var isDir: ObjCBool = false
|
||||
guard FileManager.default.fileExists(atPath: path, isDirectory: &isDir) else {
|
||||
throw Console.Error("Could not read file or directory at path '\(path)'")
|
||||
}
|
||||
|
||||
let url = URL(fileURLWithPath: path)
|
||||
|
||||
if isDir.boolValue {
|
||||
self = .app(path)
|
||||
let devDir = url.appendingPathComponent("Contents/Developer")
|
||||
guard devDir.dirExists else {
|
||||
throw Console.Error("""
|
||||
The provided directory at '\(path)' does not appear to be a version of Xcode: \
|
||||
could not read '\(devDir.path)'.
|
||||
""")
|
||||
}
|
||||
} else {
|
||||
if path.hasSuffix(".xip") {
|
||||
self = .xip(path)
|
||||
let handle = try FileHandle(forReadingFrom: url)
|
||||
defer { try? handle.close() }
|
||||
|
||||
let expectedMagic = "xar!".utf8
|
||||
let actualMagic = try handle.read(upToCount: expectedMagic.count) ?? Data()
|
||||
|
||||
guard actualMagic.elementsEqual(expectedMagic) else {
|
||||
throw Console.Error("""
|
||||
The file at '\(path)' does not appear to be a valid XIP file.
|
||||
""")
|
||||
}
|
||||
} else if path.hasSuffix(".app") || path.hasSuffix(".app/") {
|
||||
self = .app(path)
|
||||
} else {
|
||||
throw Console.Error("Expected input path to end in .xip or .app")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -353,7 +330,7 @@ struct SDKBuilder {
|
||||
guard FileManager.default.changeCurrentDirectoryPath(outDir) else {
|
||||
throw Console.Error("Could not change directory to '\(outDir)'")
|
||||
}
|
||||
defer { _ = FileManager.default.changeCurrentDirectoryPath(oldDirectory) }
|
||||
defer { FileManager.default.changeCurrentDirectoryPath(oldDirectory) }
|
||||
|
||||
let inputStream = DataReader.data(readingFrom: fd.rawValue)
|
||||
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
import CXKit
|
||||
|
||||
extension XTool {
|
||||
public static let version = String(cString: xtl_version())
|
||||
}
|
||||
@@ -8,11 +8,10 @@ public enum XTool {
|
||||
}
|
||||
}
|
||||
|
||||
private struct XToolCommand: AsyncParsableCommand {
|
||||
struct XToolCommand: AsyncParsableCommand {
|
||||
static let configuration = CommandConfiguration(
|
||||
commandName: "xtool",
|
||||
abstract: "Cross-platform Xcode replacement",
|
||||
version: "xtool \(XTool.version)",
|
||||
groupedSubcommands: [
|
||||
CommandGroup(
|
||||
name: "Configuration",
|
||||
@@ -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 `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.
|
||||
> 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.
|
||||
>
|
||||
> 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).
|
||||
|
||||
@@ -107,36 +107,3 @@ iconPath: Resources/AppIcon.png
|
||||
> Tip:
|
||||
>
|
||||
> Your app icon must be a png, and it should ideally have a resolution of 1024x1024px.
|
||||
|
||||
## Add entitlements
|
||||
|
||||
You may need to add special [entitlements](https://developer.apple.com/documentation/bundleresources/entitlements) to your app, for example you need the `com.apple.developer.homekit` entitlement in order to connect to HomeKit devices.
|
||||
|
||||
First create an `App.entitlements` file with the necessary entitlements:
|
||||
|
||||
```plist
|
||||
<?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>com.apple.developer.homekit</key>
|
||||
<true/>
|
||||
</dict>
|
||||
</plist>
|
||||
```
|
||||
|
||||
Then, tell xtool about it via `xtool.yml`:
|
||||
|
||||
```yaml
|
||||
entitlementsPath: App.entitlements
|
||||
```
|
||||
|
||||
> Troubleshooting:
|
||||
>
|
||||
> There are a number of situations in which xtool may not be able to successfully apply an entitlement to your app.
|
||||
>
|
||||
> - Some entitlements, such as [Network Extension](https://developer.apple.com/documentation/bundleresources/entitlements/com.apple.developer.networking.networkextension), don't work with free developer accounts. You might need to enrol in one of the Apple Developer Programs to use these.
|
||||
> - Other entitlements, like [User Notifications Filtering](https://developer.apple.com/documentation/bundleresources/entitlements/com.apple.developer.usernotifications.filtering), require special permission from Apple. If you do have the appropriate permission, these may or may not work with xtool.
|
||||
> - Many entitlements require specific "Capabilities" to be enabled on your app in the Developer Services portal. xtool handles this for you, but we need to add code to xtool for each Entitlement-Capability mapping. If you run into a Capability that we don't handle yet, please let us know.
|
||||
>
|
||||
> Entitlements are a large surface area. If you find any bugs or missing functionality, please [create a GitHub Issue](https://github.com/xtool-org/xtool/issues/new/choose).
|
||||
@@ -1,10 +1,4 @@
|
||||
# xtool
|
||||
|
||||
@Metadata {
|
||||
@TechnologyRoot
|
||||
@TitleHeading("Command-line Tool")
|
||||
@CallToAction(url: "https://github.com/xtool-org/xtool", label: "View on GitHub")
|
||||
}
|
||||
# ``xtool``
|
||||
|
||||
Cross-platform Xcode replacement.
|
||||
|
||||
|
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 |
@@ -6,7 +6,4 @@ ENABLE_HARDENED_RUNTIME = YES
|
||||
PRODUCT_NAME = xtool
|
||||
PRODUCT_MODULE_NAME = XToolMac
|
||||
|
||||
INFOPLIST_KEY_LSApplicationCategoryType = public.app-category.developer-tools
|
||||
|
||||
#include? "Private-Team.xcconfig"
|
||||
#include? "Private.xcconfig"
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
[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 = "Documentation/"
|
||||
publish = "xtool.docc/.docc-build"
|
||||
command = "./build.sh"
|
||||
environment = { SWIFT_VERSION = "6.1" }
|
||||
ignore = "git -C .. diff --quiet $CACHED_COMMIT_REF $COMMIT_REF -- Documentation netlify.toml"
|
||||
|
||||
[[redirects]]
|
||||
from = "/"
|
||||
to = "/documentation/xtool/"
|
||||
status = 302
|
||||
force = true
|
||||
|
||||
[[redirects]]
|
||||
from = "/documentation"
|
||||
to = "/documentation/xtool/"
|
||||
status = 302
|
||||
force = true
|
||||
|
||||
[[redirects]]
|
||||
from = "/tutorials"
|
||||
to = "/tutorials/xtool"
|
||||
status = 302
|
||||
force = true
|
||||
|
||||
# --- Backwards compatibility ---
|
||||
|
||||
[[redirects]]
|
||||
from = "/tutorials/toc"
|
||||
to = "/tutorials/xtool"
|
||||
status = 302
|
||||
|
||||
[[redirects]]
|
||||
from = "/documentation/xtooldocs/*"
|
||||
to = "/documentation/xtool/:splat"
|
||||
status = 302
|
||||
|
||||
[[redirects]]
|
||||
from = "/tutorials/xtooldocs/*"
|
||||
to = "/tutorials/xtool/:splat"
|
||||
status = 302
|
||||
@@ -1,31 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# we can't simply extract the portion in brackets because some times the Organizational Unit is different from that
|
||||
# so extract that info from the certificate
|
||||
function get_team {
|
||||
security find-certificate -pc "$1" | openssl x509 -noout -subject | grep -o 'OU=[A-Z0-9]*' | cut -d= -f2
|
||||
}
|
||||
|
||||
IFS=$'\n' names=($(security find-identity -vp codesigning | grep -E '(?:iPhone Developer|Apple Development):' | cut -d'"' -f2 | uniq))
|
||||
if [[ "${#names[@]}" -eq 1 ]]; then
|
||||
identity="${names[0]}"
|
||||
else
|
||||
echo "Select identity" >&2
|
||||
for i in "${!names[@]}"; do
|
||||
cur_identity="${names[$i]}"
|
||||
cur_team="$(get_team "$cur_identity")"
|
||||
printf "%s. %s '%s'\n" $((i + 1)) "$cur_team" "$cur_identity" >&2
|
||||
done
|
||||
# ask for choice until the user supplies a valid answer
|
||||
function select_identity {
|
||||
read -p "Choice (enter number): " identity_idx >&2
|
||||
if [[ "$identity_idx" -lt 1 || "$identity_idx" -gt "${#names[@]}" ]]; then
|
||||
select_identity
|
||||
else
|
||||
identity="${names[$((identity_idx - 1))]}"
|
||||
fi
|
||||
}
|
||||
select_identity
|
||||
fi
|
||||
|
||||
get_team "$identity"
|
||||