mirror of
https://github.com/xtool-org/xtool.git
synced 2026-11-21 10:45:53 +03:00
Compare commits
9 Commits
@@ -25,3 +25,15 @@ jobs:
|
||||
- name: Build
|
||||
run: |
|
||||
swift build --product xtool
|
||||
build-ios:
|
||||
runs-on: macos-15
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
- name: Build
|
||||
run: |
|
||||
set -o pipefail \
|
||||
&& xcodebuild build \
|
||||
-skipMacroValidation -skipPackagePluginValidation \
|
||||
-scheme XKit -destination generic/platform=iOS \
|
||||
| xcbeautify
|
||||
|
||||
@@ -19,12 +19,14 @@ jobs:
|
||||
uses: actions/checkout@v4
|
||||
- name: Build
|
||||
run: |
|
||||
docker compose run --build --rm xtool bash -c "Linux/build.sh && mv Linux/packages/xtool{,-${{ matrix.host.arch }}}.AppImage"
|
||||
docker compose run --build --rm xtool Linux/build.sh
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: xtool-${{ matrix.host.arch }}
|
||||
path: Linux/packages/xtool-${{ matrix.host.arch }}.AppImage
|
||||
path: |
|
||||
Linux/packages/xtool-${{ matrix.host.arch }}.AppImage
|
||||
Linux/packages/xtool-${{ matrix.host.arch }}.AppImage.zsync
|
||||
build-mac:
|
||||
runs-on: macos-15
|
||||
permissions:
|
||||
@@ -72,4 +74,4 @@ jobs:
|
||||
run: |
|
||||
TAG="${GITHUB_REF##*/}-${GITHUB_SHA:0:7}"
|
||||
gh release create "$TAG" --draft --title "Draft Release"
|
||||
gh release upload "$TAG" output/**/*.{AppImage,app.zip,app.dSYM.zip}
|
||||
gh release upload "$TAG" output/**/*.{AppImage,AppImage.zsync,app.zip,app.dSYM.zip}
|
||||
|
||||
+10
-5
@@ -5,8 +5,8 @@ shopt -s nullglob
|
||||
|
||||
cd "$(dirname "$0")"
|
||||
|
||||
# installer version
|
||||
export LINUXDEPLOY_OUTPUT_VERSION="1.0.0"
|
||||
# release version
|
||||
export LINUXDEPLOY_OUTPUT_VERSION="latest"
|
||||
|
||||
if ! command -v fusermount &>/dev/null; then
|
||||
# Docker doesn't support FUSE
|
||||
@@ -21,6 +21,7 @@ bin="$(swift build --package-path .. -c release --show-bin-path)"
|
||||
strip "${bin}/xtool"
|
||||
|
||||
curr_git_info="$(curl -fsSL https://api.github.com/repos/linuxdeploy/linuxdeploy/git/refs/tags/continuous)"
|
||||
curr_arch="$(uname -m)"
|
||||
|
||||
if [[ -f staging/linuxdeploy/git.json ]]; then
|
||||
if ! cmp -s staging/linuxdeploy/git.json <(echo "$curr_git_info"); then
|
||||
@@ -33,7 +34,7 @@ else
|
||||
fi
|
||||
|
||||
if [[ ! -f staging/linuxdeploy/linuxdeploy.AppImage ]]; then
|
||||
curl -fsSL "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-$(arch).AppImage" \
|
||||
curl -fsSL "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-${curr_arch}.AppImage" \
|
||||
-o staging/linuxdeploy/linuxdeploy.AppImage
|
||||
chmod +x staging/linuxdeploy/linuxdeploy.AppImage
|
||||
echo "$curr_git_info" > staging/linuxdeploy/git.json
|
||||
@@ -42,14 +43,18 @@ fi
|
||||
mkdir -p staging/tmp/AppDir/usr/bin
|
||||
find "${bin}"/ -name '*.resources' -print0 | xargs -0 -I {} cp -a {} "${PWD}/staging/tmp/AppDir/usr/bin/"
|
||||
|
||||
LDAI_OUTPUT="staging/tmp/xtool.AppImage" ./staging/linuxdeploy/linuxdeploy.AppImage \
|
||||
env \
|
||||
LDAI_OUTPUT="staging/tmp/xtool.AppImage" \
|
||||
LDAI_UPDATE_INFORMATION="gh-releases-zsync|xtool-org|xtool|latest|xtool-${curr_arch}.AppImage.zsync" \
|
||||
./staging/linuxdeploy/linuxdeploy.AppImage \
|
||||
--appdir staging/tmp/AppDir \
|
||||
--output appimage \
|
||||
-e "${bin}/xtool" \
|
||||
-d xtool.desktop \
|
||||
-i xtool.png
|
||||
mkdir -p packages
|
||||
mv -f staging/tmp/xtool.AppImage packages/xtool.AppImage
|
||||
mv -f staging/tmp/xtool.AppImage "packages/xtool-${curr_arch}.AppImage"
|
||||
mv -f ./xtool.AppImage.zsync "packages/xtool-${curr_arch}.AppImage.zsync"
|
||||
|
||||
rm -rf staging/tmp
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ update-api:
|
||||
@+$(MAKE) -B api
|
||||
|
||||
openapi/openapi.json: openapi/base.json Sources/DeveloperAPI/openapi-overlay.yaml
|
||||
npx bump-cli overlay openapi/base.json Sources/DeveloperAPI/openapi-overlay.yaml > openapi/openapi.json
|
||||
npx --yes bump-cli overlay openapi/base.json Sources/DeveloperAPI/openapi-overlay.yaml > openapi/openapi.json
|
||||
|
||||
openapi/base.json:
|
||||
@mkdir -p openapi
|
||||
|
||||
@@ -2017,6 +2017,207 @@ public struct DeveloperAPIClient: APIProtocol {
|
||||
}
|
||||
)
|
||||
}
|
||||
/// - Remark: HTTP `PATCH /v1/certificates/{id}`.
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/patch(certificates_updateInstance)`.
|
||||
public func certificatesUpdateInstance(_ input: Operations.CertificatesUpdateInstance.Input) async throws -> Operations.CertificatesUpdateInstance.Output {
|
||||
try await client.send(
|
||||
input: input,
|
||||
forOperation: Operations.CertificatesUpdateInstance.id,
|
||||
serializer: { input in
|
||||
let path = try converter.renderedPath(
|
||||
template: "/v1/certificates/{}",
|
||||
parameters: [
|
||||
input.path.id
|
||||
]
|
||||
)
|
||||
var request: HTTPTypes.HTTPRequest = .init(
|
||||
soar_path: path,
|
||||
method: .patch
|
||||
)
|
||||
suppressMutabilityWarning(&request)
|
||||
converter.setAcceptHeader(
|
||||
in: &request.headerFields,
|
||||
contentTypes: input.headers.accept
|
||||
)
|
||||
let body: OpenAPIRuntime.HTTPBody?
|
||||
switch input.body {
|
||||
case let .json(value):
|
||||
body = try converter.setRequiredRequestBodyAsJSON(
|
||||
value,
|
||||
headerFields: &request.headerFields,
|
||||
contentType: "application/json; charset=utf-8"
|
||||
)
|
||||
}
|
||||
return (request, body)
|
||||
},
|
||||
deserializer: { response, responseBody in
|
||||
switch response.status.code {
|
||||
case 200:
|
||||
let contentType = converter.extractContentTypeIfPresent(in: response.headerFields)
|
||||
let body: Operations.CertificatesUpdateInstance.Output.Ok.Body
|
||||
let chosenContentType = try converter.bestContentType(
|
||||
received: contentType,
|
||||
options: [
|
||||
"application/json"
|
||||
]
|
||||
)
|
||||
switch chosenContentType {
|
||||
case "application/json":
|
||||
body = try await converter.getResponseBodyAsJSON(
|
||||
Components.Schemas.CertificateResponse.self,
|
||||
from: responseBody,
|
||||
transforming: { value in
|
||||
.json(value)
|
||||
}
|
||||
)
|
||||
default:
|
||||
preconditionFailure("bestContentType chose an invalid content type.")
|
||||
}
|
||||
return .ok(.init(body: body))
|
||||
case 400:
|
||||
let contentType = converter.extractContentTypeIfPresent(in: response.headerFields)
|
||||
let body: Operations.CertificatesUpdateInstance.Output.BadRequest.Body
|
||||
let chosenContentType = try converter.bestContentType(
|
||||
received: contentType,
|
||||
options: [
|
||||
"application/json"
|
||||
]
|
||||
)
|
||||
switch chosenContentType {
|
||||
case "application/json":
|
||||
body = try await converter.getResponseBodyAsJSON(
|
||||
Components.Schemas.ErrorResponse.self,
|
||||
from: responseBody,
|
||||
transforming: { value in
|
||||
.json(value)
|
||||
}
|
||||
)
|
||||
default:
|
||||
preconditionFailure("bestContentType chose an invalid content type.")
|
||||
}
|
||||
return .badRequest(.init(body: body))
|
||||
case 401:
|
||||
let contentType = converter.extractContentTypeIfPresent(in: response.headerFields)
|
||||
let body: Operations.CertificatesUpdateInstance.Output.Unauthorized.Body
|
||||
let chosenContentType = try converter.bestContentType(
|
||||
received: contentType,
|
||||
options: [
|
||||
"application/json"
|
||||
]
|
||||
)
|
||||
switch chosenContentType {
|
||||
case "application/json":
|
||||
body = try await converter.getResponseBodyAsJSON(
|
||||
Components.Schemas.ErrorResponse.self,
|
||||
from: responseBody,
|
||||
transforming: { value in
|
||||
.json(value)
|
||||
}
|
||||
)
|
||||
default:
|
||||
preconditionFailure("bestContentType chose an invalid content type.")
|
||||
}
|
||||
return .unauthorized(.init(body: body))
|
||||
case 403:
|
||||
let contentType = converter.extractContentTypeIfPresent(in: response.headerFields)
|
||||
let body: Operations.CertificatesUpdateInstance.Output.Forbidden.Body
|
||||
let chosenContentType = try converter.bestContentType(
|
||||
received: contentType,
|
||||
options: [
|
||||
"application/json"
|
||||
]
|
||||
)
|
||||
switch chosenContentType {
|
||||
case "application/json":
|
||||
body = try await converter.getResponseBodyAsJSON(
|
||||
Components.Schemas.ErrorResponse.self,
|
||||
from: responseBody,
|
||||
transforming: { value in
|
||||
.json(value)
|
||||
}
|
||||
)
|
||||
default:
|
||||
preconditionFailure("bestContentType chose an invalid content type.")
|
||||
}
|
||||
return .forbidden(.init(body: body))
|
||||
case 404:
|
||||
let contentType = converter.extractContentTypeIfPresent(in: response.headerFields)
|
||||
let body: Operations.CertificatesUpdateInstance.Output.NotFound.Body
|
||||
let chosenContentType = try converter.bestContentType(
|
||||
received: contentType,
|
||||
options: [
|
||||
"application/json"
|
||||
]
|
||||
)
|
||||
switch chosenContentType {
|
||||
case "application/json":
|
||||
body = try await converter.getResponseBodyAsJSON(
|
||||
Components.Schemas.ErrorResponse.self,
|
||||
from: responseBody,
|
||||
transforming: { value in
|
||||
.json(value)
|
||||
}
|
||||
)
|
||||
default:
|
||||
preconditionFailure("bestContentType chose an invalid content type.")
|
||||
}
|
||||
return .notFound(.init(body: body))
|
||||
case 409:
|
||||
let contentType = converter.extractContentTypeIfPresent(in: response.headerFields)
|
||||
let body: Operations.CertificatesUpdateInstance.Output.Conflict.Body
|
||||
let chosenContentType = try converter.bestContentType(
|
||||
received: contentType,
|
||||
options: [
|
||||
"application/json"
|
||||
]
|
||||
)
|
||||
switch chosenContentType {
|
||||
case "application/json":
|
||||
body = try await converter.getResponseBodyAsJSON(
|
||||
Components.Schemas.ErrorResponse.self,
|
||||
from: responseBody,
|
||||
transforming: { value in
|
||||
.json(value)
|
||||
}
|
||||
)
|
||||
default:
|
||||
preconditionFailure("bestContentType chose an invalid content type.")
|
||||
}
|
||||
return .conflict(.init(body: body))
|
||||
case 422:
|
||||
let contentType = converter.extractContentTypeIfPresent(in: response.headerFields)
|
||||
let body: Operations.CertificatesUpdateInstance.Output.UnprocessableContent.Body
|
||||
let chosenContentType = try converter.bestContentType(
|
||||
received: contentType,
|
||||
options: [
|
||||
"application/json"
|
||||
]
|
||||
)
|
||||
switch chosenContentType {
|
||||
case "application/json":
|
||||
body = try await converter.getResponseBodyAsJSON(
|
||||
Components.Schemas.ErrorResponse.self,
|
||||
from: responseBody,
|
||||
transforming: { value in
|
||||
.json(value)
|
||||
}
|
||||
)
|
||||
default:
|
||||
preconditionFailure("bestContentType chose an invalid content type.")
|
||||
}
|
||||
return .unprocessableContent(.init(body: body))
|
||||
default:
|
||||
return .undocumented(
|
||||
statusCode: response.status.code,
|
||||
.init(
|
||||
headerFields: response.headerFields,
|
||||
body: responseBody
|
||||
)
|
||||
)
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
/// - Remark: HTTP `DELETE /v1/certificates/{id}`.
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/delete(certificates_deleteInstance)`.
|
||||
public func certificatesDeleteInstance(_ input: Operations.CertificatesDeleteInstance.Input) async throws -> Operations.CertificatesDeleteInstance.Output {
|
||||
|
||||
@@ -44,6 +44,9 @@ public protocol APIProtocol: Sendable {
|
||||
/// - Remark: HTTP `GET /v1/certificates/{id}`.
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/get(certificates_getInstance)`.
|
||||
func certificatesGetInstance(_ input: Operations.CertificatesGetInstance.Input) async throws -> Operations.CertificatesGetInstance.Output
|
||||
/// - Remark: HTTP `PATCH /v1/certificates/{id}`.
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/patch(certificates_updateInstance)`.
|
||||
func certificatesUpdateInstance(_ input: Operations.CertificatesUpdateInstance.Input) async throws -> Operations.CertificatesUpdateInstance.Output
|
||||
/// - Remark: HTTP `DELETE /v1/certificates/{id}`.
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/delete(certificates_deleteInstance)`.
|
||||
func certificatesDeleteInstance(_ input: Operations.CertificatesDeleteInstance.Input) async throws -> Operations.CertificatesDeleteInstance.Output
|
||||
@@ -222,6 +225,19 @@ extension APIProtocol {
|
||||
headers: headers
|
||||
))
|
||||
}
|
||||
/// - Remark: HTTP `PATCH /v1/certificates/{id}`.
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/patch(certificates_updateInstance)`.
|
||||
public func certificatesUpdateInstance(
|
||||
path: Operations.CertificatesUpdateInstance.Input.Path,
|
||||
headers: Operations.CertificatesUpdateInstance.Input.Headers = .init(),
|
||||
body: Operations.CertificatesUpdateInstance.Input.Body
|
||||
) async throws -> Operations.CertificatesUpdateInstance.Output {
|
||||
try await certificatesUpdateInstance(Operations.CertificatesUpdateInstance.Input(
|
||||
path: path,
|
||||
headers: headers,
|
||||
body: body
|
||||
))
|
||||
}
|
||||
/// - Remark: HTTP `DELETE /v1/certificates/{id}`.
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/delete(certificates_deleteInstance)`.
|
||||
public func certificatesDeleteInstance(
|
||||
@@ -3116,6 +3132,8 @@ public enum Components {
|
||||
public var expirationDate: Foundation.Date?
|
||||
/// - Remark: Generated from `#/components/schemas/Certificate/attributes/certificateContent`.
|
||||
public var certificateContent: Swift.String?
|
||||
/// - Remark: Generated from `#/components/schemas/Certificate/attributes/activated`.
|
||||
public var activated: Swift.Bool?
|
||||
/// Creates a new `AttributesPayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
@@ -3126,6 +3144,7 @@ public enum Components {
|
||||
/// - platform:
|
||||
/// - expirationDate:
|
||||
/// - certificateContent:
|
||||
/// - activated:
|
||||
public init(
|
||||
name: Swift.String? = nil,
|
||||
certificateType: Components.Schemas.CertificateType? = nil,
|
||||
@@ -3133,7 +3152,8 @@ public enum Components {
|
||||
serialNumber: Swift.String? = nil,
|
||||
platform: Components.Schemas.BundleIdPlatform? = nil,
|
||||
expirationDate: Foundation.Date? = nil,
|
||||
certificateContent: Swift.String? = nil
|
||||
certificateContent: Swift.String? = nil,
|
||||
activated: Swift.Bool? = nil
|
||||
) {
|
||||
self.name = name
|
||||
self.certificateType = certificateType
|
||||
@@ -3142,6 +3162,7 @@ public enum Components {
|
||||
self.platform = platform
|
||||
self.expirationDate = expirationDate
|
||||
self.certificateContent = certificateContent
|
||||
self.activated = activated
|
||||
}
|
||||
public enum CodingKeys: String, CodingKey {
|
||||
case name
|
||||
@@ -3151,6 +3172,7 @@ public enum Components {
|
||||
case platform
|
||||
case expirationDate
|
||||
case certificateContent
|
||||
case activated
|
||||
}
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/Certificate/attributes`.
|
||||
@@ -3269,21 +3291,84 @@ public enum Components {
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateCreateRequest/data/attributes`.
|
||||
public var attributes: Components.Schemas.CertificateCreateRequest.DataPayload.AttributesPayload
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateCreateRequest/data/relationships`.
|
||||
public struct RelationshipsPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateCreateRequest/data/relationships/merchantId`.
|
||||
public struct MerchantIdPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateCreateRequest/data/relationships/merchantId/data`.
|
||||
public struct DataPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateCreateRequest/data/relationships/merchantId/data/type`.
|
||||
@frozen public enum _TypePayload: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case merchantIds = "merchantIds"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateCreateRequest/data/relationships/merchantId/data/type`.
|
||||
public var _type: Components.Schemas.CertificateCreateRequest.DataPayload.RelationshipsPayload.MerchantIdPayload.DataPayload._TypePayload
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateCreateRequest/data/relationships/merchantId/data/id`.
|
||||
public var id: Swift.String
|
||||
/// Creates a new `DataPayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - _type:
|
||||
/// - id:
|
||||
public init(
|
||||
_type: Components.Schemas.CertificateCreateRequest.DataPayload.RelationshipsPayload.MerchantIdPayload.DataPayload._TypePayload,
|
||||
id: Swift.String
|
||||
) {
|
||||
self._type = _type
|
||||
self.id = id
|
||||
}
|
||||
public enum CodingKeys: String, CodingKey {
|
||||
case _type = "type"
|
||||
case id
|
||||
}
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateCreateRequest/data/relationships/merchantId/data`.
|
||||
public var data: Components.Schemas.CertificateCreateRequest.DataPayload.RelationshipsPayload.MerchantIdPayload.DataPayload?
|
||||
/// Creates a new `MerchantIdPayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - data:
|
||||
public init(data: Components.Schemas.CertificateCreateRequest.DataPayload.RelationshipsPayload.MerchantIdPayload.DataPayload? = nil) {
|
||||
self.data = data
|
||||
}
|
||||
public enum CodingKeys: String, CodingKey {
|
||||
case data
|
||||
}
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateCreateRequest/data/relationships/merchantId`.
|
||||
public var merchantId: Components.Schemas.CertificateCreateRequest.DataPayload.RelationshipsPayload.MerchantIdPayload?
|
||||
/// Creates a new `RelationshipsPayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - merchantId:
|
||||
public init(merchantId: Components.Schemas.CertificateCreateRequest.DataPayload.RelationshipsPayload.MerchantIdPayload? = nil) {
|
||||
self.merchantId = merchantId
|
||||
}
|
||||
public enum CodingKeys: String, CodingKey {
|
||||
case merchantId
|
||||
}
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateCreateRequest/data/relationships`.
|
||||
public var relationships: Components.Schemas.CertificateCreateRequest.DataPayload.RelationshipsPayload?
|
||||
/// Creates a new `DataPayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - _type:
|
||||
/// - attributes:
|
||||
/// - relationships:
|
||||
public init(
|
||||
_type: Components.Schemas.CertificateCreateRequest.DataPayload._TypePayload,
|
||||
attributes: Components.Schemas.CertificateCreateRequest.DataPayload.AttributesPayload
|
||||
attributes: Components.Schemas.CertificateCreateRequest.DataPayload.AttributesPayload,
|
||||
relationships: Components.Schemas.CertificateCreateRequest.DataPayload.RelationshipsPayload? = nil
|
||||
) {
|
||||
self._type = _type
|
||||
self.attributes = attributes
|
||||
self.relationships = relationships
|
||||
}
|
||||
public enum CodingKeys: String, CodingKey {
|
||||
case _type = "type"
|
||||
case attributes
|
||||
case relationships
|
||||
}
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateCreateRequest/data`.
|
||||
@@ -3299,6 +3384,69 @@ public enum Components {
|
||||
case data
|
||||
}
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateUpdateRequest`.
|
||||
public struct CertificateUpdateRequest: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateUpdateRequest/data`.
|
||||
public struct DataPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateUpdateRequest/data/type`.
|
||||
@frozen public enum _TypePayload: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case certificates = "certificates"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateUpdateRequest/data/type`.
|
||||
public var _type: Components.Schemas.CertificateUpdateRequest.DataPayload._TypePayload
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateUpdateRequest/data/id`.
|
||||
public var id: Swift.String
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateUpdateRequest/data/attributes`.
|
||||
public struct AttributesPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateUpdateRequest/data/attributes/activated`.
|
||||
public var activated: Swift.Bool?
|
||||
/// Creates a new `AttributesPayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - activated:
|
||||
public init(activated: Swift.Bool? = nil) {
|
||||
self.activated = activated
|
||||
}
|
||||
public enum CodingKeys: String, CodingKey {
|
||||
case activated
|
||||
}
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateUpdateRequest/data/attributes`.
|
||||
public var attributes: Components.Schemas.CertificateUpdateRequest.DataPayload.AttributesPayload?
|
||||
/// Creates a new `DataPayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - _type:
|
||||
/// - id:
|
||||
/// - attributes:
|
||||
public init(
|
||||
_type: Components.Schemas.CertificateUpdateRequest.DataPayload._TypePayload,
|
||||
id: Swift.String,
|
||||
attributes: Components.Schemas.CertificateUpdateRequest.DataPayload.AttributesPayload? = nil
|
||||
) {
|
||||
self._type = _type
|
||||
self.id = id
|
||||
self.attributes = attributes
|
||||
}
|
||||
public enum CodingKeys: String, CodingKey {
|
||||
case _type = "type"
|
||||
case id
|
||||
case attributes
|
||||
}
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateUpdateRequest/data`.
|
||||
public var data: Components.Schemas.CertificateUpdateRequest.DataPayload
|
||||
/// Creates a new `CertificateUpdateRequest`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - data:
|
||||
public init(data: Components.Schemas.CertificateUpdateRequest.DataPayload) {
|
||||
self.data = data
|
||||
}
|
||||
public enum CodingKeys: String, CodingKey {
|
||||
case data
|
||||
}
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/Device`.
|
||||
public struct Device: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/Device/type`.
|
||||
@@ -3325,6 +3473,7 @@ public enum Components {
|
||||
case ipod = "IPOD"
|
||||
case appleTv = "APPLE_TV"
|
||||
case mac = "MAC"
|
||||
case appleVisionPro = "APPLE_VISION_PRO"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/Device/attributes/deviceClass`.
|
||||
public var deviceClass: Components.Schemas.Device.AttributesPayload.DeviceClassPayload?
|
||||
@@ -5033,17 +5182,22 @@ public enum Components {
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CertificateType`.
|
||||
@frozen public enum CertificateType: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case iosDevelopment = "IOS_DEVELOPMENT"
|
||||
case iosDistribution = "IOS_DISTRIBUTION"
|
||||
case macAppDistribution = "MAC_APP_DISTRIBUTION"
|
||||
case macInstallerDistribution = "MAC_INSTALLER_DISTRIBUTION"
|
||||
case macAppDevelopment = "MAC_APP_DEVELOPMENT"
|
||||
case applePay = "APPLE_PAY"
|
||||
case applePayMerchantIdentity = "APPLE_PAY_MERCHANT_IDENTITY"
|
||||
case applePayPspIdentity = "APPLE_PAY_PSP_IDENTITY"
|
||||
case applePayRsa = "APPLE_PAY_RSA"
|
||||
case developerIdKext = "DEVELOPER_ID_KEXT"
|
||||
case developerIdKextG2 = "DEVELOPER_ID_KEXT_G2"
|
||||
case developerIdApplication = "DEVELOPER_ID_APPLICATION"
|
||||
case developerIdApplicationG2 = "DEVELOPER_ID_APPLICATION_G2"
|
||||
case development = "DEVELOPMENT"
|
||||
case distribution = "DISTRIBUTION"
|
||||
case identityAccess = "IDENTITY_ACCESS"
|
||||
case iosDevelopment = "IOS_DEVELOPMENT"
|
||||
case iosDistribution = "IOS_DISTRIBUTION"
|
||||
case macAppDistribution = "MAC_APP_DISTRIBUTION"
|
||||
case macInstallerDistribution = "MAC_INSTALLER_DISTRIBUTION"
|
||||
case macAppDevelopment = "MAC_APP_DEVELOPMENT"
|
||||
case passTypeId = "PASS_TYPE_ID"
|
||||
case passTypeIdWithNfc = "PASS_TYPE_ID_WITH_NFC"
|
||||
}
|
||||
@@ -8419,17 +8573,22 @@ public enum Operations {
|
||||
public var filter_lbrack_displayName_rbrack_: [Swift.String]?
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/GET/query/Filter_lbrack_certificateType_rbrack_Payload`.
|
||||
@frozen public enum FilterLbrackCertificateTypeRbrackPayloadPayload: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case iosDevelopment = "IOS_DEVELOPMENT"
|
||||
case iosDistribution = "IOS_DISTRIBUTION"
|
||||
case macAppDistribution = "MAC_APP_DISTRIBUTION"
|
||||
case macInstallerDistribution = "MAC_INSTALLER_DISTRIBUTION"
|
||||
case macAppDevelopment = "MAC_APP_DEVELOPMENT"
|
||||
case applePay = "APPLE_PAY"
|
||||
case applePayMerchantIdentity = "APPLE_PAY_MERCHANT_IDENTITY"
|
||||
case applePayPspIdentity = "APPLE_PAY_PSP_IDENTITY"
|
||||
case applePayRsa = "APPLE_PAY_RSA"
|
||||
case developerIdKext = "DEVELOPER_ID_KEXT"
|
||||
case developerIdKextG2 = "DEVELOPER_ID_KEXT_G2"
|
||||
case developerIdApplication = "DEVELOPER_ID_APPLICATION"
|
||||
case developerIdApplicationG2 = "DEVELOPER_ID_APPLICATION_G2"
|
||||
case development = "DEVELOPMENT"
|
||||
case distribution = "DISTRIBUTION"
|
||||
case identityAccess = "IDENTITY_ACCESS"
|
||||
case iosDevelopment = "IOS_DEVELOPMENT"
|
||||
case iosDistribution = "IOS_DISTRIBUTION"
|
||||
case macAppDistribution = "MAC_APP_DISTRIBUTION"
|
||||
case macInstallerDistribution = "MAC_INSTALLER_DISTRIBUTION"
|
||||
case macAppDevelopment = "MAC_APP_DEVELOPMENT"
|
||||
case passTypeId = "PASS_TYPE_ID"
|
||||
case passTypeIdWithNfc = "PASS_TYPE_ID_WITH_NFC"
|
||||
}
|
||||
@@ -8473,6 +8632,7 @@ public enum Operations {
|
||||
case platform = "platform"
|
||||
case expirationDate = "expirationDate"
|
||||
case certificateContent = "certificateContent"
|
||||
case activated = "activated"
|
||||
}
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/GET/query/fields[certificates]`.
|
||||
public typealias Fields_lbrack_certificates_rbrack_Payload = [Operations.CertificatesGetCollection.Input.Query.FieldsLbrackCertificatesRbrackPayloadPayload]
|
||||
@@ -9179,6 +9339,7 @@ public enum Operations {
|
||||
case platform = "platform"
|
||||
case expirationDate = "expirationDate"
|
||||
case certificateContent = "certificateContent"
|
||||
case activated = "activated"
|
||||
}
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/GET/query/fields[certificates]`.
|
||||
public typealias Fields_lbrack_certificates_rbrack_Payload = [Operations.CertificatesGetInstance.Input.Query.FieldsLbrackCertificatesRbrackPayloadPayload]
|
||||
@@ -9510,6 +9671,449 @@ public enum Operations {
|
||||
}
|
||||
}
|
||||
}
|
||||
/// - Remark: HTTP `PATCH /v1/certificates/{id}`.
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/patch(certificates_updateInstance)`.
|
||||
public enum CertificatesUpdateInstance {
|
||||
public static let id: Swift.String = "certificates_updateInstance"
|
||||
public struct Input: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/path`.
|
||||
public struct Path: Sendable, Hashable {
|
||||
/// the id of the requested resource
|
||||
///
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/path/id`.
|
||||
public var id: Swift.String
|
||||
/// Creates a new `Path`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - id: the id of the requested resource
|
||||
public init(id: Swift.String) {
|
||||
self.id = id
|
||||
}
|
||||
}
|
||||
public var path: Operations.CertificatesUpdateInstance.Input.Path
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/header`.
|
||||
public struct Headers: Sendable, Hashable {
|
||||
public var accept: [OpenAPIRuntime.AcceptHeaderContentType<Operations.CertificatesUpdateInstance.AcceptableContentType>]
|
||||
/// Creates a new `Headers`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - accept:
|
||||
public init(accept: [OpenAPIRuntime.AcceptHeaderContentType<Operations.CertificatesUpdateInstance.AcceptableContentType>] = .defaultValues()) {
|
||||
self.accept = accept
|
||||
}
|
||||
}
|
||||
public var headers: Operations.CertificatesUpdateInstance.Input.Headers
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/requestBody`.
|
||||
@frozen public enum Body: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/requestBody/content/application\/json`.
|
||||
case json(Components.Schemas.CertificateUpdateRequest)
|
||||
}
|
||||
public var body: Operations.CertificatesUpdateInstance.Input.Body
|
||||
/// Creates a new `Input`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - path:
|
||||
/// - headers:
|
||||
/// - body:
|
||||
public init(
|
||||
path: Operations.CertificatesUpdateInstance.Input.Path,
|
||||
headers: Operations.CertificatesUpdateInstance.Input.Headers = .init(),
|
||||
body: Operations.CertificatesUpdateInstance.Input.Body
|
||||
) {
|
||||
self.path = path
|
||||
self.headers = headers
|
||||
self.body = body
|
||||
}
|
||||
}
|
||||
@frozen public enum Output: Sendable, Hashable {
|
||||
public struct Ok: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/responses/200/content`.
|
||||
@frozen public enum Body: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/responses/200/content/application\/json`.
|
||||
case json(Components.Schemas.CertificateResponse)
|
||||
/// The associated value of the enum case if `self` is `.json`.
|
||||
///
|
||||
/// - Throws: An error if `self` is not `.json`.
|
||||
/// - SeeAlso: `.json`.
|
||||
public var json: Components.Schemas.CertificateResponse {
|
||||
get throws {
|
||||
switch self {
|
||||
case let .json(body):
|
||||
return body
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
/// Received HTTP response body
|
||||
public var body: Operations.CertificatesUpdateInstance.Output.Ok.Body
|
||||
/// Creates a new `Ok`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - body: Received HTTP response body
|
||||
public init(body: Operations.CertificatesUpdateInstance.Output.Ok.Body) {
|
||||
self.body = body
|
||||
}
|
||||
}
|
||||
/// Single Certificate
|
||||
///
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/patch(certificates_updateInstance)/responses/200`.
|
||||
///
|
||||
/// HTTP response code: `200 ok`.
|
||||
case ok(Operations.CertificatesUpdateInstance.Output.Ok)
|
||||
/// The associated value of the enum case if `self` is `.ok`.
|
||||
///
|
||||
/// - Throws: An error if `self` is not `.ok`.
|
||||
/// - SeeAlso: `.ok`.
|
||||
public var ok: Operations.CertificatesUpdateInstance.Output.Ok {
|
||||
get throws {
|
||||
switch self {
|
||||
case let .ok(response):
|
||||
return response
|
||||
default:
|
||||
try throwUnexpectedResponseStatus(
|
||||
expectedStatus: "ok",
|
||||
response: self
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
public struct BadRequest: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/responses/400/content`.
|
||||
@frozen public enum Body: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/responses/400/content/application\/json`.
|
||||
case json(Components.Schemas.ErrorResponse)
|
||||
/// The associated value of the enum case if `self` is `.json`.
|
||||
///
|
||||
/// - Throws: An error if `self` is not `.json`.
|
||||
/// - SeeAlso: `.json`.
|
||||
public var json: Components.Schemas.ErrorResponse {
|
||||
get throws {
|
||||
switch self {
|
||||
case let .json(body):
|
||||
return body
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
/// Received HTTP response body
|
||||
public var body: Operations.CertificatesUpdateInstance.Output.BadRequest.Body
|
||||
/// Creates a new `BadRequest`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - body: Received HTTP response body
|
||||
public init(body: Operations.CertificatesUpdateInstance.Output.BadRequest.Body) {
|
||||
self.body = body
|
||||
}
|
||||
}
|
||||
/// Parameter error(s)
|
||||
///
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/patch(certificates_updateInstance)/responses/400`.
|
||||
///
|
||||
/// HTTP response code: `400 badRequest`.
|
||||
case badRequest(Operations.CertificatesUpdateInstance.Output.BadRequest)
|
||||
/// The associated value of the enum case if `self` is `.badRequest`.
|
||||
///
|
||||
/// - Throws: An error if `self` is not `.badRequest`.
|
||||
/// - SeeAlso: `.badRequest`.
|
||||
public var badRequest: Operations.CertificatesUpdateInstance.Output.BadRequest {
|
||||
get throws {
|
||||
switch self {
|
||||
case let .badRequest(response):
|
||||
return response
|
||||
default:
|
||||
try throwUnexpectedResponseStatus(
|
||||
expectedStatus: "badRequest",
|
||||
response: self
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
public struct Unauthorized: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/responses/401/content`.
|
||||
@frozen public enum Body: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/responses/401/content/application\/json`.
|
||||
case json(Components.Schemas.ErrorResponse)
|
||||
/// The associated value of the enum case if `self` is `.json`.
|
||||
///
|
||||
/// - Throws: An error if `self` is not `.json`.
|
||||
/// - SeeAlso: `.json`.
|
||||
public var json: Components.Schemas.ErrorResponse {
|
||||
get throws {
|
||||
switch self {
|
||||
case let .json(body):
|
||||
return body
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
/// Received HTTP response body
|
||||
public var body: Operations.CertificatesUpdateInstance.Output.Unauthorized.Body
|
||||
/// Creates a new `Unauthorized`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - body: Received HTTP response body
|
||||
public init(body: Operations.CertificatesUpdateInstance.Output.Unauthorized.Body) {
|
||||
self.body = body
|
||||
}
|
||||
}
|
||||
/// Unauthorized error(s)
|
||||
///
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/patch(certificates_updateInstance)/responses/401`.
|
||||
///
|
||||
/// HTTP response code: `401 unauthorized`.
|
||||
case unauthorized(Operations.CertificatesUpdateInstance.Output.Unauthorized)
|
||||
/// The associated value of the enum case if `self` is `.unauthorized`.
|
||||
///
|
||||
/// - Throws: An error if `self` is not `.unauthorized`.
|
||||
/// - SeeAlso: `.unauthorized`.
|
||||
public var unauthorized: Operations.CertificatesUpdateInstance.Output.Unauthorized {
|
||||
get throws {
|
||||
switch self {
|
||||
case let .unauthorized(response):
|
||||
return response
|
||||
default:
|
||||
try throwUnexpectedResponseStatus(
|
||||
expectedStatus: "unauthorized",
|
||||
response: self
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
public struct Forbidden: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/responses/403/content`.
|
||||
@frozen public enum Body: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/responses/403/content/application\/json`.
|
||||
case json(Components.Schemas.ErrorResponse)
|
||||
/// The associated value of the enum case if `self` is `.json`.
|
||||
///
|
||||
/// - Throws: An error if `self` is not `.json`.
|
||||
/// - SeeAlso: `.json`.
|
||||
public var json: Components.Schemas.ErrorResponse {
|
||||
get throws {
|
||||
switch self {
|
||||
case let .json(body):
|
||||
return body
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
/// Received HTTP response body
|
||||
public var body: Operations.CertificatesUpdateInstance.Output.Forbidden.Body
|
||||
/// Creates a new `Forbidden`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - body: Received HTTP response body
|
||||
public init(body: Operations.CertificatesUpdateInstance.Output.Forbidden.Body) {
|
||||
self.body = body
|
||||
}
|
||||
}
|
||||
/// Forbidden error
|
||||
///
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/patch(certificates_updateInstance)/responses/403`.
|
||||
///
|
||||
/// HTTP response code: `403 forbidden`.
|
||||
case forbidden(Operations.CertificatesUpdateInstance.Output.Forbidden)
|
||||
/// The associated value of the enum case if `self` is `.forbidden`.
|
||||
///
|
||||
/// - Throws: An error if `self` is not `.forbidden`.
|
||||
/// - SeeAlso: `.forbidden`.
|
||||
public var forbidden: Operations.CertificatesUpdateInstance.Output.Forbidden {
|
||||
get throws {
|
||||
switch self {
|
||||
case let .forbidden(response):
|
||||
return response
|
||||
default:
|
||||
try throwUnexpectedResponseStatus(
|
||||
expectedStatus: "forbidden",
|
||||
response: self
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
public struct NotFound: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/responses/404/content`.
|
||||
@frozen public enum Body: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/responses/404/content/application\/json`.
|
||||
case json(Components.Schemas.ErrorResponse)
|
||||
/// The associated value of the enum case if `self` is `.json`.
|
||||
///
|
||||
/// - Throws: An error if `self` is not `.json`.
|
||||
/// - SeeAlso: `.json`.
|
||||
public var json: Components.Schemas.ErrorResponse {
|
||||
get throws {
|
||||
switch self {
|
||||
case let .json(body):
|
||||
return body
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
/// Received HTTP response body
|
||||
public var body: Operations.CertificatesUpdateInstance.Output.NotFound.Body
|
||||
/// Creates a new `NotFound`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - body: Received HTTP response body
|
||||
public init(body: Operations.CertificatesUpdateInstance.Output.NotFound.Body) {
|
||||
self.body = body
|
||||
}
|
||||
}
|
||||
/// Not found error
|
||||
///
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/patch(certificates_updateInstance)/responses/404`.
|
||||
///
|
||||
/// HTTP response code: `404 notFound`.
|
||||
case notFound(Operations.CertificatesUpdateInstance.Output.NotFound)
|
||||
/// The associated value of the enum case if `self` is `.notFound`.
|
||||
///
|
||||
/// - Throws: An error if `self` is not `.notFound`.
|
||||
/// - SeeAlso: `.notFound`.
|
||||
public var notFound: Operations.CertificatesUpdateInstance.Output.NotFound {
|
||||
get throws {
|
||||
switch self {
|
||||
case let .notFound(response):
|
||||
return response
|
||||
default:
|
||||
try throwUnexpectedResponseStatus(
|
||||
expectedStatus: "notFound",
|
||||
response: self
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
public struct Conflict: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/responses/409/content`.
|
||||
@frozen public enum Body: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/responses/409/content/application\/json`.
|
||||
case json(Components.Schemas.ErrorResponse)
|
||||
/// The associated value of the enum case if `self` is `.json`.
|
||||
///
|
||||
/// - Throws: An error if `self` is not `.json`.
|
||||
/// - SeeAlso: `.json`.
|
||||
public var json: Components.Schemas.ErrorResponse {
|
||||
get throws {
|
||||
switch self {
|
||||
case let .json(body):
|
||||
return body
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
/// Received HTTP response body
|
||||
public var body: Operations.CertificatesUpdateInstance.Output.Conflict.Body
|
||||
/// Creates a new `Conflict`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - body: Received HTTP response body
|
||||
public init(body: Operations.CertificatesUpdateInstance.Output.Conflict.Body) {
|
||||
self.body = body
|
||||
}
|
||||
}
|
||||
/// Request entity error(s)
|
||||
///
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/patch(certificates_updateInstance)/responses/409`.
|
||||
///
|
||||
/// HTTP response code: `409 conflict`.
|
||||
case conflict(Operations.CertificatesUpdateInstance.Output.Conflict)
|
||||
/// The associated value of the enum case if `self` is `.conflict`.
|
||||
///
|
||||
/// - Throws: An error if `self` is not `.conflict`.
|
||||
/// - SeeAlso: `.conflict`.
|
||||
public var conflict: Operations.CertificatesUpdateInstance.Output.Conflict {
|
||||
get throws {
|
||||
switch self {
|
||||
case let .conflict(response):
|
||||
return response
|
||||
default:
|
||||
try throwUnexpectedResponseStatus(
|
||||
expectedStatus: "conflict",
|
||||
response: self
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
public struct UnprocessableContent: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/responses/422/content`.
|
||||
@frozen public enum Body: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/PATCH/responses/422/content/application\/json`.
|
||||
case json(Components.Schemas.ErrorResponse)
|
||||
/// The associated value of the enum case if `self` is `.json`.
|
||||
///
|
||||
/// - Throws: An error if `self` is not `.json`.
|
||||
/// - SeeAlso: `.json`.
|
||||
public var json: Components.Schemas.ErrorResponse {
|
||||
get throws {
|
||||
switch self {
|
||||
case let .json(body):
|
||||
return body
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
/// Received HTTP response body
|
||||
public var body: Operations.CertificatesUpdateInstance.Output.UnprocessableContent.Body
|
||||
/// Creates a new `UnprocessableContent`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - body: Received HTTP response body
|
||||
public init(body: Operations.CertificatesUpdateInstance.Output.UnprocessableContent.Body) {
|
||||
self.body = body
|
||||
}
|
||||
}
|
||||
/// Unprocessable request entity error(s)
|
||||
///
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/patch(certificates_updateInstance)/responses/422`.
|
||||
///
|
||||
/// HTTP response code: `422 unprocessableContent`.
|
||||
case unprocessableContent(Operations.CertificatesUpdateInstance.Output.UnprocessableContent)
|
||||
/// The associated value of the enum case if `self` is `.unprocessableContent`.
|
||||
///
|
||||
/// - Throws: An error if `self` is not `.unprocessableContent`.
|
||||
/// - SeeAlso: `.unprocessableContent`.
|
||||
public var unprocessableContent: Operations.CertificatesUpdateInstance.Output.UnprocessableContent {
|
||||
get throws {
|
||||
switch self {
|
||||
case let .unprocessableContent(response):
|
||||
return response
|
||||
default:
|
||||
try throwUnexpectedResponseStatus(
|
||||
expectedStatus: "unprocessableContent",
|
||||
response: self
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
/// Undocumented response.
|
||||
///
|
||||
/// A response with a code that is not documented in the OpenAPI document.
|
||||
case undocumented(statusCode: Swift.Int, OpenAPIRuntime.UndocumentedPayload)
|
||||
}
|
||||
@frozen public enum AcceptableContentType: AcceptableProtocol {
|
||||
case json
|
||||
case other(Swift.String)
|
||||
public init?(rawValue: Swift.String) {
|
||||
switch rawValue.lowercased() {
|
||||
case "application/json":
|
||||
self = .json
|
||||
default:
|
||||
self = .other(rawValue)
|
||||
}
|
||||
}
|
||||
public var rawValue: Swift.String {
|
||||
switch self {
|
||||
case let .other(string):
|
||||
return string
|
||||
case .json:
|
||||
return "application/json"
|
||||
}
|
||||
}
|
||||
public static var allCases: [Self] {
|
||||
[
|
||||
.json
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
/// - Remark: HTTP `DELETE /v1/certificates/{id}`.
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/delete(certificates_deleteInstance)`.
|
||||
public enum CertificatesDeleteInstance {
|
||||
@@ -11557,6 +12161,7 @@ public enum Operations {
|
||||
case platform = "platform"
|
||||
case expirationDate = "expirationDate"
|
||||
case certificateContent = "certificateContent"
|
||||
case activated = "activated"
|
||||
}
|
||||
/// - Remark: Generated from `#/paths/v1/profiles/GET/query/fields[certificates]`.
|
||||
public typealias Fields_lbrack_certificates_rbrack_Payload = [Operations.ProfilesGetCollection.Input.Query.FieldsLbrackCertificatesRbrackPayloadPayload]
|
||||
@@ -12353,6 +12958,7 @@ public enum Operations {
|
||||
case platform = "platform"
|
||||
case expirationDate = "expirationDate"
|
||||
case certificateContent = "certificateContent"
|
||||
case activated = "activated"
|
||||
}
|
||||
/// - Remark: Generated from `#/paths/v1/profiles/{id}/GET/query/fields[certificates]`.
|
||||
public typealias Fields_lbrack_certificates_rbrack_Payload = [Operations.ProfilesGetInstance.Input.Query.FieldsLbrackCertificatesRbrackPayloadPayload]
|
||||
@@ -14623,6 +15229,7 @@ public enum Operations {
|
||||
case platform = "platform"
|
||||
case expirationDate = "expirationDate"
|
||||
case certificateContent = "certificateContent"
|
||||
case activated = "activated"
|
||||
}
|
||||
/// - Remark: Generated from `#/paths/v1/profiles/{id}/certificates/GET/query/fields[certificates]`.
|
||||
public typealias Fields_lbrack_certificates_rbrack_Payload = [Operations.ProfilesCertificatesGetToManyRelated.Input.Query.FieldsLbrackCertificatesRbrackPayloadPayload]
|
||||
|
||||
@@ -20,3 +20,6 @@ actions:
|
||||
required: [id, type]
|
||||
required: [data]
|
||||
required: [capability]
|
||||
- target: '$.components.schemas.Device.properties.attributes.properties.deviceClass'
|
||||
update:
|
||||
enum: ["APPLE_VISION_PRO"]
|
||||
|
||||
@@ -13,7 +13,6 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
|
||||
|
||||
public enum Error: LocalizedError {
|
||||
case invalidApp(URL)
|
||||
case teamNotFound(DeveloperServicesTeam.ID)
|
||||
|
||||
public var errorDescription: String? {
|
||||
switch self {
|
||||
@@ -25,16 +24,6 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
|
||||
), $0
|
||||
)
|
||||
}
|
||||
case .teamNotFound(let id):
|
||||
return id.rawValue.withCString {
|
||||
String.localizedStringWithFormat(
|
||||
NSLocalizedString(
|
||||
"add_app_operation.error.team_not_found",
|
||||
value: "A team with the ID '%s' could not be found. Please select another team.",
|
||||
comment: ""
|
||||
), $0
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -115,9 +104,13 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
|
||||
.ok
|
||||
}
|
||||
} else {
|
||||
_ = try await context.developerAPIClient
|
||||
.bundleIdCapabilitiesDeleteInstance(path: .init(id: cap.id))
|
||||
.noContent
|
||||
// DeveloperServices doesn't allow deleting these capabilities
|
||||
let requiredCapabilities: Set<Components.Schemas.CapabilityType> = [.inAppPurchase]
|
||||
if let capType = cap.attributes?.capabilityType, !requiredCapabilities.contains(capType) {
|
||||
_ = try await context.developerAPIClient
|
||||
.bundleIdCapabilitiesDeleteInstance(path: .init(id: cap.id))
|
||||
.noContent
|
||||
}
|
||||
}
|
||||
}
|
||||
for (typ, settings) in wantedCapabilities {
|
||||
@@ -232,20 +225,6 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
|
||||
)
|
||||
}
|
||||
|
||||
private func getTeamIsFree() async throws -> Bool {
|
||||
switch context.auth {
|
||||
case .appStoreConnect:
|
||||
return false
|
||||
case .xcode(let authData):
|
||||
let client = DeveloperServicesClient(authData: authData)
|
||||
let request = DeveloperServicesListTeamsRequest()
|
||||
let teams = try await client.send(request)
|
||||
guard let team = teams.first(where: { $0.id == authData.teamID })
|
||||
else { throw Error.teamNotFound(authData.teamID) }
|
||||
return team.isFree
|
||||
}
|
||||
}
|
||||
|
||||
// keyed by sanitized bundle ID
|
||||
private func getCurrentAppIDs() async throws -> [String: Components.Schemas.BundleId] {
|
||||
let bundleIDs = try await context.developerAPIClient.bundleIdsGetCollection().ok.body.json.data
|
||||
@@ -265,7 +244,7 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
|
||||
apps += plugins.implicitContents.filter { $0.pathExtension.lowercased() == "appex" }
|
||||
}
|
||||
|
||||
async let isFreeTeamTask = getTeamIsFree()
|
||||
async let isFreeTeamTask = context.auth.team()?.isFree == true
|
||||
async let appIDsTask = getCurrentAppIDs()
|
||||
let (isFreeTeam, appIDs) = try await (isFreeTeamTask, appIDsTask)
|
||||
|
||||
|
||||
+14
-12
@@ -72,19 +72,21 @@ public struct DeveloperServicesFetchCertificateOperation: DeveloperServicesOpera
|
||||
_ certificates: [DeveloperServicesCertificate],
|
||||
requireConfirmation: Bool
|
||||
) async throws -> SigningInfo {
|
||||
if !certificates.isEmpty, requireConfirmation {
|
||||
guard await confirmRevocation(certificates)
|
||||
else { throw CancellationError() }
|
||||
}
|
||||
try await withThrowingTaskGroup(of: Void.self) { group in
|
||||
for certificate in certificates {
|
||||
group.addTask {
|
||||
_ = try await context.developerAPIClient
|
||||
.certificatesDeleteInstance(path: .init(id: certificate.id))
|
||||
.noContent
|
||||
}
|
||||
if try await context.auth.team()?.isFree == true {
|
||||
if !certificates.isEmpty, requireConfirmation {
|
||||
guard await confirmRevocation(certificates)
|
||||
else { throw CancellationError() }
|
||||
}
|
||||
try await withThrowingTaskGroup(of: Void.self) { group in
|
||||
for certificate in certificates {
|
||||
group.addTask {
|
||||
_ = try await context.developerAPIClient
|
||||
.certificatesDeleteInstance(path: .init(id: certificate.id))
|
||||
.noContent
|
||||
}
|
||||
}
|
||||
try await group.waitForAll()
|
||||
}
|
||||
try await group.waitForAll()
|
||||
}
|
||||
let signingInfo = try await createCertificate()
|
||||
signingInfoManager[self.context.auth.identityID] = signingInfo
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
import Foundation
|
||||
|
||||
private actor DeveloperServicesTeamFetcher {
|
||||
static let shared = DeveloperServicesTeamFetcher()
|
||||
|
||||
private var cache: [DeveloperServicesTeam.ID: Task<DeveloperServicesTeam, Error>] = [:]
|
||||
|
||||
private init() {}
|
||||
|
||||
func teams(forXcodeLogin auth: XcodeAuthData) async throws -> DeveloperServicesTeam {
|
||||
let teamID = auth.teamID
|
||||
if let cached = cache[teamID] {
|
||||
return try await cached.value
|
||||
}
|
||||
let task = Task {
|
||||
let client = DeveloperServicesClient(authData: auth)
|
||||
let teams = try await client.send(DeveloperServicesListTeamsRequest())
|
||||
guard let team = teams.first(where: { $0.id == teamID })
|
||||
else { throw Errors.teamNotFound(teamID) }
|
||||
return team
|
||||
}
|
||||
cache[auth.teamID] = task
|
||||
return try await task.value
|
||||
}
|
||||
|
||||
enum Errors: LocalizedError {
|
||||
case teamNotFound(DeveloperServicesTeam.ID)
|
||||
|
||||
public var errorDescription: String? {
|
||||
switch self {
|
||||
case .teamNotFound(let id):
|
||||
return id.rawValue.withCString {
|
||||
String.localizedStringWithFormat(
|
||||
NSLocalizedString(
|
||||
"add_app_operation.error.team_not_found",
|
||||
value: "A team with the ID '%s' could not be found. Please select another team.",
|
||||
comment: ""
|
||||
), $0
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extension XcodeAuthData {
|
||||
public func team() async throws -> DeveloperServicesTeam {
|
||||
try await DeveloperServicesTeamFetcher.shared.teams(forXcodeLogin: self)
|
||||
}
|
||||
}
|
||||
|
||||
extension DeveloperAPIAuthData {
|
||||
public func team() async throws -> DeveloperServicesTeam? {
|
||||
switch self {
|
||||
case .appStoreConnect: nil
|
||||
case .xcode(let auth): try await auth.team()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -9,7 +9,7 @@
|
||||
import Foundation
|
||||
|
||||
public struct DeveloperServicesTeam: Decodable, Sendable {
|
||||
public struct ID: RawRepresentable, Decodable, Sendable {
|
||||
public struct ID: RawRepresentable, Decodable, Sendable, Hashable {
|
||||
public let rawValue: String
|
||||
public init(rawValue: String) { self.rawValue = rawValue }
|
||||
}
|
||||
|
||||
@@ -129,6 +129,15 @@ public actor XADIProvider: RawADIProvider {
|
||||
}
|
||||
})
|
||||
let file = adiDirectory.appending(path: "adi.pb")
|
||||
// adi saves the file as 0o034 (group wx, public r) by default
|
||||
// which is a... strange choice that prevents us from reading
|
||||
// or writing by default. Since we're the owner, we can easily
|
||||
// change this though.
|
||||
try FileManager.default.setAttributes(
|
||||
// rw for owner
|
||||
[.posixPermissions: 0o600],
|
||||
ofItemAtPath: file.path
|
||||
)
|
||||
return try Data(contentsOf: file)
|
||||
}
|
||||
}
|
||||
@@ -148,9 +157,6 @@ public actor XADIProvider: RawADIProvider {
|
||||
let adiDirectory = directory.appending(path: "adi")
|
||||
try? FileManager.default.createDirectory(at: adiDirectory, withIntermediateDirectories: true)
|
||||
let adiFile = adiDirectory.appending(path: "adi.pb")
|
||||
// this file may be saved as write-protected, but we can still remove it
|
||||
// and then overwrite it.
|
||||
try? FileManager.default.removeItem(at: adiFile)
|
||||
try provisioningInfo.write(to: adiFile)
|
||||
|
||||
try check(xadi_OTPRequest(
|
||||
|
||||
@@ -55,7 +55,7 @@ public actor IntegratedInstaller {
|
||||
private var appInstaller: AppInstaller?
|
||||
|
||||
private let tempDir = FileManager.default.temporaryDirectoryShim
|
||||
.appendingPathComponent("com.kabiroberai.xtool.Staging")
|
||||
.appendingPathComponent("sh.xtool.Staging")
|
||||
|
||||
private var stage: String?
|
||||
|
||||
@@ -299,7 +299,7 @@ public actor IntegratedInstaller {
|
||||
try await self.updateStage(to: "Packaging", initialProgress: nil)
|
||||
|
||||
let ipa = try await compressor.compress(
|
||||
directory: appDir.deletingLastPathComponent(),
|
||||
directory: payload,
|
||||
progress: { progress in
|
||||
self.queueUpdateTask {
|
||||
$0.updateProgressIgnoringCancellation(to: progress)
|
||||
|
||||
@@ -2,6 +2,7 @@ import Foundation
|
||||
import ArgumentParser
|
||||
import PackLib
|
||||
import XKit
|
||||
import Dependencies
|
||||
|
||||
struct PackOperation {
|
||||
struct BuildOptions: ParsableArguments {
|
||||
@@ -85,8 +86,42 @@ struct DevBuildCommand: AsyncParsableCommand {
|
||||
|
||||
@OptionGroup var packOptions: PackOperation.BuildOptions
|
||||
|
||||
@Flag(
|
||||
help: "Output a .ipa file instead of a .app"
|
||||
) var ipa = false
|
||||
|
||||
func run() async throws {
|
||||
try await PackOperation(buildOptions: packOptions).run()
|
||||
let url = try await PackOperation(
|
||||
buildOptions: packOptions
|
||||
).run()
|
||||
|
||||
let finalURL: URL
|
||||
if ipa {
|
||||
@Dependency(\.zipCompressor) var compressor
|
||||
finalURL = url.deletingPathExtension().appendingPathExtension("ipa")
|
||||
let tmpDir = try TemporaryDirectory(name: "sh.xtool.tmp")
|
||||
let payloadDir = tmpDir.url.appendingPathComponent("Payload", isDirectory: true)
|
||||
try FileManager.default.createDirectory(
|
||||
at: payloadDir,
|
||||
withIntermediateDirectories: true
|
||||
)
|
||||
try FileManager.default.moveItem(at: url, to: payloadDir.appendingPathComponent(url.lastPathComponent))
|
||||
let ipaURL = try await compressor.compress(directory: payloadDir) { progress in
|
||||
if let progress {
|
||||
let percent = Int(progress * 100)
|
||||
print("\rPackaging... \(percent)%", terminator: "")
|
||||
} else {
|
||||
print("\rPackaging...", terminator: "")
|
||||
}
|
||||
}
|
||||
print()
|
||||
try? FileManager.default.removeItem(at: finalURL)
|
||||
try FileManager.default.moveItem(at: ipaURL, to: finalURL)
|
||||
} else {
|
||||
finalURL = url
|
||||
}
|
||||
|
||||
print("Wrote to \(finalURL.path)")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ extension ZIPCompressor: DependencyKey {
|
||||
let zip = Process()
|
||||
zip.executableURL = try await ToolRegistry.locate("zip")
|
||||
zip.currentDirectoryURL = dir.deletingLastPathComponent()
|
||||
zip.arguments = ["-yqru0", dest.path, "Payload"]
|
||||
zip.arguments = ["-yqru0", dest.path, dir.lastPathComponent]
|
||||
try await zip.runUntilExit()
|
||||
|
||||
return dest
|
||||
|
||||
@@ -149,7 +149,7 @@ struct SDKBuilder {
|
||||
}
|
||||
|
||||
private func installToolset(in output: URL) async throws {
|
||||
// tag from https://github.com/kabiroberai/darwin-tools-linux-llvm
|
||||
// tag from https://github.com/xtool-org/darwin-tools-linux-llvm
|
||||
let darwinToolsVersion = "1.0.1"
|
||||
|
||||
let toolsetDir = output.appendingPathComponent("toolset")
|
||||
@@ -169,7 +169,7 @@ struct SDKBuilder {
|
||||
|
||||
@Dependency(\.httpClient) var httpClient
|
||||
let url = URL(string: """
|
||||
https://github.com/kabiroberai/darwin-tools-linux-llvm/releases/download/\
|
||||
https://github.com/xtool-org/darwin-tools-linux-llvm/releases/download/\
|
||||
v\(darwinToolsVersion)/toolset-\(arch.rawValue).tar.gz
|
||||
""")!
|
||||
let (response, body) = try await httpClient.send(HTTPRequest(url: url))
|
||||
|
||||
@@ -13,6 +13,7 @@ struct SDKCommand: AsyncParsableCommand {
|
||||
DevSDKInstallCommand.self,
|
||||
DevSDKRemoveCommand.self,
|
||||
DevSDKBuildCommand.self,
|
||||
DevSDKStatusCommand.self,
|
||||
],
|
||||
defaultSubcommand: DevSDKInstallCommand.self
|
||||
)
|
||||
@@ -98,7 +99,7 @@ struct DevSDKRemoveCommand: AsyncParsableCommand {
|
||||
)
|
||||
|
||||
func run() async throws {
|
||||
guard let sdk = try DarwinSDK.current() else {
|
||||
guard let sdk = try await DarwinSDK.current() else {
|
||||
throw Console.Error("Cannot remove SDK: no Darwin SDK installed")
|
||||
}
|
||||
try sdk.remove()
|
||||
@@ -106,11 +107,22 @@ struct DevSDKRemoveCommand: AsyncParsableCommand {
|
||||
}
|
||||
}
|
||||
|
||||
struct DarwinSDK {
|
||||
private static let sdksDir = URL(fileURLWithPath: NSHomeDirectory())
|
||||
.appendingPathComponent(".swiftpm/swift-sdks")
|
||||
.resolvingSymlinksInPath()
|
||||
struct DevSDKStatusCommand: AsyncParsableCommand {
|
||||
static let configuration = CommandConfiguration(
|
||||
commandName: "status",
|
||||
abstract: "Get the status of the Darwin Swift SDK"
|
||||
)
|
||||
|
||||
func run() async throws {
|
||||
if let sdk = try await DarwinSDK.current() {
|
||||
print("Installed at \(sdk.bundle.path)")
|
||||
} else {
|
||||
print("Not installed")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct DarwinSDK {
|
||||
let bundle: URL
|
||||
let version: String
|
||||
|
||||
@@ -126,36 +138,55 @@ struct DarwinSDK {
|
||||
}
|
||||
}
|
||||
|
||||
@discardableResult
|
||||
static func install(movingFrom path: String) throws -> DarwinSDK {
|
||||
static func install(from path: String) async throws {
|
||||
// we can't just move into ~/.swiftpm/swift-sdks because the swiftpm directory
|
||||
// location depends on factors like $XDG_CONFIG_HOME. Rather than replicating
|
||||
// SwiftPM's logic, which may change, it's more reliable to directly invoke
|
||||
// `swift sdk install`. See: https://github.com/xtool-org/xtool/pull/40
|
||||
|
||||
let url = URL(fileURLWithPath: path)
|
||||
guard DarwinSDK(bundle: url) != nil else { throw Console.Error("Invalid Darwin SDK at '\(path)'")}
|
||||
let targetURL = sdksDir.appendingPathComponent("darwin.artifactbundle")
|
||||
if targetURL.exists {
|
||||
throw Console.Error("Darwin SDK is already installed at '\(targetURL.path)'. Please remove it first.")
|
||||
}
|
||||
try? FileManager.default.createDirectory(at: sdksDir, withIntermediateDirectories: true)
|
||||
try FileManager.default.moveItem(at: url, to: targetURL)
|
||||
guard let sdk = DarwinSDK(bundle: targetURL) else {
|
||||
throw Console.Error("Darwin SDK failed to install")
|
||||
}
|
||||
return sdk
|
||||
|
||||
let process = Process()
|
||||
process.executableURL = try await ToolRegistry.locate("swift")
|
||||
process.arguments = ["sdk", "install", url.path]
|
||||
try await process.runUntilExit()
|
||||
}
|
||||
|
||||
static func current() throws -> DarwinSDK? {
|
||||
let sdks = (try? FileManager.default.contentsOfDirectory(at: sdksDir, includingPropertiesForKeys: nil)) ?? []
|
||||
let darwinSDKs = sdks.compactMap { DarwinSDK(bundle: $0) }
|
||||
switch darwinSDKs.count {
|
||||
case 0:
|
||||
static func current() async throws -> DarwinSDK? {
|
||||
let output = Pipe()
|
||||
|
||||
let process = Process()
|
||||
process.executableURL = try await ToolRegistry.locate("swift")
|
||||
process.arguments = ["sdk", "configure", "darwin", "arm64-apple-ios", "--show-configuration"]
|
||||
process.standardOutput = output
|
||||
process.standardError = FileHandle.nullDevice
|
||||
|
||||
async let outputData = Data(reading: output.fileHandleForReading)
|
||||
|
||||
do {
|
||||
try await process.runUntilExit()
|
||||
} catch Process.Failure.exit {
|
||||
return nil
|
||||
case 1:
|
||||
return darwinSDKs[0]
|
||||
default:
|
||||
throw Console.Error("""
|
||||
You have multiple copies of the Darwin SDK installed. Please delete all but one to continue.
|
||||
\(darwinSDKs.map { "- \($0.bundle.path) (version '\($0.version)')" }.joined(separator: "\n"))
|
||||
""")
|
||||
}
|
||||
|
||||
// should be something like
|
||||
// swiftResourcesPath: /home/user/.swiftpm/swift-sdks/darwin.artifactbundle/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift
|
||||
let resourcesPathPrefix = "swiftResourcesPath: "
|
||||
let outputString = String(decoding: try await outputData, as: UTF8.self)
|
||||
|
||||
guard let resourcesPath = outputString
|
||||
.split(separator: "\n")
|
||||
.first(where: { $0.hasPrefix(resourcesPathPrefix) })?
|
||||
.dropFirst(resourcesPathPrefix.count)
|
||||
else { return nil }
|
||||
|
||||
var resourcesURL = URL(fileURLWithPath: String(resourcesPath))
|
||||
for _ in 0..<6 {
|
||||
resourcesURL = resourcesURL.deletingLastPathComponent()
|
||||
}
|
||||
|
||||
return DarwinSDK(bundle: resourcesURL)
|
||||
}
|
||||
|
||||
func isUpToDate() -> Bool {
|
||||
@@ -210,7 +241,7 @@ struct InstallSDKOperation {
|
||||
#if os(macOS)
|
||||
print("Skipping SDK install; the iOS SDK ships with Xcode on macOS")
|
||||
#else
|
||||
if let sdk = try DarwinSDK.current() {
|
||||
if let sdk = try await DarwinSDK.current() {
|
||||
print("Removing existing SDK...")
|
||||
try sdk.remove()
|
||||
}
|
||||
@@ -222,12 +253,10 @@ struct InstallSDKOperation {
|
||||
let builder = SDKBuilder(input: input, outputPath: tempDir.url.path, arch: arch)
|
||||
let sdkPath = try await builder.buildSDK()
|
||||
|
||||
try DarwinSDK.install(movingFrom: sdkPath)
|
||||
try await DarwinSDK.install(from: sdkPath)
|
||||
|
||||
// don't destroy tempDir before this point
|
||||
withExtendedLifetime(tempDir) {}
|
||||
|
||||
print("Installed darwin.artifactbundle")
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,7 +29,7 @@ struct SetupOperation {
|
||||
print("Skipping Darwin SDK setup since we're on macOS.")
|
||||
}
|
||||
#else
|
||||
switch try DarwinSDK.current()?.isUpToDate() {
|
||||
switch try await DarwinSDK.current()?.isUpToDate() {
|
||||
case true?:
|
||||
if !quiet {
|
||||
print("Darwin SDK is up to date.")
|
||||
|
||||
@@ -64,6 +64,10 @@ sudo apt-get install usbmuxd
|
||||
|
||||
Download **Xcode 16.3** from <https://developer.apple.com/services-account/download?path=/Developer_Tools/Xcode_16.3/Xcode_16.3.xip>. Note the path where `Xcode_16.3.xip` is saved.
|
||||
|
||||
> Note:
|
||||
>
|
||||
> The URL above requires authentication, so make sure to visit it in your browser rather than running `curl`. You'll be asked to log in with your Apple ID and accept the license agreement to download Xcode.
|
||||
|
||||
## Installation
|
||||
|
||||
### 1. Download xtool
|
||||
|
||||
@@ -29,27 +29,19 @@ swift --version
|
||||
|
||||
## Installation
|
||||
|
||||
### 1. Build xtool
|
||||
### 1. Download xtool
|
||||
|
||||
You currently have to build xtool from source on macOS, via Swift Package Manager.
|
||||
If you have [Homebrew](https://brew.sh), you can install xtool with
|
||||
|
||||
```bash
|
||||
git clone https://github.com/xtool-org/xtool
|
||||
# Cloning into 'xtool'...
|
||||
# Resolving deltas: 100% (1795/1795), done.
|
||||
cd xtool
|
||||
swift build -c release --product xtool
|
||||
# Building for production...
|
||||
# [503/503] Linking xtool
|
||||
# Build of product 'xtool' complete! (67.64s)
|
||||
sudo ln -s "$PWD/.build/release/xtool" /usr/local/bin/xtool
|
||||
brew install xtool-org/tap/xtool
|
||||
```
|
||||
|
||||
> Important:
|
||||
Otherwise, you can download `xtool.app` from the [latest GitHub release](https://github.com/xtool-org/xtool/releases/latest). After moving it into `/Applications`, launch it and run the suggested script to add the `xtool` command to your `PATH`.
|
||||
|
||||
> Note:
|
||||
>
|
||||
> The SwiftPM build currently references relative libraries and resources. This means you can't just `mv` the built `xtool` binary, hence the usage of `ln` to symlink instead. Make sure you **don't delete the directory where you cloned xtool**.
|
||||
>
|
||||
> The plan is to make macOS installation easier and more self-contained in the future by shipping xtool as a `.app`, Homebrew Cask, etc. If you would like to contribute, feel free to reach out via [GitHub Issues](https://github.com/xtool-org/xtool/issues/new).
|
||||
> If you install xtool manually, you'll also need to check for new GitHub releases and update it yourself. If you're interested in contributing support for auto-updates through Sparkle, pull requests are appreciated. See [issue #34 on GitHub](https://github.com/xtool-org/xtool/issues/34).
|
||||
|
||||
Confirm that xtool is installed correctly:
|
||||
|
||||
|
||||
Reference in New Issue
Block a user