mirror of
https://github.com/xtool-org/xtool.git
synced 2026-11-21 18:55:56 +03:00
Compare commits
19 Commits
@@ -0,0 +1,9 @@
|
||||
name: 'Configure Xcode'
|
||||
description: 'Set up Xcode version'
|
||||
runs:
|
||||
using: composite
|
||||
steps:
|
||||
- name: Set up Xcode
|
||||
shell: bash
|
||||
run: |
|
||||
sudo xcode-select -s /Applications/Xcode_26.4.app
|
||||
@@ -19,24 +19,29 @@ jobs:
|
||||
runs-on: ${{ matrix.host.runner }}
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
- name: Build
|
||||
uses: actions/checkout@v6
|
||||
- name: Build and test
|
||||
run: |
|
||||
docker compose run --build --rm xtool bash -c \
|
||||
"swift build --product xtool && .build/debug/xtool --help"
|
||||
docker compose run --build xtool bash -c \
|
||||
"swift build --product xtool && .build/debug/xtool --help && swift test"
|
||||
build-macos:
|
||||
runs-on: macos-26
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
uses: actions/checkout@v6
|
||||
- uses: ./.github/actions/configure-xcode
|
||||
- name: Build
|
||||
run: |
|
||||
swift build --product xtool && .build/debug/xtool --help
|
||||
- name: Run tests
|
||||
run: |
|
||||
swift test
|
||||
build-ios:
|
||||
runs-on: macos-26
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
uses: actions/checkout@v6
|
||||
- uses: ./.github/actions/configure-xcode
|
||||
- name: Build
|
||||
run: |
|
||||
set -o pipefail \
|
||||
|
||||
@@ -18,14 +18,14 @@ jobs:
|
||||
contents: write
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
uses: actions/checkout@v6
|
||||
- name: Build
|
||||
run: |
|
||||
docker compose run --build \
|
||||
-e XTOOL_VERSION=${{ github.ref_name }} \
|
||||
--rm xtool Linux/build.sh
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
uses: actions/upload-artifact@v7
|
||||
with:
|
||||
name: xtool-${{ matrix.host.arch }}
|
||||
path: |
|
||||
@@ -37,7 +37,8 @@ jobs:
|
||||
contents: write
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
uses: actions/checkout@v6
|
||||
- uses: ./.github/actions/configure-xcode
|
||||
- name: Setup Ruby
|
||||
uses: ruby/setup-ruby@v1
|
||||
with:
|
||||
@@ -55,7 +56,7 @@ jobs:
|
||||
cd macOS
|
||||
bundle exec fastlane package
|
||||
- name: Upload artifacts
|
||||
uses: actions/upload-artifact@v4
|
||||
uses: actions/upload-artifact@v7
|
||||
with:
|
||||
name: xtool-mac
|
||||
path: |
|
||||
@@ -69,9 +70,9 @@ jobs:
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/checkout@v6
|
||||
- name: Download artifact
|
||||
uses: actions/download-artifact@v4
|
||||
uses: actions/download-artifact@v8
|
||||
with:
|
||||
pattern: xtool-*
|
||||
path: output
|
||||
|
||||
@@ -11,7 +11,7 @@ jobs:
|
||||
swiftlint:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/checkout@v6
|
||||
- name: Lint
|
||||
run: |
|
||||
make lint SWIFTLINT_FLAGS='--reporter=github-actions-logging' | tee swiftlint.log
|
||||
|
||||
Vendored
+10
@@ -1,3 +1,13 @@
|
||||
{
|
||||
"swiftlint.path": "./.tmp/swiftlint/swiftlint",
|
||||
"files.watcherExclude":{
|
||||
"*/.git/**": true,
|
||||
"*/.build/**": true,
|
||||
"*/.tmp/**": true,
|
||||
},
|
||||
"search.exclude": {
|
||||
"*/.git/**": true,
|
||||
"*/.build/**": true,
|
||||
"*/.tmp/**": true,
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
# Note: We use 22.04 since AppImage recommends building on the
|
||||
# oldest configuration that you support
|
||||
|
||||
FROM swift:6.2-jammy AS build-base
|
||||
FROM swift:6.3-jammy AS build-base
|
||||
|
||||
RUN apt-get update \
|
||||
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
|
||||
|
||||
@@ -16,14 +16,14 @@ Once you install WSL, you'll also need to set up USB passthrough. See Microsoft'
|
||||
|
||||
### Swift
|
||||
|
||||
Install the Swift 6.2 toolchain for your Linux distribution from <https://swift.org/install/linux>.
|
||||
Install the Swift 6.3 toolchain for your Linux distribution from <https://swift.org/install/linux>.
|
||||
|
||||
After following the steps there, confirm that Swift is installed correctly:
|
||||
|
||||
```bash
|
||||
swift --version
|
||||
# should say something like:
|
||||
# Swift version 6.2 (swift-6.2-RELEASE)
|
||||
# Swift version 6.3 (swift-6.3-RELEASE)
|
||||
```
|
||||
|
||||
### usbmuxd
|
||||
@@ -62,7 +62,7 @@ sudo apt-get install usbmuxd
|
||||
|
||||
### Xcode.xip
|
||||
|
||||
Download **Xcode 26** from <https://download.developer.apple.com/Developer_Tools/Xcode_26.0.1/Xcode_26.0.1_Apple_silicon.xip>. Note the path where `Xcode_26.0.1_Apple_silicon.xip` is saved.
|
||||
Download **Xcode 26** from <https://developer.apple.com/download/all/?q=Xcode>. Note the path where `Xcode.xip` is saved.
|
||||
|
||||
> Note:
|
||||
>
|
||||
|
||||
+99
-72
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"originHash" : "e56563c7d1a95af4aae9af2b653b49ad313c2cee55c9f30cd55b18dde2379e26",
|
||||
"originHash" : "9ec3992e7de864bad568faa552cdf4c9fff40eebb41c0c05faf964bc172df5d4",
|
||||
"pins" : [
|
||||
{
|
||||
"identity" : "aexml",
|
||||
@@ -15,8 +15,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/swift-server/async-http-client.git",
|
||||
"state" : {
|
||||
"revision" : "8430dd49d4e2b417f472141805c9691ec2923cb8",
|
||||
"version" : "1.29.0"
|
||||
"revision" : "3a5b74a58782c3b4c1f0bc75e9b67b10c2494e8f",
|
||||
"version" : "1.33.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -33,8 +33,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/combine-schedulers",
|
||||
"state" : {
|
||||
"revision" : "5928286acce13def418ec36d05a001a9641086f2",
|
||||
"version" : "1.0.3"
|
||||
"revision" : "dcccb979a2183b8df3334237e3dc1ae2b4116a86",
|
||||
"version" : "1.2.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -51,8 +51,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/mattpolzin/OpenAPIKit",
|
||||
"state" : {
|
||||
"revision" : "c1dcd65ccbcc1f3e132293ff2338c72c49a9026d",
|
||||
"version" : "3.8.0"
|
||||
"revision" : "57b6318128e3f901c93f4fbf98d1c1464ec168d3",
|
||||
"version" : "6.2.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -69,8 +69,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/onevcat/Rainbow.git",
|
||||
"state" : {
|
||||
"revision" : "16da5c62dd737258c6df2e8c430f8a3202f655a7",
|
||||
"version" : "4.2.0"
|
||||
"revision" : "cdf146ae671b2624917648b61c908d1244b98ca1",
|
||||
"version" : "4.2.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -96,8 +96,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-argument-parser",
|
||||
"state" : {
|
||||
"revision" : "cdd0ef3755280949551dc26dee5de9ddeda89f54",
|
||||
"version" : "1.6.2"
|
||||
"revision" : "626b5b7b2f45e1b0b1c6f4a309296d1d21d7311b",
|
||||
"version" : "1.7.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -105,8 +105,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-asn1.git",
|
||||
"state" : {
|
||||
"revision" : "f70225981241859eb4aa1a18a75531d26637c8cc",
|
||||
"version" : "1.4.0"
|
||||
"revision" : "eb50cbd14606a9161cbc5d452f18797c90ef0bab",
|
||||
"version" : "1.7.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -114,8 +114,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-async-algorithms.git",
|
||||
"state" : {
|
||||
"revision" : "042e1c4d9d19748c9c228f8d4ebc97bb1e339b0b",
|
||||
"version" : "1.0.4"
|
||||
"revision" : "9d349bcc328ac3c31ce40e746b5882742a0d1272",
|
||||
"version" : "1.1.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -132,8 +132,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-certificates",
|
||||
"state" : {
|
||||
"revision" : "4b092f15164144c24554e0a75e080a960c5190a6",
|
||||
"version" : "1.14.0"
|
||||
"revision" : "bde8ca32a096825dfce37467137c903418c1893d",
|
||||
"version" : "1.19.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -150,8 +150,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-collections",
|
||||
"state" : {
|
||||
"revision" : "7b847a3b7008b2dc2f47ca3110d8c782fb2e5c7e",
|
||||
"version" : "1.3.0"
|
||||
"revision" : "fea17c02d767f46b23070fdfdacc28a03a39232a",
|
||||
"version" : "1.5.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -163,13 +163,22 @@
|
||||
"version" : "1.3.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-configuration",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-configuration.git",
|
||||
"state" : {
|
||||
"revision" : "be76c4ad929eb6c4bcaf3351799f2adf9e6848a9",
|
||||
"version" : "1.2.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-crypto",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-crypto",
|
||||
"state" : {
|
||||
"revision" : "95ba0316a9b733e92bb6b071255ff46263bbe7dc",
|
||||
"version" : "3.15.1"
|
||||
"revision" : "1b6b2e274e85105bfa155183145a1dcfd63331f1",
|
||||
"version" : "4.5.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -177,8 +186,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-dependencies",
|
||||
"state" : {
|
||||
"revision" : "a10f9feeb214bc72b5337b6ef6d5a029360db4cc",
|
||||
"version" : "1.10.0"
|
||||
"revision" : "706feb7858a7f6c242879d137b8ee30926aa5b26",
|
||||
"version" : "1.12.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -186,8 +195,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-distributed-tracing.git",
|
||||
"state" : {
|
||||
"revision" : "baa932c1336f7894145cbaafcd34ce2dd0b77c97",
|
||||
"version" : "1.3.1"
|
||||
"revision" : "dc4030184203ffafbb2ec614352487235d747fe0",
|
||||
"version" : "1.4.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -195,8 +204,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/swiftlang/swift-docc-plugin",
|
||||
"state" : {
|
||||
"revision" : "3e4f133a77e644a5812911a0513aeb7288b07d06",
|
||||
"version" : "1.4.5"
|
||||
"revision" : "647c708be89f834fa6a6d4945442793a77ddf5b6",
|
||||
"version" : "1.5.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -213,8 +222,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-http-structured-headers.git",
|
||||
"state" : {
|
||||
"revision" : "1625f271afb04375bf48737a5572613248d0e7a0",
|
||||
"version" : "1.4.0"
|
||||
"revision" : "933538faa42c432d385f02e07df0ace7c5ecfc47",
|
||||
"version" : "1.7.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -222,8 +231,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-http-types",
|
||||
"state" : {
|
||||
"revision" : "a0a57e949a8903563aba4615869310c0ebf14c03",
|
||||
"version" : "1.4.0"
|
||||
"revision" : "45eb0224913ea070ec4fba17291b9e7ecf4749ca",
|
||||
"version" : "1.5.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -231,8 +240,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-log.git",
|
||||
"state" : {
|
||||
"revision" : "ce592ae52f982c847a4efc0dd881cc9eb32d29f2",
|
||||
"version" : "1.6.4"
|
||||
"revision" : "5073617dac96330a486245e4c0179cb0a6fd2256",
|
||||
"version" : "1.12.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -240,8 +249,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-nio",
|
||||
"state" : {
|
||||
"revision" : "a18bddb0acf7a40d982b2f128ce73ce4ee31f352",
|
||||
"version" : "2.86.2"
|
||||
"revision" : "f71c8d2a5e74a2c6d11a0fbe324774b5d6084237",
|
||||
"version" : "2.99.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -249,8 +258,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-nio-extras.git",
|
||||
"state" : {
|
||||
"revision" : "a55c3dd3a81d035af8a20ce5718889c0dcab073d",
|
||||
"version" : "1.29.0"
|
||||
"revision" : "5a48717e29f62cb8326d6d42e46b562ca93847a6",
|
||||
"version" : "1.34.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -258,8 +267,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-nio-http2.git",
|
||||
"state" : {
|
||||
"revision" : "5e9e99ec96c53bc2c18ddd10c1e25a3cd97c55e5",
|
||||
"version" : "1.38.0"
|
||||
"revision" : "81cc18264f92cd307ff98430f89372711d4f6fe9",
|
||||
"version" : "1.43.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -267,8 +276,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-nio-ssl.git",
|
||||
"state" : {
|
||||
"revision" : "b2b043a8810ab6d51b3ff4df17f057d87ef1ec7c",
|
||||
"version" : "2.34.1"
|
||||
"revision" : "3f337058ccd7243c4cac7911477d8ad4c598d4da",
|
||||
"version" : "2.37.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -276,8 +285,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-nio-transport-services.git",
|
||||
"state" : {
|
||||
"revision" : "df6c28355051c72c884574a6c858bc54f7311ff9",
|
||||
"version" : "1.25.2"
|
||||
"revision" : "67787bb645a5e67d2edcdfbe48a216cc549222d5",
|
||||
"version" : "1.28.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -294,8 +303,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/swift-server/swift-openapi-async-http-client",
|
||||
"state" : {
|
||||
"revision" : "915aeff168625b0f88a5810ee7ab8e9c00af671b",
|
||||
"version" : "1.1.0"
|
||||
"revision" : "3681f659d9417652b8119f0adbdf57c04b6cb292",
|
||||
"version" : "1.5.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -303,8 +312,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-openapi-generator",
|
||||
"state" : {
|
||||
"revision" : "d74223cc5595a8165181c4d9579243c932e5cd07",
|
||||
"version" : "1.10.3"
|
||||
"revision" : "5dd0da1c7da7bac8f0c458a02a76f69031137a80",
|
||||
"version" : "1.12.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -312,8 +321,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-openapi-runtime",
|
||||
"state" : {
|
||||
"revision" : "7722cf8eac05c1f1b5b05895b04cfcc29576d9be",
|
||||
"version" : "1.8.3"
|
||||
"revision" : "f039fa6d6338aab5164f3d1be16281524c9a8f89",
|
||||
"version" : "1.11.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -321,8 +330,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-openapi-urlsession",
|
||||
"state" : {
|
||||
"revision" : "279aa6b77be6aa842a4bf3c45fa79fa15edf3e07",
|
||||
"version" : "1.2.0"
|
||||
"revision" : "576a65b4ffb8c12ddad4950dc21eea2ef071bec2",
|
||||
"version" : "1.3.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -330,17 +339,26 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-service-context.git",
|
||||
"state" : {
|
||||
"revision" : "1983448fefc717a2bc2ebde5490fe99873c5b8a6",
|
||||
"version" : "1.2.1"
|
||||
"revision" : "d0997351b0c7779017f88e7a93bc30a1878d7f29",
|
||||
"version" : "1.3.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-service-lifecycle",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/swift-server/swift-service-lifecycle.git",
|
||||
"location" : "https://github.com/swift-server/swift-service-lifecycle",
|
||||
"state" : {
|
||||
"revision" : "0fcc4c9c2d58dd98504c06f7308c86de775396ff",
|
||||
"version" : "2.9.0"
|
||||
"revision" : "9829955b385e5bb88128b73f1b8389e9b9c3191a",
|
||||
"version" : "2.11.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-subprocess",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/swiftlang/swift-subprocess",
|
||||
"state" : {
|
||||
"revision" : "13d087685b95d64d6aac9b94500d347bbe84c39b",
|
||||
"version" : "0.4.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -348,8 +366,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/swiftlang/swift-syntax",
|
||||
"state" : {
|
||||
"revision" : "4799286537280063c85a32f09884cfbca301b1a1",
|
||||
"version" : "602.0.0"
|
||||
"revision" : "9de99a78f099e59caf2b2beec65a4c45d54b2081",
|
||||
"version" : "603.0.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -357,8 +375,17 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-system",
|
||||
"state" : {
|
||||
"revision" : "61e4ca4b81b9e09e2ec863b00c340eb13497dac6",
|
||||
"version" : "1.5.0"
|
||||
"revision" : "7c6ad0fc39d0763e0b699210e4124afd5041c5df",
|
||||
"version" : "1.6.4"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-tools-protocols",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/swiftlang/swift-tools-protocols",
|
||||
"state" : {
|
||||
"revision" : "d81024558da3bcd53748c4cfdaba10a49242442e",
|
||||
"version" : "0.0.10"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -384,8 +411,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/saagarjha/unxip",
|
||||
"state" : {
|
||||
"revision" : "03c32d6b4e7d8a9fb58747e5f8b83397da8bf5ba",
|
||||
"version" : "3.2.0"
|
||||
"revision" : "6c3990517fcc4c1db6952fccf4c562fb14097601",
|
||||
"version" : "3.3.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -393,8 +420,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/mxcl/Version",
|
||||
"state" : {
|
||||
"revision" : "67ce582bb9de70e1eb2ee41fd71aad3b5f86d97b",
|
||||
"version" : "2.2.0"
|
||||
"revision" : "3043fcd2a50375db76d89ff206a612471833d1c2",
|
||||
"version" : "2.2.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -402,8 +429,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/vapor/websocket-kit.git",
|
||||
"state" : {
|
||||
"revision" : "8666c92dbbb3c8eefc8008c9c8dcf50bfd302167",
|
||||
"version" : "2.16.1"
|
||||
"revision" : "90bbbdab3ede12c803cfbe91646f291c092517a3",
|
||||
"version" : "2.16.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -411,8 +438,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/yonaskolb/XcodeGen",
|
||||
"state" : {
|
||||
"revision" : "21ac9944b0ab546a07422dbed86f33dd2ebd76f8",
|
||||
"version" : "2.44.1"
|
||||
"revision" : "8d3d3476a69ae3e5d68e1adccc701c410c05eb36",
|
||||
"version" : "2.45.4"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -420,8 +447,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/tuist/XcodeProj.git",
|
||||
"state" : {
|
||||
"revision" : "b1caa062d4aaab3e3d2bed5fe0ac5f8ce9bf84f4",
|
||||
"version" : "8.27.7"
|
||||
"revision" : "01bb77000bc8c23a09ea2058f4954612f03cb705",
|
||||
"version" : "9.10.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -429,8 +456,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
|
||||
"state" : {
|
||||
"revision" : "4c27acf5394b645b70d8ba19dc249c0472d5f618",
|
||||
"version" : "1.7.0"
|
||||
"revision" : "dfd70507def84cb5fb821278448a262c6ff2bbad",
|
||||
"version" : "1.9.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+17
-18
@@ -23,7 +23,7 @@ let package = Package(
|
||||
name: "xtool",
|
||||
platforms: [
|
||||
.iOS(.v16),
|
||||
.macOS(.v13),
|
||||
.macOS(.v14),
|
||||
],
|
||||
products: [
|
||||
.library(
|
||||
@@ -47,7 +47,7 @@ let package = Package(
|
||||
.package(url: "https://github.com/apple/swift-system", from: "1.4.0"),
|
||||
.package(url: "https://github.com/apple/swift-http-types", from: "1.3.1"),
|
||||
.package(url: "https://github.com/apple/swift-certificates", from: "1.0.0"),
|
||||
.package(url: "https://github.com/apple/swift-crypto", from: "3.9.1"),
|
||||
.package(url: "https://github.com/apple/swift-crypto", from: "4.5.0"),
|
||||
.package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"),
|
||||
.package(url: "https://github.com/apple/swift-openapi-generator", from: "1.6.0"),
|
||||
.package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.0.0"),
|
||||
@@ -55,6 +55,8 @@ let package = Package(
|
||||
.package(url: "https://github.com/apple/swift-nio", from: "2.77.0"),
|
||||
|
||||
.package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.0.0"),
|
||||
.package(url: "https://github.com/swiftlang/swift-subprocess", .upToNextMinor(from: "0.4.0")),
|
||||
.package(url: "https://github.com/swiftlang/swift-tools-protocols", exact: "0.0.10"),
|
||||
|
||||
.package(url: "https://github.com/swift-server/async-http-client.git", from: "1.23.0"),
|
||||
.package(url: "https://github.com/swift-server/swift-openapi-async-http-client", from: "1.0.0"),
|
||||
@@ -69,7 +71,7 @@ let package = Package(
|
||||
.package(url: "https://github.com/saagarjha/unxip", from: "3.2.0"),
|
||||
|
||||
// TODO: just depend on tuist/XcodeProj instead
|
||||
.package(url: "https://github.com/yonaskolb/XcodeGen", from: "2.43.0"),
|
||||
.package(url: "https://github.com/yonaskolb/XcodeGen", from: "2.45.4"),
|
||||
],
|
||||
targets: [
|
||||
.systemLibrary(name: "XADI"),
|
||||
@@ -92,7 +94,16 @@ let package = Package(
|
||||
exclude: ["openapi-generator-config.yaml", "patch.js"]
|
||||
),
|
||||
// common utilities shared across xtool targets
|
||||
.target(name: "XUtils"),
|
||||
.target(
|
||||
name: "XUtils",
|
||||
dependencies: [
|
||||
.product(
|
||||
name: "Subprocess",
|
||||
package: "swift-subprocess",
|
||||
condition: .when(platforms: [.linux, .macOS])
|
||||
),
|
||||
]
|
||||
),
|
||||
.target(
|
||||
name: "XKit",
|
||||
dependencies: [
|
||||
@@ -138,20 +149,6 @@ let package = Package(
|
||||
"XToolSupport",
|
||||
]
|
||||
),
|
||||
.testTarget(
|
||||
name: "XKitTests",
|
||||
dependencies: [
|
||||
"XKit",
|
||||
.product(name: "SuperutilsTestSupport", package: "xtool-core")
|
||||
],
|
||||
exclude: [
|
||||
"config/config-template.json",
|
||||
],
|
||||
resources: [
|
||||
.copy("config/config.json"),
|
||||
.copy("config/test.app"),
|
||||
]
|
||||
),
|
||||
.target(
|
||||
name: "XToolSupport",
|
||||
dependencies: [
|
||||
@@ -163,6 +160,7 @@ let package = Package(
|
||||
.product(name: "NIOPosix", package: "swift-nio"),
|
||||
.product(name: "Version", package: "Version"),
|
||||
.product(name: "libunxip", package: "unxip"),
|
||||
.product(name: "LanguageServerProtocolTransport", package: "swift-tools-protocols"),
|
||||
],
|
||||
cSettings: cSettings
|
||||
),
|
||||
@@ -170,6 +168,7 @@ let package = Package(
|
||||
name: "PackLib",
|
||||
dependencies: [
|
||||
"XUtils",
|
||||
.product(name: "Superutils", package: "xtool-core"),
|
||||
.product(name: "Yams", package: "Yams"),
|
||||
.product(name: "XcodeGenKit", package: "XcodeGen", condition: .when(platforms: [.macOS])),
|
||||
]
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
#include "inotify_shim.h"
|
||||
#include "stdout_shim.h"
|
||||
#include "version.h"
|
||||
#include "mobileprovision.h"
|
||||
@@ -0,0 +1,21 @@
|
||||
#ifndef CINOTIFY_SHIMS_H
|
||||
#define CINOTIFY_SHIMS_H
|
||||
|
||||
#ifdef __linux__
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdint.h>
|
||||
#include <sys/inotify.h>
|
||||
|
||||
static inline const char *cin_event_name(const struct inotify_event *event) {
|
||||
if (event->len)
|
||||
return event->name;
|
||||
else
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static const uint32_t cin_all_events = IN_ALL_EVENTS;
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* CINOTIFY_SHIMS_H */
|
||||
@@ -575,28 +575,6 @@ public struct DeveloperAPIClient: APIProtocol {
|
||||
preconditionFailure("bestContentType chose an invalid content type.")
|
||||
}
|
||||
return .notFound(.init(body: body))
|
||||
case 409:
|
||||
let contentType = converter.extractContentTypeIfPresent(in: response.headerFields)
|
||||
let body: Operations.BundleIdCapabilitiesDeleteInstance.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 429:
|
||||
let contentType = converter.extractContentTypeIfPresent(in: response.headerFields)
|
||||
let body: Operations.BundleIdCapabilitiesDeleteInstance.Output.TooManyRequests.Body
|
||||
@@ -1632,28 +1610,6 @@ public struct DeveloperAPIClient: APIProtocol {
|
||||
preconditionFailure("bestContentType chose an invalid content type.")
|
||||
}
|
||||
return .notFound(.init(body: body))
|
||||
case 409:
|
||||
let contentType = converter.extractContentTypeIfPresent(in: response.headerFields)
|
||||
let body: Operations.BundleIdsDeleteInstance.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 429:
|
||||
let contentType = converter.extractContentTypeIfPresent(in: response.headerFields)
|
||||
let body: Operations.BundleIdsDeleteInstance.Output.TooManyRequests.Body
|
||||
@@ -2626,28 +2582,6 @@ public struct DeveloperAPIClient: APIProtocol {
|
||||
preconditionFailure("bestContentType chose an invalid content type.")
|
||||
}
|
||||
return .notFound(.init(body: body))
|
||||
case 409:
|
||||
let contentType = converter.extractContentTypeIfPresent(in: response.headerFields)
|
||||
let body: Operations.CertificatesDeleteInstance.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 429:
|
||||
let contentType = converter.extractContentTypeIfPresent(in: response.headerFields)
|
||||
let body: Operations.CertificatesDeleteInstance.Output.TooManyRequests.Body
|
||||
@@ -4254,28 +4188,6 @@ public struct DeveloperAPIClient: APIProtocol {
|
||||
preconditionFailure("bestContentType chose an invalid content type.")
|
||||
}
|
||||
return .notFound(.init(body: body))
|
||||
case 409:
|
||||
let contentType = converter.extractContentTypeIfPresent(in: response.headerFields)
|
||||
let body: Operations.ProfilesDeleteInstance.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 429:
|
||||
let contentType = converter.extractContentTypeIfPresent(in: response.headerFields)
|
||||
let body: Operations.ProfilesDeleteInstance.Output.TooManyRequests.Body
|
||||
|
||||
@@ -794,6 +794,50 @@ public enum Components {
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/appEncryptionDeclarations`.
|
||||
public var appEncryptionDeclarations: Components.Schemas.App.RelationshipsPayload.AppEncryptionDeclarationsPayload?
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/appStoreIcon`.
|
||||
public struct AppStoreIconPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/appStoreIcon/data`.
|
||||
public struct DataPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/appStoreIcon/data/type`.
|
||||
@frozen public enum _TypePayload: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case buildIcons = "buildIcons"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/appStoreIcon/data/type`.
|
||||
public var _type: Components.Schemas.App.RelationshipsPayload.AppStoreIconPayload.DataPayload._TypePayload
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/appStoreIcon/data/id`.
|
||||
public var id: Swift.String
|
||||
/// Creates a new `DataPayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - _type:
|
||||
/// - id:
|
||||
public init(
|
||||
_type: Components.Schemas.App.RelationshipsPayload.AppStoreIconPayload.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/App/relationships/appStoreIcon/data`.
|
||||
public var data: Components.Schemas.App.RelationshipsPayload.AppStoreIconPayload.DataPayload?
|
||||
/// Creates a new `AppStoreIconPayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - data:
|
||||
public init(data: Components.Schemas.App.RelationshipsPayload.AppStoreIconPayload.DataPayload? = nil) {
|
||||
self.data = data
|
||||
}
|
||||
public enum CodingKeys: String, CodingKey {
|
||||
case data
|
||||
}
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/appStoreIcon`.
|
||||
public var appStoreIcon: Components.Schemas.App.RelationshipsPayload.AppStoreIconPayload?
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/ciProduct`.
|
||||
public struct CiProductPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/ciProduct/links`.
|
||||
@@ -983,6 +1027,23 @@ public enum Components {
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/appStoreVersions`.
|
||||
public var appStoreVersions: Components.Schemas.App.RelationshipsPayload.AppStoreVersionsPayload?
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/appTags`.
|
||||
public struct AppTagsPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/appTags/links`.
|
||||
public var links: Components.Schemas.RelationshipLinks?
|
||||
/// Creates a new `AppTagsPayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - links:
|
||||
public init(links: Components.Schemas.RelationshipLinks? = nil) {
|
||||
self.links = links
|
||||
}
|
||||
public enum CodingKeys: String, CodingKey {
|
||||
case links
|
||||
}
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/appTags`.
|
||||
public var appTags: Components.Schemas.App.RelationshipsPayload.AppTagsPayload?
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/preReleaseVersions`.
|
||||
public struct PreReleaseVersionsPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/preReleaseVersions/links`.
|
||||
@@ -2236,6 +2297,23 @@ public enum Components {
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/marketplaceSearchDetail`.
|
||||
public var marketplaceSearchDetail: Components.Schemas.App.RelationshipsPayload.MarketplaceSearchDetailPayload?
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/buildUploads`.
|
||||
public struct BuildUploadsPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/buildUploads/links`.
|
||||
public var links: Components.Schemas.RelationshipLinks?
|
||||
/// Creates a new `BuildUploadsPayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - links:
|
||||
public init(links: Components.Schemas.RelationshipLinks? = nil) {
|
||||
self.links = links
|
||||
}
|
||||
public enum CodingKeys: String, CodingKey {
|
||||
case links
|
||||
}
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/buildUploads`.
|
||||
public var buildUploads: Components.Schemas.App.RelationshipsPayload.BuildUploadsPayload?
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/backgroundAssets`.
|
||||
public struct BackgroundAssetsPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/backgroundAssets/links`.
|
||||
@@ -2287,6 +2365,23 @@ public enum Components {
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/betaFeedbackCrashSubmissions`.
|
||||
public var betaFeedbackCrashSubmissions: Components.Schemas.App.RelationshipsPayload.BetaFeedbackCrashSubmissionsPayload?
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/searchKeywords`.
|
||||
public struct SearchKeywordsPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/searchKeywords/links`.
|
||||
public var links: Components.Schemas.RelationshipLinks?
|
||||
/// Creates a new `SearchKeywordsPayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - links:
|
||||
public init(links: Components.Schemas.RelationshipLinks? = nil) {
|
||||
self.links = links
|
||||
}
|
||||
public enum CodingKeys: String, CodingKey {
|
||||
case links
|
||||
}
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/searchKeywords`.
|
||||
public var searchKeywords: Components.Schemas.App.RelationshipsPayload.SearchKeywordsPayload?
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/webhooks`.
|
||||
public struct WebhooksPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/webhooks/links`.
|
||||
@@ -2304,15 +2399,77 @@ public enum Components {
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/webhooks`.
|
||||
public var webhooks: Components.Schemas.App.RelationshipsPayload.WebhooksPayload?
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/androidToIosAppMappingDetails`.
|
||||
public struct AndroidToIosAppMappingDetailsPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/androidToIosAppMappingDetails/links`.
|
||||
public var links: Components.Schemas.RelationshipLinks?
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/androidToIosAppMappingDetails/meta`.
|
||||
public var meta: Components.Schemas.PagingInformation?
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/androidToIosAppMappingDetails/DataPayload`.
|
||||
public struct DataPayloadPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/androidToIosAppMappingDetails/DataPayload/type`.
|
||||
@frozen public enum _TypePayload: String, Codable, Hashable, Sendable, CaseIterable {
|
||||
case androidToIosAppMappingDetails = "androidToIosAppMappingDetails"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/androidToIosAppMappingDetails/DataPayload/type`.
|
||||
public var _type: Components.Schemas.App.RelationshipsPayload.AndroidToIosAppMappingDetailsPayload.DataPayloadPayload._TypePayload
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/androidToIosAppMappingDetails/DataPayload/id`.
|
||||
public var id: Swift.String
|
||||
/// Creates a new `DataPayloadPayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - _type:
|
||||
/// - id:
|
||||
public init(
|
||||
_type: Components.Schemas.App.RelationshipsPayload.AndroidToIosAppMappingDetailsPayload.DataPayloadPayload._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/App/relationships/androidToIosAppMappingDetails/data`.
|
||||
public typealias DataPayload = [Components.Schemas.App.RelationshipsPayload.AndroidToIosAppMappingDetailsPayload.DataPayloadPayload]
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/androidToIosAppMappingDetails/data`.
|
||||
public var data: Components.Schemas.App.RelationshipsPayload.AndroidToIosAppMappingDetailsPayload.DataPayload?
|
||||
/// Creates a new `AndroidToIosAppMappingDetailsPayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - links:
|
||||
/// - meta:
|
||||
/// - data:
|
||||
public init(
|
||||
links: Components.Schemas.RelationshipLinks? = nil,
|
||||
meta: Components.Schemas.PagingInformation? = nil,
|
||||
data: Components.Schemas.App.RelationshipsPayload.AndroidToIosAppMappingDetailsPayload.DataPayload? = nil
|
||||
) {
|
||||
self.links = links
|
||||
self.meta = meta
|
||||
self.data = data
|
||||
}
|
||||
public enum CodingKeys: String, CodingKey {
|
||||
case links
|
||||
case meta
|
||||
case data
|
||||
}
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/androidToIosAppMappingDetails`.
|
||||
public var androidToIosAppMappingDetails: Components.Schemas.App.RelationshipsPayload.AndroidToIosAppMappingDetailsPayload?
|
||||
/// Creates a new `RelationshipsPayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - accessibilityDeclarations:
|
||||
/// - appEncryptionDeclarations:
|
||||
/// - appStoreIcon:
|
||||
/// - ciProduct:
|
||||
/// - betaTesters:
|
||||
/// - betaGroups:
|
||||
/// - appStoreVersions:
|
||||
/// - appTags:
|
||||
/// - preReleaseVersions:
|
||||
/// - betaAppLocalizations:
|
||||
/// - builds:
|
||||
@@ -2341,17 +2498,22 @@ public enum Components {
|
||||
/// - alternativeDistributionKey:
|
||||
/// - analyticsReportRequests:
|
||||
/// - marketplaceSearchDetail:
|
||||
/// - buildUploads:
|
||||
/// - backgroundAssets:
|
||||
/// - betaFeedbackScreenshotSubmissions:
|
||||
/// - betaFeedbackCrashSubmissions:
|
||||
/// - searchKeywords:
|
||||
/// - webhooks:
|
||||
/// - androidToIosAppMappingDetails:
|
||||
public init(
|
||||
accessibilityDeclarations: Components.Schemas.App.RelationshipsPayload.AccessibilityDeclarationsPayload? = nil,
|
||||
appEncryptionDeclarations: Components.Schemas.App.RelationshipsPayload.AppEncryptionDeclarationsPayload? = nil,
|
||||
appStoreIcon: Components.Schemas.App.RelationshipsPayload.AppStoreIconPayload? = nil,
|
||||
ciProduct: Components.Schemas.App.RelationshipsPayload.CiProductPayload? = nil,
|
||||
betaTesters: Components.Schemas.App.RelationshipsPayload.BetaTestersPayload? = nil,
|
||||
betaGroups: Components.Schemas.App.RelationshipsPayload.BetaGroupsPayload? = nil,
|
||||
appStoreVersions: Components.Schemas.App.RelationshipsPayload.AppStoreVersionsPayload? = nil,
|
||||
appTags: Components.Schemas.App.RelationshipsPayload.AppTagsPayload? = nil,
|
||||
preReleaseVersions: Components.Schemas.App.RelationshipsPayload.PreReleaseVersionsPayload? = nil,
|
||||
betaAppLocalizations: Components.Schemas.App.RelationshipsPayload.BetaAppLocalizationsPayload? = nil,
|
||||
builds: Components.Schemas.App.RelationshipsPayload.BuildsPayload? = nil,
|
||||
@@ -2380,17 +2542,22 @@ public enum Components {
|
||||
alternativeDistributionKey: Components.Schemas.App.RelationshipsPayload.AlternativeDistributionKeyPayload? = nil,
|
||||
analyticsReportRequests: Components.Schemas.App.RelationshipsPayload.AnalyticsReportRequestsPayload? = nil,
|
||||
marketplaceSearchDetail: Components.Schemas.App.RelationshipsPayload.MarketplaceSearchDetailPayload? = nil,
|
||||
buildUploads: Components.Schemas.App.RelationshipsPayload.BuildUploadsPayload? = nil,
|
||||
backgroundAssets: Components.Schemas.App.RelationshipsPayload.BackgroundAssetsPayload? = nil,
|
||||
betaFeedbackScreenshotSubmissions: Components.Schemas.App.RelationshipsPayload.BetaFeedbackScreenshotSubmissionsPayload? = nil,
|
||||
betaFeedbackCrashSubmissions: Components.Schemas.App.RelationshipsPayload.BetaFeedbackCrashSubmissionsPayload? = nil,
|
||||
webhooks: Components.Schemas.App.RelationshipsPayload.WebhooksPayload? = nil
|
||||
searchKeywords: Components.Schemas.App.RelationshipsPayload.SearchKeywordsPayload? = nil,
|
||||
webhooks: Components.Schemas.App.RelationshipsPayload.WebhooksPayload? = nil,
|
||||
androidToIosAppMappingDetails: Components.Schemas.App.RelationshipsPayload.AndroidToIosAppMappingDetailsPayload? = nil
|
||||
) {
|
||||
self.accessibilityDeclarations = accessibilityDeclarations
|
||||
self.appEncryptionDeclarations = appEncryptionDeclarations
|
||||
self.appStoreIcon = appStoreIcon
|
||||
self.ciProduct = ciProduct
|
||||
self.betaTesters = betaTesters
|
||||
self.betaGroups = betaGroups
|
||||
self.appStoreVersions = appStoreVersions
|
||||
self.appTags = appTags
|
||||
self.preReleaseVersions = preReleaseVersions
|
||||
self.betaAppLocalizations = betaAppLocalizations
|
||||
self.builds = builds
|
||||
@@ -2419,18 +2586,23 @@ public enum Components {
|
||||
self.alternativeDistributionKey = alternativeDistributionKey
|
||||
self.analyticsReportRequests = analyticsReportRequests
|
||||
self.marketplaceSearchDetail = marketplaceSearchDetail
|
||||
self.buildUploads = buildUploads
|
||||
self.backgroundAssets = backgroundAssets
|
||||
self.betaFeedbackScreenshotSubmissions = betaFeedbackScreenshotSubmissions
|
||||
self.betaFeedbackCrashSubmissions = betaFeedbackCrashSubmissions
|
||||
self.searchKeywords = searchKeywords
|
||||
self.webhooks = webhooks
|
||||
self.androidToIosAppMappingDetails = androidToIosAppMappingDetails
|
||||
}
|
||||
public enum CodingKeys: String, CodingKey {
|
||||
case accessibilityDeclarations
|
||||
case appEncryptionDeclarations
|
||||
case appStoreIcon
|
||||
case ciProduct
|
||||
case betaTesters
|
||||
case betaGroups
|
||||
case appStoreVersions
|
||||
case appTags
|
||||
case preReleaseVersions
|
||||
case betaAppLocalizations
|
||||
case builds
|
||||
@@ -2459,10 +2631,13 @@ public enum Components {
|
||||
case alternativeDistributionKey
|
||||
case analyticsReportRequests
|
||||
case marketplaceSearchDetail
|
||||
case buildUploads
|
||||
case backgroundAssets
|
||||
case betaFeedbackScreenshotSubmissions
|
||||
case betaFeedbackCrashSubmissions
|
||||
case searchKeywords
|
||||
case webhooks
|
||||
case androidToIosAppMappingDetails
|
||||
}
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships`.
|
||||
@@ -2707,7 +2882,7 @@ public enum Components {
|
||||
}
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/BundleIdCapabilityCreateRequest/data/relationships/capability`.
|
||||
public var capability: Components.Schemas.BundleIdCapabilityCreateRequest.DataPayload.RelationshipsPayload.CapabilityPayload
|
||||
public var capability: Components.Schemas.BundleIdCapabilityCreateRequest.DataPayload.RelationshipsPayload.CapabilityPayload?
|
||||
/// Creates a new `RelationshipsPayload`.
|
||||
///
|
||||
/// - Parameters:
|
||||
@@ -2715,7 +2890,7 @@ public enum Components {
|
||||
/// - capability:
|
||||
public init(
|
||||
bundleId: Components.Schemas.BundleIdCapabilityCreateRequest.DataPayload.RelationshipsPayload.BundleIdPayload,
|
||||
capability: Components.Schemas.BundleIdCapabilityCreateRequest.DataPayload.RelationshipsPayload.CapabilityPayload
|
||||
capability: Components.Schemas.BundleIdCapabilityCreateRequest.DataPayload.RelationshipsPayload.CapabilityPayload? = nil
|
||||
) {
|
||||
self.bundleId = bundleId
|
||||
self.capability = capability
|
||||
@@ -3113,45 +3288,43 @@ public enum Components {
|
||||
public var data: [Components.Schemas.BundleId]
|
||||
/// - Remark: Generated from `#/components/schemas/BundleIdsResponse/IncludedPayload`.
|
||||
@frozen public enum IncludedPayloadPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/BundleIdsResponse/IncludedPayload/case1`.
|
||||
case Profile(Components.Schemas.Profile)
|
||||
/// - Remark: Generated from `#/components/schemas/BundleIdsResponse/IncludedPayload/case2`.
|
||||
case BundleIdCapability(Components.Schemas.BundleIdCapability)
|
||||
/// - Remark: Generated from `#/components/schemas/BundleIdsResponse/IncludedPayload/case3`.
|
||||
case App(Components.Schemas.App)
|
||||
/// - Remark: Generated from `#/components/schemas/BundleIdsResponse/IncludedPayload/App`.
|
||||
case apps(Components.Schemas.App)
|
||||
/// - Remark: Generated from `#/components/schemas/BundleIdsResponse/IncludedPayload/BundleIdCapability`.
|
||||
case bundleIdCapabilities(Components.Schemas.BundleIdCapability)
|
||||
/// - Remark: Generated from `#/components/schemas/BundleIdsResponse/IncludedPayload/Profile`.
|
||||
case profiles(Components.Schemas.Profile)
|
||||
public enum CodingKeys: String, CodingKey {
|
||||
case _type = "type"
|
||||
}
|
||||
public init(from decoder: any Decoder) throws {
|
||||
var errors: [any Error] = []
|
||||
do {
|
||||
self = .Profile(try .init(from: decoder))
|
||||
return
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
do {
|
||||
self = .BundleIdCapability(try .init(from: decoder))
|
||||
return
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
do {
|
||||
self = .App(try .init(from: decoder))
|
||||
return
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
throw Swift.DecodingError.failedToDecodeOneOfSchema(
|
||||
type: Self.self,
|
||||
codingPath: decoder.codingPath,
|
||||
errors: errors
|
||||
let container = try decoder.container(keyedBy: CodingKeys.self)
|
||||
let discriminator = try container.decode(
|
||||
Swift.String.self,
|
||||
forKey: ._type
|
||||
)
|
||||
switch discriminator {
|
||||
case "apps":
|
||||
self = .apps(try .init(from: decoder))
|
||||
case "bundleIdCapabilities":
|
||||
self = .bundleIdCapabilities(try .init(from: decoder))
|
||||
case "profiles":
|
||||
self = .profiles(try .init(from: decoder))
|
||||
default:
|
||||
throw Swift.DecodingError.unknownOneOfDiscriminator(
|
||||
discriminatorKey: CodingKeys._type,
|
||||
discriminatorValue: discriminator,
|
||||
codingPath: decoder.codingPath
|
||||
)
|
||||
}
|
||||
}
|
||||
public func encode(to encoder: any Encoder) throws {
|
||||
switch self {
|
||||
case let .Profile(value):
|
||||
case let .apps(value):
|
||||
try value.encode(to: encoder)
|
||||
case let .BundleIdCapability(value):
|
||||
case let .bundleIdCapabilities(value):
|
||||
try value.encode(to: encoder)
|
||||
case let .App(value):
|
||||
case let .profiles(value):
|
||||
try value.encode(to: encoder)
|
||||
}
|
||||
}
|
||||
@@ -3195,45 +3368,43 @@ public enum Components {
|
||||
public var data: Components.Schemas.BundleId
|
||||
/// - Remark: Generated from `#/components/schemas/BundleIdResponse/IncludedPayload`.
|
||||
@frozen public enum IncludedPayloadPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/BundleIdResponse/IncludedPayload/case1`.
|
||||
case Profile(Components.Schemas.Profile)
|
||||
/// - Remark: Generated from `#/components/schemas/BundleIdResponse/IncludedPayload/case2`.
|
||||
case BundleIdCapability(Components.Schemas.BundleIdCapability)
|
||||
/// - Remark: Generated from `#/components/schemas/BundleIdResponse/IncludedPayload/case3`.
|
||||
case App(Components.Schemas.App)
|
||||
/// - Remark: Generated from `#/components/schemas/BundleIdResponse/IncludedPayload/App`.
|
||||
case apps(Components.Schemas.App)
|
||||
/// - Remark: Generated from `#/components/schemas/BundleIdResponse/IncludedPayload/BundleIdCapability`.
|
||||
case bundleIdCapabilities(Components.Schemas.BundleIdCapability)
|
||||
/// - Remark: Generated from `#/components/schemas/BundleIdResponse/IncludedPayload/Profile`.
|
||||
case profiles(Components.Schemas.Profile)
|
||||
public enum CodingKeys: String, CodingKey {
|
||||
case _type = "type"
|
||||
}
|
||||
public init(from decoder: any Decoder) throws {
|
||||
var errors: [any Error] = []
|
||||
do {
|
||||
self = .Profile(try .init(from: decoder))
|
||||
return
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
do {
|
||||
self = .BundleIdCapability(try .init(from: decoder))
|
||||
return
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
do {
|
||||
self = .App(try .init(from: decoder))
|
||||
return
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
throw Swift.DecodingError.failedToDecodeOneOfSchema(
|
||||
type: Self.self,
|
||||
codingPath: decoder.codingPath,
|
||||
errors: errors
|
||||
let container = try decoder.container(keyedBy: CodingKeys.self)
|
||||
let discriminator = try container.decode(
|
||||
Swift.String.self,
|
||||
forKey: ._type
|
||||
)
|
||||
switch discriminator {
|
||||
case "apps":
|
||||
self = .apps(try .init(from: decoder))
|
||||
case "bundleIdCapabilities":
|
||||
self = .bundleIdCapabilities(try .init(from: decoder))
|
||||
case "profiles":
|
||||
self = .profiles(try .init(from: decoder))
|
||||
default:
|
||||
throw Swift.DecodingError.unknownOneOfDiscriminator(
|
||||
discriminatorKey: CodingKeys._type,
|
||||
discriminatorValue: discriminator,
|
||||
codingPath: decoder.codingPath
|
||||
)
|
||||
}
|
||||
}
|
||||
public func encode(to encoder: any Encoder) throws {
|
||||
switch self {
|
||||
case let .Profile(value):
|
||||
case let .apps(value):
|
||||
try value.encode(to: encoder)
|
||||
case let .BundleIdCapability(value):
|
||||
case let .bundleIdCapabilities(value):
|
||||
try value.encode(to: encoder)
|
||||
case let .App(value):
|
||||
case let .profiles(value):
|
||||
try value.encode(to: encoder)
|
||||
}
|
||||
}
|
||||
@@ -4220,56 +4391,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?
|
||||
@@ -4917,45 +5041,43 @@ public enum Components {
|
||||
public var data: [Components.Schemas.Profile]
|
||||
/// - Remark: Generated from `#/components/schemas/ProfilesResponse/IncludedPayload`.
|
||||
@frozen public enum IncludedPayloadPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/ProfilesResponse/IncludedPayload/case1`.
|
||||
case BundleId(Components.Schemas.BundleId)
|
||||
/// - Remark: Generated from `#/components/schemas/ProfilesResponse/IncludedPayload/case2`.
|
||||
case Device(Components.Schemas.Device)
|
||||
/// - Remark: Generated from `#/components/schemas/ProfilesResponse/IncludedPayload/case3`.
|
||||
case Certificate(Components.Schemas.Certificate)
|
||||
/// - Remark: Generated from `#/components/schemas/ProfilesResponse/IncludedPayload/BundleId`.
|
||||
case bundleIds(Components.Schemas.BundleId)
|
||||
/// - Remark: Generated from `#/components/schemas/ProfilesResponse/IncludedPayload/Certificate`.
|
||||
case certificates(Components.Schemas.Certificate)
|
||||
/// - Remark: Generated from `#/components/schemas/ProfilesResponse/IncludedPayload/Device`.
|
||||
case devices(Components.Schemas.Device)
|
||||
public enum CodingKeys: String, CodingKey {
|
||||
case _type = "type"
|
||||
}
|
||||
public init(from decoder: any Decoder) throws {
|
||||
var errors: [any Error] = []
|
||||
do {
|
||||
self = .BundleId(try .init(from: decoder))
|
||||
return
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
do {
|
||||
self = .Device(try .init(from: decoder))
|
||||
return
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
do {
|
||||
self = .Certificate(try .init(from: decoder))
|
||||
return
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
throw Swift.DecodingError.failedToDecodeOneOfSchema(
|
||||
type: Self.self,
|
||||
codingPath: decoder.codingPath,
|
||||
errors: errors
|
||||
let container = try decoder.container(keyedBy: CodingKeys.self)
|
||||
let discriminator = try container.decode(
|
||||
Swift.String.self,
|
||||
forKey: ._type
|
||||
)
|
||||
switch discriminator {
|
||||
case "bundleIds":
|
||||
self = .bundleIds(try .init(from: decoder))
|
||||
case "certificates":
|
||||
self = .certificates(try .init(from: decoder))
|
||||
case "devices":
|
||||
self = .devices(try .init(from: decoder))
|
||||
default:
|
||||
throw Swift.DecodingError.unknownOneOfDiscriminator(
|
||||
discriminatorKey: CodingKeys._type,
|
||||
discriminatorValue: discriminator,
|
||||
codingPath: decoder.codingPath
|
||||
)
|
||||
}
|
||||
}
|
||||
public func encode(to encoder: any Encoder) throws {
|
||||
switch self {
|
||||
case let .BundleId(value):
|
||||
case let .bundleIds(value):
|
||||
try value.encode(to: encoder)
|
||||
case let .Device(value):
|
||||
case let .certificates(value):
|
||||
try value.encode(to: encoder)
|
||||
case let .Certificate(value):
|
||||
case let .devices(value):
|
||||
try value.encode(to: encoder)
|
||||
}
|
||||
}
|
||||
@@ -4999,45 +5121,43 @@ public enum Components {
|
||||
public var data: Components.Schemas.Profile
|
||||
/// - Remark: Generated from `#/components/schemas/ProfileResponse/IncludedPayload`.
|
||||
@frozen public enum IncludedPayloadPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/ProfileResponse/IncludedPayload/case1`.
|
||||
case BundleId(Components.Schemas.BundleId)
|
||||
/// - Remark: Generated from `#/components/schemas/ProfileResponse/IncludedPayload/case2`.
|
||||
case Device(Components.Schemas.Device)
|
||||
/// - Remark: Generated from `#/components/schemas/ProfileResponse/IncludedPayload/case3`.
|
||||
case Certificate(Components.Schemas.Certificate)
|
||||
/// - Remark: Generated from `#/components/schemas/ProfileResponse/IncludedPayload/BundleId`.
|
||||
case bundleIds(Components.Schemas.BundleId)
|
||||
/// - Remark: Generated from `#/components/schemas/ProfileResponse/IncludedPayload/Certificate`.
|
||||
case certificates(Components.Schemas.Certificate)
|
||||
/// - Remark: Generated from `#/components/schemas/ProfileResponse/IncludedPayload/Device`.
|
||||
case devices(Components.Schemas.Device)
|
||||
public enum CodingKeys: String, CodingKey {
|
||||
case _type = "type"
|
||||
}
|
||||
public init(from decoder: any Decoder) throws {
|
||||
var errors: [any Error] = []
|
||||
do {
|
||||
self = .BundleId(try .init(from: decoder))
|
||||
return
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
do {
|
||||
self = .Device(try .init(from: decoder))
|
||||
return
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
do {
|
||||
self = .Certificate(try .init(from: decoder))
|
||||
return
|
||||
} catch {
|
||||
errors.append(error)
|
||||
}
|
||||
throw Swift.DecodingError.failedToDecodeOneOfSchema(
|
||||
type: Self.self,
|
||||
codingPath: decoder.codingPath,
|
||||
errors: errors
|
||||
let container = try decoder.container(keyedBy: CodingKeys.self)
|
||||
let discriminator = try container.decode(
|
||||
Swift.String.self,
|
||||
forKey: ._type
|
||||
)
|
||||
switch discriminator {
|
||||
case "bundleIds":
|
||||
self = .bundleIds(try .init(from: decoder))
|
||||
case "certificates":
|
||||
self = .certificates(try .init(from: decoder))
|
||||
case "devices":
|
||||
self = .devices(try .init(from: decoder))
|
||||
default:
|
||||
throw Swift.DecodingError.unknownOneOfDiscriminator(
|
||||
discriminatorKey: CodingKeys._type,
|
||||
discriminatorValue: discriminator,
|
||||
codingPath: decoder.codingPath
|
||||
)
|
||||
}
|
||||
}
|
||||
public func encode(to encoder: any Encoder) throws {
|
||||
switch self {
|
||||
case let .BundleId(value):
|
||||
case let .bundleIds(value):
|
||||
try value.encode(to: encoder)
|
||||
case let .Device(value):
|
||||
case let .certificates(value):
|
||||
try value.encode(to: encoder)
|
||||
case let .Certificate(value):
|
||||
case let .devices(value):
|
||||
try value.encode(to: encoder)
|
||||
}
|
||||
}
|
||||
@@ -8024,57 +8144,6 @@ public enum Operations {
|
||||
}
|
||||
}
|
||||
}
|
||||
public struct Conflict: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/bundleIdCapabilities/{id}/DELETE/responses/409/content`.
|
||||
@frozen public enum Body: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/bundleIdCapabilities/{id}/DELETE/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.BundleIdCapabilitiesDeleteInstance.Output.Conflict.Body
|
||||
/// Creates a new `Conflict`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - body: Received HTTP response body
|
||||
public init(body: Operations.BundleIdCapabilitiesDeleteInstance.Output.Conflict.Body) {
|
||||
self.body = body
|
||||
}
|
||||
}
|
||||
/// Request entity error(s)
|
||||
///
|
||||
/// - Remark: Generated from `#/paths//v1/bundleIdCapabilities/{id}/delete(bundleIdCapabilities_deleteInstance)/responses/409`.
|
||||
///
|
||||
/// HTTP response code: `409 conflict`.
|
||||
case conflict(Operations.BundleIdCapabilitiesDeleteInstance.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.BundleIdCapabilitiesDeleteInstance.Output.Conflict {
|
||||
get throws {
|
||||
switch self {
|
||||
case let .conflict(response):
|
||||
return response
|
||||
default:
|
||||
try throwUnexpectedResponseStatus(
|
||||
expectedStatus: "conflict",
|
||||
response: self
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
public struct TooManyRequests: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/bundleIdCapabilities/{id}/DELETE/responses/429/content`.
|
||||
@frozen public enum Body: Sendable, Hashable {
|
||||
@@ -8274,10 +8343,12 @@ public enum Operations {
|
||||
case streamlinedPurchasingEnabled = "streamlinedPurchasingEnabled"
|
||||
case accessibilityDeclarations = "accessibilityDeclarations"
|
||||
case appEncryptionDeclarations = "appEncryptionDeclarations"
|
||||
case appStoreIcon = "appStoreIcon"
|
||||
case ciProduct = "ciProduct"
|
||||
case betaTesters = "betaTesters"
|
||||
case betaGroups = "betaGroups"
|
||||
case appStoreVersions = "appStoreVersions"
|
||||
case appTags = "appTags"
|
||||
case preReleaseVersions = "preReleaseVersions"
|
||||
case betaAppLocalizations = "betaAppLocalizations"
|
||||
case builds = "builds"
|
||||
@@ -8306,10 +8377,13 @@ public enum Operations {
|
||||
case alternativeDistributionKey = "alternativeDistributionKey"
|
||||
case analyticsReportRequests = "analyticsReportRequests"
|
||||
case marketplaceSearchDetail = "marketplaceSearchDetail"
|
||||
case buildUploads = "buildUploads"
|
||||
case backgroundAssets = "backgroundAssets"
|
||||
case betaFeedbackScreenshotSubmissions = "betaFeedbackScreenshotSubmissions"
|
||||
case betaFeedbackCrashSubmissions = "betaFeedbackCrashSubmissions"
|
||||
case searchKeywords = "searchKeywords"
|
||||
case webhooks = "webhooks"
|
||||
case androidToIosAppMappingDetails = "androidToIosAppMappingDetails"
|
||||
}
|
||||
/// - Remark: Generated from `#/paths/v1/bundleIds/GET/query/fields[apps]`.
|
||||
public typealias Fields_lbrack_apps_rbrack_Payload = [Operations.BundleIdsGetCollection.Input.Query.FieldsLbrackAppsRbrackPayloadPayload]
|
||||
@@ -9213,10 +9287,12 @@ public enum Operations {
|
||||
case streamlinedPurchasingEnabled = "streamlinedPurchasingEnabled"
|
||||
case accessibilityDeclarations = "accessibilityDeclarations"
|
||||
case appEncryptionDeclarations = "appEncryptionDeclarations"
|
||||
case appStoreIcon = "appStoreIcon"
|
||||
case ciProduct = "ciProduct"
|
||||
case betaTesters = "betaTesters"
|
||||
case betaGroups = "betaGroups"
|
||||
case appStoreVersions = "appStoreVersions"
|
||||
case appTags = "appTags"
|
||||
case preReleaseVersions = "preReleaseVersions"
|
||||
case betaAppLocalizations = "betaAppLocalizations"
|
||||
case builds = "builds"
|
||||
@@ -9245,10 +9321,13 @@ public enum Operations {
|
||||
case alternativeDistributionKey = "alternativeDistributionKey"
|
||||
case analyticsReportRequests = "analyticsReportRequests"
|
||||
case marketplaceSearchDetail = "marketplaceSearchDetail"
|
||||
case buildUploads = "buildUploads"
|
||||
case backgroundAssets = "backgroundAssets"
|
||||
case betaFeedbackScreenshotSubmissions = "betaFeedbackScreenshotSubmissions"
|
||||
case betaFeedbackCrashSubmissions = "betaFeedbackCrashSubmissions"
|
||||
case searchKeywords = "searchKeywords"
|
||||
case webhooks = "webhooks"
|
||||
case androidToIosAppMappingDetails = "androidToIosAppMappingDetails"
|
||||
}
|
||||
/// - Remark: Generated from `#/paths/v1/bundleIds/{id}/GET/query/fields[apps]`.
|
||||
public typealias Fields_lbrack_apps_rbrack_Payload = [Operations.BundleIdsGetInstance.Input.Query.FieldsLbrackAppsRbrackPayloadPayload]
|
||||
@@ -10450,57 +10529,6 @@ public enum Operations {
|
||||
}
|
||||
}
|
||||
}
|
||||
public struct Conflict: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/bundleIds/{id}/DELETE/responses/409/content`.
|
||||
@frozen public enum Body: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/bundleIds/{id}/DELETE/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.BundleIdsDeleteInstance.Output.Conflict.Body
|
||||
/// Creates a new `Conflict`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - body: Received HTTP response body
|
||||
public init(body: Operations.BundleIdsDeleteInstance.Output.Conflict.Body) {
|
||||
self.body = body
|
||||
}
|
||||
}
|
||||
/// Request entity error(s)
|
||||
///
|
||||
/// - Remark: Generated from `#/paths//v1/bundleIds/{id}/delete(bundleIds_deleteInstance)/responses/409`.
|
||||
///
|
||||
/// HTTP response code: `409 conflict`.
|
||||
case conflict(Operations.BundleIdsDeleteInstance.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.BundleIdsDeleteInstance.Output.Conflict {
|
||||
get throws {
|
||||
switch self {
|
||||
case let .conflict(response):
|
||||
return response
|
||||
default:
|
||||
try throwUnexpectedResponseStatus(
|
||||
expectedStatus: "conflict",
|
||||
response: self
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
public struct TooManyRequests: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/bundleIds/{id}/DELETE/responses/429/content`.
|
||||
@frozen public enum Body: Sendable, Hashable {
|
||||
@@ -12686,57 +12714,6 @@ public enum Operations {
|
||||
}
|
||||
}
|
||||
}
|
||||
public struct Conflict: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/DELETE/responses/409/content`.
|
||||
@frozen public enum Body: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/DELETE/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.CertificatesDeleteInstance.Output.Conflict.Body
|
||||
/// Creates a new `Conflict`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - body: Received HTTP response body
|
||||
public init(body: Operations.CertificatesDeleteInstance.Output.Conflict.Body) {
|
||||
self.body = body
|
||||
}
|
||||
}
|
||||
/// Request entity error(s)
|
||||
///
|
||||
/// - Remark: Generated from `#/paths//v1/certificates/{id}/delete(certificates_deleteInstance)/responses/409`.
|
||||
///
|
||||
/// HTTP response code: `409 conflict`.
|
||||
case conflict(Operations.CertificatesDeleteInstance.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.CertificatesDeleteInstance.Output.Conflict {
|
||||
get throws {
|
||||
switch self {
|
||||
case let .conflict(response):
|
||||
return response
|
||||
default:
|
||||
try throwUnexpectedResponseStatus(
|
||||
expectedStatus: "conflict",
|
||||
response: self
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
public struct TooManyRequests: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/certificates/{id}/DELETE/responses/429/content`.
|
||||
@frozen public enum Body: Sendable, Hashable {
|
||||
@@ -16312,57 +16289,6 @@ public enum Operations {
|
||||
}
|
||||
}
|
||||
}
|
||||
public struct Conflict: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/profiles/{id}/DELETE/responses/409/content`.
|
||||
@frozen public enum Body: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/profiles/{id}/DELETE/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.ProfilesDeleteInstance.Output.Conflict.Body
|
||||
/// Creates a new `Conflict`.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - body: Received HTTP response body
|
||||
public init(body: Operations.ProfilesDeleteInstance.Output.Conflict.Body) {
|
||||
self.body = body
|
||||
}
|
||||
}
|
||||
/// Request entity error(s)
|
||||
///
|
||||
/// - Remark: Generated from `#/paths//v1/profiles/{id}/delete(profiles_deleteInstance)/responses/409`.
|
||||
///
|
||||
/// HTTP response code: `409 conflict`.
|
||||
case conflict(Operations.ProfilesDeleteInstance.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.ProfilesDeleteInstance.Output.Conflict {
|
||||
get throws {
|
||||
switch self {
|
||||
case let .conflict(response):
|
||||
return response
|
||||
default:
|
||||
try throwUnexpectedResponseStatus(
|
||||
expectedStatus: "conflict",
|
||||
response: self
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
public struct TooManyRequests: Sendable, Hashable {
|
||||
/// - Remark: Generated from `#/paths/v1/profiles/{id}/DELETE/responses/429/content`.
|
||||
@frozen public enum Body: Sendable, Hashable {
|
||||
@@ -16866,10 +16792,12 @@ public enum Operations {
|
||||
case streamlinedPurchasingEnabled = "streamlinedPurchasingEnabled"
|
||||
case accessibilityDeclarations = "accessibilityDeclarations"
|
||||
case appEncryptionDeclarations = "appEncryptionDeclarations"
|
||||
case appStoreIcon = "appStoreIcon"
|
||||
case ciProduct = "ciProduct"
|
||||
case betaTesters = "betaTesters"
|
||||
case betaGroups = "betaGroups"
|
||||
case appStoreVersions = "appStoreVersions"
|
||||
case appTags = "appTags"
|
||||
case preReleaseVersions = "preReleaseVersions"
|
||||
case betaAppLocalizations = "betaAppLocalizations"
|
||||
case builds = "builds"
|
||||
@@ -16898,10 +16826,13 @@ public enum Operations {
|
||||
case alternativeDistributionKey = "alternativeDistributionKey"
|
||||
case analyticsReportRequests = "analyticsReportRequests"
|
||||
case marketplaceSearchDetail = "marketplaceSearchDetail"
|
||||
case buildUploads = "buildUploads"
|
||||
case backgroundAssets = "backgroundAssets"
|
||||
case betaFeedbackScreenshotSubmissions = "betaFeedbackScreenshotSubmissions"
|
||||
case betaFeedbackCrashSubmissions = "betaFeedbackCrashSubmissions"
|
||||
case searchKeywords = "searchKeywords"
|
||||
case webhooks = "webhooks"
|
||||
case androidToIosAppMappingDetails = "androidToIosAppMappingDetails"
|
||||
}
|
||||
/// - Remark: Generated from `#/paths/v1/bundleIds/{id}/app/GET/query/fields[apps]`.
|
||||
public typealias Fields_lbrack_apps_rbrack_Payload = [Operations.BundleIdsAppGetToOneRelated.Input.Query.FieldsLbrackAppsRbrackPayloadPayload]
|
||||
|
||||
@@ -65,7 +65,7 @@ function openAll(schema, path = []) {
|
||||
function patch(schema) {
|
||||
const schemas = schema.components.schemas;
|
||||
|
||||
// this field is required when using the private Xcode API
|
||||
// this field is required iff using the private Xcode API
|
||||
update(schemas.BundleIdCapabilityCreateRequest.properties.data.properties.relationships, {
|
||||
properties: {
|
||||
capability: {
|
||||
@@ -86,7 +86,6 @@ function patch(schema) {
|
||||
required: ['data'],
|
||||
}
|
||||
},
|
||||
required: ['capability'],
|
||||
})
|
||||
|
||||
// we don't use this but it triggers a deprecation warning. see:
|
||||
|
||||
@@ -1,64 +1,124 @@
|
||||
import Foundation
|
||||
import Subprocess
|
||||
import XUtils
|
||||
import Superutils
|
||||
|
||||
public struct BuildSettings: Sendable {
|
||||
private static let customBinDir =
|
||||
// this is the same option used by SwiftPM itself for dev builds
|
||||
ProcessInfo.processInfo.environment["SWIFTPM_CUSTOM_BIN_DIR"].map { URL(fileURLWithPath: $0) }
|
||||
ProcessInfo.processInfo.environment["SWIFTPM_CUSTOM_BIN_DIR"].map { FilePath($0) }
|
||||
|
||||
private static let envURL = URL(fileURLWithPath: "/usr/bin/env")
|
||||
|
||||
public let packagePath: String
|
||||
public var packagePath: String
|
||||
public let configuration: BuildConfiguration
|
||||
public let triple: String
|
||||
public let sdkOptions: [String]
|
||||
public let options: [String]
|
||||
public let buildSystem: BuildSystem
|
||||
public let customOptions: [String]
|
||||
|
||||
public var sdkOptions: [String]
|
||||
public var sdkEnvironment: [Environment.Key: String?]
|
||||
|
||||
private var configOptions: [String] {
|
||||
return [
|
||||
"--configuration", configuration.rawValue,
|
||||
"--build-system", buildSystem.pmName,
|
||||
"--package-path", packagePath,
|
||||
]
|
||||
}
|
||||
|
||||
private var resolvedBaseOptions: [String] {
|
||||
configOptions + sdkOptions + customOptions
|
||||
}
|
||||
|
||||
public init(
|
||||
configuration: BuildConfiguration,
|
||||
triple: String,
|
||||
buildSystem: BuildSystem = .default,
|
||||
packagePath: String = ".",
|
||||
options: [String] = []
|
||||
) async throws {
|
||||
self.packagePath = packagePath
|
||||
self.configuration = configuration
|
||||
self.options = options
|
||||
self.customOptions = options
|
||||
self.triple = triple
|
||||
self.buildSystem = buildSystem
|
||||
|
||||
// on macOS we don't explicitly install a Swift SDK but
|
||||
// SwiftPM vends "implicit" Darwin SDKs as of Swift 6.1,
|
||||
// i.e. we can pass `--swift-sdk arm64-apple-ios` and it
|
||||
// just works. See:
|
||||
// https://github.com/swiftlang/swift-package-manager/pull/6828
|
||||
self.sdkOptions = ["--swift-sdk", triple]
|
||||
self.sdkEnvironment = [
|
||||
// xcrun passes an SDKROOT that messes with our sdk configuration
|
||||
"SDKROOT": nil,
|
||||
]
|
||||
|
||||
switch buildSystem {
|
||||
case .swiftPM:
|
||||
// on macOS we don't explicitly install a Swift SDK but
|
||||
// SwiftPM vends "implicit" Darwin SDKs as of Swift 6.1,
|
||||
// i.e. we can pass `--swift-sdk arm64-apple-ios` and it
|
||||
// just works. See:
|
||||
// https://github.com/swiftlang/swift-package-manager/pull/6828
|
||||
self.sdkOptions = ["--swift-sdk", triple]
|
||||
case .swiftBuild:
|
||||
self.sdkOptions = ["--triple", triple]
|
||||
#if !os(macOS)
|
||||
let darwinSDK = try await DarwinSDK.current()
|
||||
.orThrow(StringError("No Darwin SDK configured. Please run `xtool setup`."))
|
||||
self.sdkOptions += [
|
||||
"--toolset", "\(darwinSDK.bundle.path)/toolset-swb.json",
|
||||
]
|
||||
self.sdkEnvironment.merge([
|
||||
"XCODE_EXTRA_PLATFORM_FOLDERS": "\(darwinSDK.bundle.path)/Developer/Platforms",
|
||||
]) { $1 }
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
#if os(macOS)
|
||||
private static func xcrun(_ arguments: [String]) async throws -> String {
|
||||
let xcrun = Process()
|
||||
let pipe = Pipe()
|
||||
xcrun.executableURL = URL(fileURLWithPath: "/usr/bin/xcrun")
|
||||
xcrun.arguments = arguments
|
||||
xcrun.standardOutput = pipe
|
||||
try await xcrun.runUntilExit()
|
||||
return String(decoding: pipe.fileHandleForReading.readDataToEndOfFile(), as: UTF8.self)
|
||||
.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
let result = try await Subprocess.run(
|
||||
.path("/usr/bin/xcrun"),
|
||||
arguments: .init(arguments),
|
||||
output: .string(limit: .max)
|
||||
).checkSuccess()
|
||||
return result.standardOutput?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
|
||||
}
|
||||
|
||||
private static let swiftURL = Task {
|
||||
try await URL(fileURLWithPath: xcrun(["-f", "swift"]))
|
||||
private static let _swiftURL = Task {
|
||||
try await FilePath(xcrun(["-f", "swift"]))
|
||||
}
|
||||
|
||||
public static func swiftURL() async throws -> FilePath {
|
||||
try await _swiftURL.value
|
||||
}
|
||||
|
||||
private static let _swiftcURL = Task {
|
||||
try await FilePath(xcrun(["-f", "swiftc"]))
|
||||
}
|
||||
|
||||
public static func swiftcURL() async throws -> FilePath {
|
||||
try await _swiftcURL.value
|
||||
}
|
||||
#else
|
||||
public static func swiftURL() async throws -> FilePath {
|
||||
try await FilePath(ToolRegistry.locate("swift")).orThrow(StringError("Got bad path for swift executable"))
|
||||
}
|
||||
|
||||
public static func swiftcURL() async throws -> FilePath {
|
||||
try await FilePath(ToolRegistry.locate("swiftc")).orThrow(StringError("Got bad path for swiftc executable"))
|
||||
}
|
||||
#endif
|
||||
|
||||
public func withPackagePath(_ path: String) -> Self {
|
||||
var copy = self
|
||||
copy.packagePath = path
|
||||
return copy
|
||||
}
|
||||
|
||||
public func swiftPMInvocation(
|
||||
forTool tool: String,
|
||||
arguments: [String],
|
||||
packagePathOverride: String? = nil
|
||||
) async throws -> Process {
|
||||
let process = Process()
|
||||
|
||||
) async throws -> Subprocess.Configuration {
|
||||
let executable: Executable
|
||||
let baseArguments: [String]
|
||||
if let customBinDir = Self.customBinDir {
|
||||
process.executableURL = customBinDir.appendingPathComponent("swift-\(tool)")
|
||||
executable = .path(customBinDir.appending("swift-\(tool)"))
|
||||
baseArguments = []
|
||||
} else {
|
||||
#if os(macOS)
|
||||
@@ -66,28 +126,60 @@ public struct BuildSettings: Sendable {
|
||||
// to add SDKROOT=.../MacOSX.sdk to our invocations. We avoid this by
|
||||
// 1) invoking the real swift executable (located with `xcrun -f`) and
|
||||
// 2) explicitly removing SDKROOT from the env, as it may be inherited
|
||||
// through the `swift run pack` invocation.
|
||||
process.executableURL = try await Self.swiftURL.value
|
||||
// through a parent process (e.g. `swift run xtool`).
|
||||
executable = .path(try await Self.swiftURL())
|
||||
#else
|
||||
process.executableURL = try await ToolRegistry.locate("swift")
|
||||
executable = .name("swift")
|
||||
#endif
|
||||
baseArguments = [tool]
|
||||
}
|
||||
|
||||
let extraArguments: [String] = [
|
||||
"--package-path", packagePathOverride ?? packagePath,
|
||||
"--configuration", configuration.rawValue,
|
||||
]
|
||||
return Configuration(
|
||||
executable,
|
||||
arguments: .init(baseArguments + resolvedBaseOptions + arguments),
|
||||
environment: .inherit.updating(sdkEnvironment),
|
||||
platformOptions: .withGracefulShutDown,
|
||||
)
|
||||
}
|
||||
|
||||
var env = ProcessInfo.processInfo.environment
|
||||
env.removeValue(forKey: "SDKROOT")
|
||||
process.environment = env
|
||||
process.arguments = baseArguments + extraArguments + sdkOptions + options + arguments
|
||||
return process
|
||||
public var buildServerArguments: [String] {
|
||||
return [
|
||||
"package", "experimental-build-server",
|
||||
"--disable-automatic-resolution",
|
||||
// TODO: once https://github.com/swiftlang/swift-package-manager/pull/9819 makes it into a release
|
||||
// (Swift 6.4), pass --experimental-skip-acquiring-lock
|
||||
] + resolvedBaseOptions
|
||||
}
|
||||
}
|
||||
|
||||
public enum BuildConfiguration: String, CaseIterable, Sendable {
|
||||
case debug
|
||||
case release
|
||||
|
||||
var swiftBuildValue: String {
|
||||
switch self {
|
||||
case .debug: "Debug"
|
||||
case .release: "Release"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public enum BuildSystem: Sendable {
|
||||
case swiftPM
|
||||
case swiftBuild
|
||||
|
||||
public static var `default`: Self {
|
||||
#if os(macOS)
|
||||
return .swiftBuild
|
||||
#else
|
||||
return .swiftBuild
|
||||
#endif
|
||||
}
|
||||
|
||||
var pmName: String {
|
||||
switch self {
|
||||
case .swiftPM: "native"
|
||||
case .swiftBuild: "swiftbuild"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,95 @@
|
||||
import Foundation
|
||||
import Subprocess
|
||||
import XUtils
|
||||
|
||||
public struct DarwinSDK {
|
||||
public let bundle: URL
|
||||
public let version: String
|
||||
|
||||
public init?(bundle: URL) {
|
||||
self.bundle = bundle
|
||||
if let version = try? Data(contentsOf: bundle.appendingPathComponent("darwin-sdk-version.txt")) {
|
||||
self.version = String(decoding: version, as: UTF8.self)
|
||||
.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
} else if ["darwin.xtoolsdk", "darwin.artifactbundle"].contains(bundle.lastPathComponent) {
|
||||
self.version = "unknown"
|
||||
} else {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
public 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 StringError("Invalid Darwin SDK at '\(path)'")}
|
||||
|
||||
try await addHostClangResourceDir(to: url)
|
||||
|
||||
try await Subprocess.run(
|
||||
.name("swift"),
|
||||
arguments: ["sdk", "install", url.path],
|
||||
output: .discarded
|
||||
)
|
||||
.checkSuccess()
|
||||
}
|
||||
|
||||
private static func addHostClangResourceDir(to sdk: URL) async throws {
|
||||
let clangURL = try await ToolRegistry.locate("clang")
|
||||
let process = try await Subprocess.run(
|
||||
.path(FilePath(clangURL.path)),
|
||||
arguments: ["-print-resource-dir"],
|
||||
output: .string(limit: .max)
|
||||
).checkSuccess()
|
||||
let output = process.standardOutput ?? ""
|
||||
let hostClangResources = URL(filePath: output.trimmingCharacters(in: .whitespacesAndNewlines))
|
||||
let hostInclude = hostClangResources.appending(path: "include")
|
||||
let sdkInclude = sdk.appending(path: "Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/clang/include")
|
||||
try FileManager.default.copyItem(at: hostInclude, to: sdkInclude)
|
||||
}
|
||||
|
||||
public static func current() async throws -> DarwinSDK? {
|
||||
let outputString: String
|
||||
do {
|
||||
outputString = try await Subprocess.run(
|
||||
.name("swift"),
|
||||
arguments: ["sdk", "configure", "darwin", "arm64-apple-ios", "--show-configuration"],
|
||||
output: .string(limit: .max)
|
||||
)
|
||||
.checkSuccess()
|
||||
.standardOutput
|
||||
?? ""
|
||||
} catch SubprocessFailure.exited {
|
||||
return nil
|
||||
}
|
||||
|
||||
// should be something like
|
||||
// swiftResourcesPath: /home/user/.swiftpm/swift-sdks/darwin.artifactbundle/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift
|
||||
// swiftlint:disable:previous line_length
|
||||
let resourcesPathPrefix = "swiftResourcesPath: "
|
||||
|
||||
guard let resourcesPath = outputString
|
||||
.split(separator: "\n")
|
||||
.first(where: { $0.hasPrefix(resourcesPathPrefix) })?
|
||||
.dropFirst(resourcesPathPrefix.count)
|
||||
else { return nil }
|
||||
|
||||
var resourcesURL = URL(fileURLWithPath: String(resourcesPath))
|
||||
for _ in 0..<6 {
|
||||
resourcesURL = resourcesURL.deletingLastPathComponent()
|
||||
}
|
||||
|
||||
return DarwinSDK(bundle: resourcesURL)
|
||||
}
|
||||
|
||||
public func isUpToDate() -> Bool {
|
||||
true
|
||||
}
|
||||
|
||||
public func remove() throws {
|
||||
try FileManager.default.removeItem(at: bundle)
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
import Foundation
|
||||
import XUtils
|
||||
import Subprocess
|
||||
|
||||
public struct Packer: Sendable {
|
||||
public let buildSettings: BuildSettings
|
||||
@@ -54,22 +55,27 @@ public struct Packer: Sendable {
|
||||
try Data().write(to: sources.appendingPathComponent("stub.c", isDirectory: false))
|
||||
}
|
||||
|
||||
let builder = try await buildSettings.swiftPMInvocation(
|
||||
forTool: "build",
|
||||
arguments: [
|
||||
"--package-path", packageDir.path,
|
||||
"--scratch-path", ".build",
|
||||
// resolving can cause SwiftPM to overwrite the root package deps
|
||||
// with just the deps needed for the builder package (which is to
|
||||
// say, any "dev dependencies" of the root package may be removed.)
|
||||
// fortunately we've already resolved the root package by this point
|
||||
// in order to dump the plan, so we can skip resolution here to skirt
|
||||
// the issue.
|
||||
"--disable-automatic-resolution",
|
||||
]
|
||||
let buildConfig = try await buildSettings
|
||||
.withPackagePath(packageDir.path)
|
||||
.swiftPMInvocation(
|
||||
forTool: "build",
|
||||
arguments: [
|
||||
"--scratch-path", ".build",
|
||||
// resolving can cause SwiftPM to overwrite the root package deps
|
||||
// with just the deps needed for the builder package (which is to
|
||||
// say, any "dev dependencies" of the root package may be removed.)
|
||||
// fortunately we've already resolved the root package by this point
|
||||
// in order to dump the plan, so we can skip resolution here to skirt
|
||||
// the issue.
|
||||
"--disable-automatic-resolution",
|
||||
],
|
||||
)
|
||||
try await Subprocess.run(
|
||||
buildConfig,
|
||||
output: .standardError,
|
||||
error: .standardError,
|
||||
)
|
||||
builder.standardOutput = FileHandle.standardError
|
||||
try await builder.runUntilExit()
|
||||
.checkSuccess()
|
||||
}
|
||||
|
||||
public func pack() async throws -> URL {
|
||||
@@ -79,8 +85,16 @@ public struct Packer: Sendable {
|
||||
|
||||
let outputURL = output.url
|
||||
|
||||
let binPath: String
|
||||
switch buildSettings.buildSystem {
|
||||
case .swiftPM:
|
||||
binPath = "\(buildSettings.triple)/\(buildSettings.configuration.rawValue)"
|
||||
case .swiftBuild:
|
||||
let platformName = buildSettings.triple.contains("simulator") ? "iphonesimulator" : "iphoneos"
|
||||
binPath = "out/Products/\(buildSettings.configuration.swiftBuildValue)-\(platformName)"
|
||||
}
|
||||
let binDir = URL(
|
||||
fileURLWithPath: ".build/\(buildSettings.triple)/\(buildSettings.configuration.rawValue)",
|
||||
fileURLWithPath: ".build/\(binPath)",
|
||||
isDirectory: true
|
||||
)
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import Foundation
|
||||
import XUtils
|
||||
import Subprocess
|
||||
|
||||
public struct Planner: Sendable {
|
||||
public var buildSettings: BuildSettings
|
||||
@@ -243,16 +244,17 @@ public struct Planner: Sendable {
|
||||
}
|
||||
|
||||
private func _dumpAction(arguments: [String], path: String) async throws -> Data {
|
||||
let dump = try await buildSettings.swiftPMInvocation(
|
||||
let dumpConfig = try await buildSettings.withPackagePath(path).swiftPMInvocation(
|
||||
forTool: "package",
|
||||
arguments: arguments,
|
||||
packagePathOverride: path
|
||||
)
|
||||
let pipe = Pipe()
|
||||
dump.standardOutput = pipe
|
||||
async let task = Data(reading: pipe.fileHandleForReading)
|
||||
try await dump.runUntilExit()
|
||||
return try await task
|
||||
return try await Subprocess.run(
|
||||
dumpConfig,
|
||||
output: .data(limit: .max),
|
||||
error: .standardError,
|
||||
)
|
||||
.checkSuccess()
|
||||
.standardOutput
|
||||
}
|
||||
|
||||
private func selectLibrary(
|
||||
|
||||
@@ -1,63 +0,0 @@
|
||||
import Foundation
|
||||
|
||||
extension Process {
|
||||
/// Launches the process and suspends until the receiver is finished.
|
||||
///
|
||||
/// - Parameter onCancel: The action to take if the current
|
||||
/// task is cancelled.
|
||||
public func runUntilExit(onCancel: TaskCancelAction = .interrupt) async throws {
|
||||
try Task.checkCancellation()
|
||||
|
||||
let (terminationStream, terminationContinuation) = AsyncStream<Never>.makeStream()
|
||||
terminationHandler = { _ in
|
||||
terminationContinuation.finish()
|
||||
}
|
||||
|
||||
do {
|
||||
try run()
|
||||
} catch {
|
||||
terminationContinuation.finish()
|
||||
throw error
|
||||
}
|
||||
|
||||
await withTaskCancellationHandler {
|
||||
for await _ in terminationStream {}
|
||||
} onCancel: {
|
||||
switch onCancel {
|
||||
case .interrupt:
|
||||
interrupt()
|
||||
case .terminate:
|
||||
terminate()
|
||||
case .ignore:
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
try Task.checkCancellation()
|
||||
|
||||
switch terminationReason {
|
||||
case .exit where terminationStatus == 0:
|
||||
break
|
||||
case .exit:
|
||||
throw Failure.exit(terminationStatus)
|
||||
case .uncaughtSignal:
|
||||
throw Failure.uncaughtSignal(terminationStatus)
|
||||
@unknown default:
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
public enum Failure: Error {
|
||||
case exit(CInt)
|
||||
case uncaughtSignal(CInt)
|
||||
}
|
||||
|
||||
public enum TaskCancelAction: Sendable {
|
||||
/// Sends `SIGINT` to the process.
|
||||
case interrupt
|
||||
/// Sends `SIGTERM` to the process.
|
||||
case terminate
|
||||
/// Don't participate in cooperative cancellation.
|
||||
case ignore
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
import Foundation
|
||||
import Subprocess
|
||||
|
||||
package enum ToolRegistry {
|
||||
package enum Errors: Error, CustomStringConvertible {
|
||||
@@ -16,11 +17,6 @@ package enum ToolRegistry {
|
||||
|
||||
/// Obtain the full path to a tool in the user's `PATH`.
|
||||
///
|
||||
/// This effectively invokes `/bin/sh -c "command -v '$tool'"`.
|
||||
///
|
||||
/// - Warning: Make sure you trust/sanitize the `tool` parameter. If it
|
||||
/// contains a single quote, it can be used in a shell escape.
|
||||
///
|
||||
/// - Throws: `Errors.toolNotFound` if the tool could not be located.
|
||||
package static func locate(_ tool: String) async throws -> URL {
|
||||
try await cache.locate(tool: tool)
|
||||
@@ -30,20 +26,10 @@ package enum ToolRegistry {
|
||||
private var cache: [String: Task<URL, Error>] = [:]
|
||||
|
||||
private func _locate(tool: String) async throws -> URL {
|
||||
let pipe = Pipe()
|
||||
let proc = Process()
|
||||
proc.executableURL = URL(fileURLWithPath: "/bin/sh")
|
||||
proc.arguments = ["-c", "command -v '\(tool)'"]
|
||||
proc.standardOutput = pipe
|
||||
async let bytes = pipe.fileHandleForReading.readToEnd()
|
||||
do {
|
||||
try await proc.runUntilExit()
|
||||
} catch is Process.Failure {
|
||||
throw Errors.toolNotFound(tool)
|
||||
}
|
||||
let path = String(decoding: try await bytes ?? Data(), as: UTF8.self)
|
||||
.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
return URL(fileURLWithPath: path)
|
||||
guard let path = try? Executable.name(tool).resolveExecutablePath(in: .inherit),
|
||||
let url = URL(filePath: path)
|
||||
else { throw Errors.toolNotFound(tool) }
|
||||
return url
|
||||
}
|
||||
|
||||
func locate(tool: String) async throws -> URL {
|
||||
|
||||
@@ -49,9 +49,9 @@ public struct XcodePacker {
|
||||
let encodedPlist = try PropertyListSerialization.data(fromPropertyList: plist, format: .xml, options: 0)
|
||||
try infoPath.write(encodedPlist)
|
||||
|
||||
var buildSettings: [String: Any] = [
|
||||
"PRODUCT_BUNDLE_IDENTIFIER": product.bundleID,
|
||||
"TARGETED_DEVICE_FAMILY": families.map { "\($0)" }.joined(separator: ","),
|
||||
var buildSettings: [String: BuildSetting] = [
|
||||
"PRODUCT_BUNDLE_IDENTIFIER": .string(product.bundleID),
|
||||
"TARGETED_DEVICE_FAMILY": .string(families.map { "\($0)" }.joined(separator: ",")),
|
||||
]
|
||||
|
||||
if product.type == .appExtension {
|
||||
@@ -59,7 +59,7 @@ public struct XcodePacker {
|
||||
}
|
||||
|
||||
if let entitlementsPath = product.entitlementsPath {
|
||||
buildSettings["CODE_SIGN_ENTITLEMENTS"] = fromProjectToRoot + Path(entitlementsPath)
|
||||
buildSettings["CODE_SIGN_ENTITLEMENTS"] = .string((fromProjectToRoot + Path(entitlementsPath)).string)
|
||||
}
|
||||
|
||||
let additionalDependencies: [Dependency] = if product.type == .application {
|
||||
|
||||
@@ -137,8 +137,8 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
|
||||
id: appID.id
|
||||
)
|
||||
),
|
||||
// not public but required when using ds2 API
|
||||
capability: .init(
|
||||
// not public but required iff using ds2 API
|
||||
capability: context.auth.isPublicAPI ? nil : .init(
|
||||
data: .init(
|
||||
_type: .capabilities,
|
||||
id: typ
|
||||
|
||||
@@ -73,6 +73,13 @@ public enum DeveloperAPIAuthData: Sendable {
|
||||
}
|
||||
}
|
||||
|
||||
public var isPublicAPI: Bool {
|
||||
switch self {
|
||||
case .appStoreConnect: true
|
||||
case .xcode: false
|
||||
}
|
||||
}
|
||||
|
||||
// A unique ID tied to this token
|
||||
public var identityID: String {
|
||||
switch self {
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
import Foundation
|
||||
import XADI
|
||||
import Dependencies
|
||||
import Subprocess
|
||||
|
||||
public actor XADIProvider: RawADIProvider {
|
||||
@MainActor private static var loadTask: Task<Void, Error>?
|
||||
@@ -45,17 +46,17 @@ public actor XADIProvider: RawADIProvider {
|
||||
let archDir = "lib/\(arch)"
|
||||
|
||||
// TODO: Use ZIPFoundation
|
||||
let proc = Process()
|
||||
proc.executableURL = URL(filePath: "/usr/bin/env")
|
||||
proc.arguments = [
|
||||
"unzip", "-q",
|
||||
applemusic.path(),
|
||||
"\(archDir)/libCoreADI.so",
|
||||
"\(archDir)/libstoreservicescore.so",
|
||||
"-d", tmp.path()
|
||||
]
|
||||
try proc.run()
|
||||
proc.waitUntilExit()
|
||||
try await Subprocess.run(
|
||||
.name("unzip"),
|
||||
arguments: [
|
||||
"-q",
|
||||
applemusic.path,
|
||||
"\(archDir)/libCoreADI.so",
|
||||
"\(archDir)/libstoreservicescore.so",
|
||||
"-d", tmp.path
|
||||
],
|
||||
output: .discarded
|
||||
).checkSuccess()
|
||||
try FileManager.default.moveItem(
|
||||
at: tmp.appending(path: archDir),
|
||||
to: libDir
|
||||
|
||||
@@ -45,10 +45,7 @@ public actor IntegratedInstaller {
|
||||
case unlockDevice
|
||||
}
|
||||
|
||||
let udid: String
|
||||
let lookupMode: LookupMode
|
||||
let auth: DeveloperAPIAuthData
|
||||
let configureDevice: Bool
|
||||
public weak var delegate: IntegratedInstallerDelegate?
|
||||
|
||||
@Dependency(\.zipCompressor) private var compressor
|
||||
@@ -102,16 +99,10 @@ public actor IntegratedInstaller {
|
||||
}
|
||||
|
||||
public init(
|
||||
udid: String,
|
||||
lookupMode: LookupMode,
|
||||
auth: DeveloperAPIAuthData,
|
||||
configureDevice: Bool,
|
||||
delegate: IntegratedInstallerDelegate
|
||||
) {
|
||||
self.udid = udid
|
||||
self.lookupMode = lookupMode
|
||||
self.auth = auth
|
||||
self.configureDevice = configureDevice
|
||||
self.delegate = delegate
|
||||
}
|
||||
|
||||
@@ -144,7 +135,7 @@ public actor IntegratedInstaller {
|
||||
}
|
||||
}
|
||||
|
||||
private func fetchPairingKeys(with lockdownClient: LockdownClient) async throws -> Data {
|
||||
private func fetchPairingKeys(with lockdownClient: LockdownClient, udid: String) async throws -> Data {
|
||||
try lockdownClient.setValue(udid, forDomain: "com.apple.mobile.wireless_lockdown", key: "WirelessBuddyID")
|
||||
try lockdownClient.setValue(true, forDomain: "com.apple.mobile.wireless_lockdown", key: "EnableWifiConnections")
|
||||
|
||||
@@ -201,7 +192,12 @@ public actor IntegratedInstaller {
|
||||
}
|
||||
|
||||
@discardableResult
|
||||
public func install(app: URL) async throws -> String {
|
||||
public func install(
|
||||
app: URL,
|
||||
udid: String,
|
||||
lookupMode: LookupMode,
|
||||
configureDevice: Bool,
|
||||
) async throws -> String {
|
||||
try await self.updateStage(to: "Unpacking app", initialProgress: nil)
|
||||
|
||||
let _tempDir = try TemporaryDirectory(name: "staging")
|
||||
@@ -254,7 +250,7 @@ public actor IntegratedInstaller {
|
||||
let deviceName = try lockdownClient.deviceName()
|
||||
|
||||
let pairingKeys: Data? = if configureDevice {
|
||||
try await fetchPairingKeys(with: lockdownClient)
|
||||
try await fetchPairingKeys(with: lockdownClient, udid: udid)
|
||||
} else {
|
||||
nil
|
||||
}
|
||||
@@ -262,30 +258,9 @@ public actor IntegratedInstaller {
|
||||
|
||||
try await updateProgress(to: 1)
|
||||
|
||||
let context = try SigningContext(
|
||||
auth: auth,
|
||||
targetDevice: .init(udid: udid, name: deviceName)
|
||||
)
|
||||
|
||||
let signer = AutoSigner(context: context) { certs in
|
||||
await self.delegate?.confirmRevocation(of: certs) ?? false
|
||||
}
|
||||
let bundleID = try await signer.sign(
|
||||
let bundleID = try await signInPlace(
|
||||
app: appDir,
|
||||
status: { @Sendable status in
|
||||
self.queueUpdateTask {
|
||||
$0.updateStageIgnoringCancellation(to: status)
|
||||
}
|
||||
},
|
||||
progress: { progress in
|
||||
self.queueUpdateTask {
|
||||
$0.updateProgressIgnoringCancellation(to: progress)
|
||||
}
|
||||
},
|
||||
didProvision: { @Sendable [self] in
|
||||
// TODO: reintroduce Superconfig
|
||||
_ = self
|
||||
}
|
||||
targetDevice: .init(udid: udid, name: deviceName),
|
||||
)
|
||||
|
||||
try await self.updateStage(to: "Packaging", initialProgress: nil)
|
||||
@@ -314,6 +289,39 @@ public actor IntegratedInstaller {
|
||||
return bundleID
|
||||
}
|
||||
|
||||
@discardableResult
|
||||
public func signInPlace(
|
||||
app: URL,
|
||||
targetDevice: SigningContext.TargetDevice? = nil,
|
||||
) async throws -> String {
|
||||
let context = try SigningContext(
|
||||
auth: auth,
|
||||
targetDevice: targetDevice,
|
||||
)
|
||||
|
||||
let signer = AutoSigner(context: context) { certs in
|
||||
await self.delegate?.confirmRevocation(of: certs) ?? false
|
||||
}
|
||||
|
||||
return try await signer.sign(
|
||||
app: app,
|
||||
status: { @Sendable status in
|
||||
self.queueUpdateTask {
|
||||
$0.updateStageIgnoringCancellation(to: status)
|
||||
}
|
||||
},
|
||||
progress: { progress in
|
||||
self.queueUpdateTask {
|
||||
$0.updateProgressIgnoringCancellation(to: progress)
|
||||
}
|
||||
},
|
||||
didProvision: { @Sendable [self] in
|
||||
// TODO: reintroduce Superconfig
|
||||
_ = self
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -48,9 +48,16 @@ extension AuthToken {
|
||||
private static let decoder = JSONDecoder()
|
||||
|
||||
static func saved() throws -> Self {
|
||||
guard let data = try storage.data(forKey: "XTLAuthToken") else {
|
||||
guard let token = try savedIfPresent() else {
|
||||
throw Console.Error("Please log in with `xtool auth` before running this command.")
|
||||
}
|
||||
return token
|
||||
}
|
||||
|
||||
static func savedIfPresent() throws -> Self? {
|
||||
guard let data = try storage.data(forKey: "XTLAuthToken") else {
|
||||
return nil
|
||||
}
|
||||
return try decoder.decode(AuthToken.self, from: data)
|
||||
}
|
||||
|
||||
@@ -63,7 +70,7 @@ extension AuthToken {
|
||||
try Self.storage.setData(data, forKey: "XTLAuthToken")
|
||||
}
|
||||
|
||||
func authData() throws -> DeveloperAPIAuthData {
|
||||
func authData() -> DeveloperAPIAuthData {
|
||||
switch self {
|
||||
case .appStoreConnect(let data):
|
||||
return .appStoreConnect(.init(id: data.id, issuerID: data.issuerID, pem: data.pem))
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import Foundation
|
||||
import XKit
|
||||
import SystemPackage
|
||||
import XUtils
|
||||
import NIOPosix
|
||||
import NIOCore
|
||||
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
import ArgumentParser
|
||||
import Foundation
|
||||
import XKit
|
||||
import PackLib
|
||||
import Subprocess
|
||||
|
||||
struct DevBSPCommand: AsyncParsableCommand {
|
||||
static let configuration = CommandConfiguration(
|
||||
commandName: "build-server",
|
||||
abstract: "Run build server",
|
||||
)
|
||||
|
||||
@Option
|
||||
var triple: String?
|
||||
|
||||
func run() async throws {
|
||||
let settings = try await BuildSettings(
|
||||
configuration: .debug,
|
||||
triple: triple ?? PackOperation.defaultTriple
|
||||
)
|
||||
try await Subprocess.run(
|
||||
.path(BuildSettings.swiftURL()),
|
||||
arguments: .init(settings.buildServerArguments),
|
||||
input: .standardInput,
|
||||
output: .standardOutput,
|
||||
error: .standardError,
|
||||
)
|
||||
.checkSuccess()
|
||||
}
|
||||
}
|
||||
@@ -23,10 +23,30 @@ struct PackOperation {
|
||||
|
||||
var triple: String?
|
||||
var buildOptions = BuildOptions(configuration: .debug)
|
||||
var extraOptions: [String] = []
|
||||
var watchMode = false
|
||||
var xcode = false
|
||||
|
||||
func buildSettings() async throws -> BuildSettings {
|
||||
try await BuildSettings(
|
||||
configuration: buildOptions.configuration,
|
||||
triple: triple ?? Self.defaultTriple,
|
||||
options: extraOptions + (
|
||||
watchMode
|
||||
? [
|
||||
"-Xlinker", "-interposable",
|
||||
// https://kyleye.top/posts/debugreplaceableview-multiple-type-erasers/
|
||||
"-Xswiftc", "-enable-experimental-feature", "-Xswiftc", "OpaqueTypeErasure",
|
||||
// https://www.guardsquare.com/blog/behind-swiftui-previews
|
||||
"-Xswiftc", "-Xfrontend", "-Xswiftc", "-enable-private-imports",
|
||||
]
|
||||
: []
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
@discardableResult
|
||||
func run() async throws -> URL {
|
||||
func run() async throws -> (Plan, URL) {
|
||||
print("Planning...")
|
||||
|
||||
let schema: PackSchema
|
||||
@@ -41,11 +61,7 @@ struct PackOperation {
|
||||
""")
|
||||
}
|
||||
|
||||
let buildSettings = try await BuildSettings(
|
||||
configuration: buildOptions.configuration,
|
||||
triple: triple ?? Self.defaultTriple,
|
||||
options: []
|
||||
)
|
||||
let buildSettings = try await buildSettings()
|
||||
|
||||
let planner = Planner(
|
||||
buildSettings: buildSettings,
|
||||
@@ -55,7 +71,8 @@ struct PackOperation {
|
||||
|
||||
#if os(macOS)
|
||||
if xcode {
|
||||
return try await XcodePacker(plan: plan).createProject()
|
||||
let url = try await XcodePacker(plan: plan).createProject()
|
||||
return (plan, url)
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -68,28 +85,26 @@ struct PackOperation {
|
||||
let productsWithEntitlements = plan
|
||||
.allProducts
|
||||
.compactMap { p in p.entitlementsPath.map { (p, $0) } }
|
||||
if !productsWithEntitlements.isEmpty {
|
||||
let mapping = try await withThrowingTaskGroup(of: (URL, Entitlements).self) { group in
|
||||
for (product, path) in productsWithEntitlements {
|
||||
group.addTask {
|
||||
let data = try await Data(reading: URL(fileURLWithPath: path))
|
||||
let decoder = PropertyListDecoder()
|
||||
let entitlements = try decoder.decode(Entitlements.self, from: data)
|
||||
return (product.directory(inApp: bundle), entitlements)
|
||||
}
|
||||
let mapping = try await withThrowingTaskGroup(of: (URL, Entitlements?).self) { group in
|
||||
for (product, path) in productsWithEntitlements {
|
||||
group.addTask {
|
||||
let data = try await Data(reading: URL(fileURLWithPath: path))
|
||||
let decoder = PropertyListDecoder()
|
||||
let entitlements = try decoder.decode(Entitlements.self, from: data)
|
||||
return (product.directory(inApp: bundle), entitlements)
|
||||
}
|
||||
return try await group.reduce(into: [:]) { $0[$1.0] = $1.1 }
|
||||
}
|
||||
print("Pseudo-signing...")
|
||||
try await Signer.first().sign(
|
||||
app: bundle,
|
||||
identity: .adhoc,
|
||||
entitlementMapping: mapping,
|
||||
progress: { _ in }
|
||||
)
|
||||
return try await group.reduce(into: [:]) { $0[$1.0] = $1.1 }
|
||||
}
|
||||
print("Applying entitlements...")
|
||||
try await Signer.first().sign(
|
||||
app: bundle,
|
||||
identity: .adhoc,
|
||||
entitlementMapping: mapping,
|
||||
progress: { _ in }
|
||||
)
|
||||
|
||||
return bundle
|
||||
return (plan, bundle)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -117,6 +132,12 @@ struct DevBuildCommand: AsyncParsableCommand {
|
||||
@OptionGroup var packOptions: PackOperation.BuildOptions
|
||||
|
||||
@Flag(
|
||||
name: .shortAndLong,
|
||||
help: "Codesign the built app",
|
||||
) var sign = false
|
||||
|
||||
@Flag(
|
||||
name: .shortAndLong,
|
||||
help: "Output a .ipa file instead of a .app"
|
||||
) var ipa = false
|
||||
|
||||
@@ -128,11 +149,38 @@ struct DevBuildCommand: AsyncParsableCommand {
|
||||
) var triple: String?
|
||||
|
||||
func run() async throws {
|
||||
let url = try await PackOperation(
|
||||
let signingAuthToken: AuthToken?
|
||||
if sign {
|
||||
guard let token = try AuthToken.savedIfPresent() else {
|
||||
throw Console.Error("`build --sign` requires logging in with `xtool auth`")
|
||||
}
|
||||
signingAuthToken = token
|
||||
} else {
|
||||
signingAuthToken = nil
|
||||
}
|
||||
|
||||
let (_, url) = try await PackOperation(
|
||||
triple: triple,
|
||||
buildOptions: packOptions
|
||||
).run()
|
||||
|
||||
if let signingAuthToken {
|
||||
let installDelegate = XToolInstallerDelegate()
|
||||
let installer = IntegratedInstaller(
|
||||
auth: signingAuthToken.authData(),
|
||||
delegate: installDelegate
|
||||
)
|
||||
do {
|
||||
defer { print() }
|
||||
try await installer.signInPlace(app: url)
|
||||
} catch let error as CancellationError {
|
||||
throw error
|
||||
} catch {
|
||||
print("Error: \(error)")
|
||||
throw ExitCode.failure
|
||||
}
|
||||
}
|
||||
|
||||
let finalURL: URL
|
||||
if ipa {
|
||||
@Dependency(\.zipCompressor) var compressor
|
||||
@@ -176,6 +224,13 @@ struct DevRunCommand: AsyncParsableCommand {
|
||||
help: "Target the iOS Simulator"
|
||||
) var simulator = false
|
||||
|
||||
@Flag(
|
||||
name: .shortAndLong,
|
||||
help: "Hot reload files on change. Requires simulator."
|
||||
) var watch = false
|
||||
|
||||
@Option var xloadPath: String?
|
||||
|
||||
var triple: String? {
|
||||
if simulator {
|
||||
#if arch(arm64)
|
||||
@@ -189,17 +244,37 @@ struct DevRunCommand: AsyncParsableCommand {
|
||||
return nil
|
||||
}
|
||||
#else
|
||||
var watch: Bool { false }
|
||||
var triple: String? { nil }
|
||||
#endif
|
||||
|
||||
@OptionGroup var connectionOptions: ConnectionOptions
|
||||
|
||||
func validate() throws {
|
||||
#if os(macOS)
|
||||
if watch && !simulator {
|
||||
throw ValidationError("--watch requires --simulator")
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
func run() async throws {
|
||||
let output = try await PackOperation(triple: triple, buildOptions: packOptions).run()
|
||||
let operation = PackOperation(
|
||||
triple: triple,
|
||||
buildOptions: packOptions,
|
||||
watchMode: watch,
|
||||
)
|
||||
let (plan, output) = try await operation.run()
|
||||
|
||||
#if os(macOS)
|
||||
if simulator {
|
||||
try await SimInstallOperation(path: output).run()
|
||||
try await SimInstallOperation(
|
||||
operation: operation,
|
||||
plan: plan,
|
||||
path: output,
|
||||
watch: watch,
|
||||
xLoadLibrary: xloadPath,
|
||||
).run()
|
||||
return
|
||||
}
|
||||
#endif
|
||||
@@ -211,17 +286,19 @@ struct DevRunCommand: AsyncParsableCommand {
|
||||
|
||||
let installDelegate = XToolInstallerDelegate()
|
||||
let installer = IntegratedInstaller(
|
||||
udid: client.udid,
|
||||
lookupMode: .only(client.connectionType),
|
||||
auth: try token.authData(),
|
||||
configureDevice: false,
|
||||
auth: token.authData(),
|
||||
delegate: installDelegate
|
||||
)
|
||||
|
||||
defer { print() }
|
||||
|
||||
do {
|
||||
try await installer.install(app: output)
|
||||
try await installer.install(
|
||||
app: output,
|
||||
udid: client.udid,
|
||||
lookupMode: .only(client.connectionType),
|
||||
configureDevice: false,
|
||||
)
|
||||
} catch let error as CancellationError {
|
||||
throw error
|
||||
} catch {
|
||||
@@ -239,26 +316,10 @@ struct DevCommand: AsyncParsableCommand {
|
||||
DevXcodeCommand.self,
|
||||
DevBuildCommand.self,
|
||||
DevRunCommand.self,
|
||||
DevBSPCommand.self,
|
||||
],
|
||||
defaultSubcommand: DevRunCommand.self
|
||||
)
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,97 @@
|
||||
import Foundation
|
||||
import ArgumentParser
|
||||
import PackLib
|
||||
import XUtils
|
||||
import Subprocess
|
||||
|
||||
struct HotReloadCommand: AsyncParsableCommand {
|
||||
static let configuration = CommandConfiguration(
|
||||
commandName: "hot-reload",
|
||||
abstract: "Run an app with support for hot reloading",
|
||||
)
|
||||
|
||||
@Flag(
|
||||
help: "Use the SwiftPM build system to determine compile commands"
|
||||
) var swiftpm = false
|
||||
|
||||
@Option(
|
||||
help: .init(
|
||||
"Use the specified Build Server to determine compile commands",
|
||||
discussion: """
|
||||
The file at the specified path should correspond to the BSP \
|
||||
Connection Details specification. See:
|
||||
|
||||
https://build-server-protocol.github.io/docs/overview/server-discovery
|
||||
""",
|
||||
)
|
||||
) var buildServerPath: String?
|
||||
|
||||
@Option(
|
||||
help: "The directory in which to store scratch files"
|
||||
) var scratchDirectory: String?
|
||||
|
||||
@Option(
|
||||
help: "String to prepend to all env var names"
|
||||
) var envPrefix: String = ""
|
||||
|
||||
@Option(
|
||||
help: .hidden
|
||||
) var xloadLibrary: String?
|
||||
|
||||
@Argument(
|
||||
help: .init(
|
||||
"The command to run with hot reloading",
|
||||
discussion: """
|
||||
xtool spawns the provided process with env vars set to enable hot reloading.
|
||||
"""
|
||||
)
|
||||
) var command: [String]
|
||||
|
||||
func run() async throws {
|
||||
let configuration: BuildServerConfiguration
|
||||
switch (swiftpm, buildServerPath) {
|
||||
case (true, _?):
|
||||
throw ValidationError("Both --swiftpm or --build-server-path were provided; please only provide one.")
|
||||
case (true, nil):
|
||||
configuration = try await .swiftPM(settings: BuildSettings(configuration: .debug, triple: "arm64-apple-ios-simulator"))
|
||||
case (false, let serverPath?):
|
||||
configuration = try await .external(definition: URL(filePath: serverPath))
|
||||
case (false, nil):
|
||||
if let discovered = try await BuildServerConfiguration.discover(in: URL(filePath: ".")) {
|
||||
configuration = discovered
|
||||
} else {
|
||||
throw ValidationError("Could not guess build system. Please specify one with --swiftpm or --build-server-path")
|
||||
}
|
||||
}
|
||||
|
||||
let reloader = try await HotReloader(
|
||||
configuration: configuration,
|
||||
scratchDirectory: scratchDirectory.map { FilePath($0) },
|
||||
xLoadLibrary: xloadLibrary
|
||||
)
|
||||
|
||||
let watchTask = Task {
|
||||
do {
|
||||
try await reloader.watch()
|
||||
} catch {
|
||||
print("Error: watcher failed: \(error)")
|
||||
}
|
||||
}
|
||||
|
||||
var arguments = command
|
||||
let executable = arguments.removeFirst()
|
||||
|
||||
try await Subprocess.run(
|
||||
.name(executable),
|
||||
arguments: Arguments(arguments),
|
||||
environment: .inherit.updating(reloader.subprocessEnvironment(prefix: envPrefix)),
|
||||
platformOptions: .withGracefulShutDown,
|
||||
output: .standardOutput,
|
||||
error: .standardError,
|
||||
)
|
||||
.checkSuccess()
|
||||
|
||||
watchTask.cancel()
|
||||
await watchTask.value
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,112 @@
|
||||
#if os(macOS)
|
||||
|
||||
import Subprocess
|
||||
import PackLib
|
||||
import Foundation
|
||||
import XUtils
|
||||
import Dependencies
|
||||
import XKit
|
||||
|
||||
actor HotReloader {
|
||||
var configuration: BuildServerConfiguration
|
||||
var scratchDirectory: FilePath
|
||||
var xLoadLibrary: String?
|
||||
|
||||
private let scratchTemporaryDirectory: TemporaryDirectory?
|
||||
private let xLoadPath: String
|
||||
private let buildDirectory: FilePath
|
||||
private let outDirectory: FilePath
|
||||
|
||||
init(
|
||||
configuration: BuildServerConfiguration,
|
||||
scratchDirectory: FilePath? = nil,
|
||||
xLoadLibrary: String? = nil,
|
||||
) async throws {
|
||||
self.configuration = configuration
|
||||
|
||||
if let scratchDirectory {
|
||||
self.scratchDirectory = FilePath(URL(filePath: scratchDirectory.string).absoluteURL.path)
|
||||
self.scratchTemporaryDirectory = nil
|
||||
} else {
|
||||
let scratchTemporaryDirectory = try TemporaryDirectory(name: "scratch")
|
||||
self.scratchDirectory = FilePath(scratchTemporaryDirectory.url.path)
|
||||
self.scratchTemporaryDirectory = consume scratchTemporaryDirectory
|
||||
}
|
||||
|
||||
self.xLoadLibrary = xLoadLibrary
|
||||
|
||||
xLoadPath = if let xLoadLibrary {
|
||||
URL(filePath: xLoadLibrary).absoluteURL.path
|
||||
} else {
|
||||
try await Self.getXLoad(platform: "iphonesimulator").path
|
||||
}
|
||||
|
||||
buildDirectory = self.scratchDirectory.appending("build")
|
||||
try FileManager.default.createDirectory(at: URL(filePath: buildDirectory)!, withIntermediateDirectories: true)
|
||||
|
||||
outDirectory = self.scratchDirectory.appending("out")
|
||||
try FileManager.default.createDirectory(at: URL(filePath: outDirectory)!, withIntermediateDirectories: true)
|
||||
}
|
||||
|
||||
|
||||
nonisolated func environment(prefix: String = "SIMCTL_CHILD_") -> [String: String] {
|
||||
[
|
||||
"\(prefix)DYLD_INSERT_LIBRARIES": xLoadPath,
|
||||
"\(prefix)XLOAD_WATCH_DIR": outDirectory.string,
|
||||
"\(prefix)XLOAD_INTERCEPT": "1",
|
||||
]
|
||||
}
|
||||
|
||||
nonisolated func subprocessEnvironment(prefix: String = "SIMCTL_CHILD_") -> [Environment.Key: String] {
|
||||
Dictionary(uniqueKeysWithValues: environment(prefix: prefix).map {
|
||||
(Environment.Key(rawValue: $0)!, $1)
|
||||
})
|
||||
}
|
||||
|
||||
func watch() async throws {
|
||||
let workspace = try await SwiftWorkspace(
|
||||
configuration: configuration,
|
||||
buildDirectory: buildDirectory,
|
||||
outDirectory: outDirectory,
|
||||
)
|
||||
|
||||
@Dependency(\.fileSystemMonitor) var fileSystemMonitor
|
||||
let events = try await fileSystemMonitor.watch(FilePath(FileManager.default.currentDirectoryPath))
|
||||
|
||||
for await event in events {
|
||||
do {
|
||||
try await workspace.fileDidChange(event.file)
|
||||
} catch {
|
||||
print("Reload failed: \(error)")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static func getXLoad(platform: String) async throws -> URL {
|
||||
let version = "0.3.0"
|
||||
let remote = URL(string: "https://github.com/xtool-org/xload/releases/download/v\(version)/libXLoad.\(platform).dylib")!
|
||||
|
||||
@Dependency(\.httpClient) var httpClient
|
||||
@Dependency(\.persistentDirectory) var persistentDirectory
|
||||
|
||||
let platformDir = persistentDirectory.appending(path: "xload/\(platform)")
|
||||
let versionDir = platformDir.appending(path: version)
|
||||
let local = versionDir.appending(path: "libXLoad.dylib")
|
||||
if local.exists { return local }
|
||||
|
||||
print("Downloading xload...")
|
||||
|
||||
try? FileManager.default.removeItem(at: platformDir)
|
||||
try FileManager.default.createDirectory(at: versionDir, withIntermediateDirectories: true)
|
||||
|
||||
let data = try await httpClient.makeRequest(HTTPRequest(url: remote))
|
||||
guard data.response.status.kind == .successful else {
|
||||
throw StringError("Failed to download xload: got HTTP \(data.response.status)")
|
||||
}
|
||||
try data.body.write(to: local)
|
||||
|
||||
return local
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -24,15 +24,17 @@ struct InstallCommand: AsyncParsableCommand {
|
||||
|
||||
let installDelegate = XToolInstallerDelegate()
|
||||
let installer = IntegratedInstaller(
|
||||
udid: client.udid,
|
||||
lookupMode: .only(client.connectionType),
|
||||
auth: try token.authData(),
|
||||
configureDevice: false,
|
||||
auth: token.authData(),
|
||||
delegate: installDelegate
|
||||
)
|
||||
|
||||
do {
|
||||
try await installer.install(app: URL(fileURLWithPath: path))
|
||||
try await installer.install(
|
||||
app: URL(fileURLWithPath: path),
|
||||
udid: client.udid,
|
||||
lookupMode: .only(client.connectionType),
|
||||
configureDevice: false,
|
||||
)
|
||||
print("\nSuccessfully installed!")
|
||||
} catch let error as CancellationError {
|
||||
throw error
|
||||
|
||||
@@ -2,6 +2,8 @@ import Foundation
|
||||
import XKit
|
||||
import Dependencies
|
||||
import PackLib
|
||||
import Subprocess
|
||||
import XUtils
|
||||
|
||||
extension ZIPCompressor: DependencyKey {
|
||||
// TODO: Use `powershell Compress-Archive` and `powershell Expand-Archive` on Windows
|
||||
@@ -12,20 +14,23 @@ extension ZIPCompressor: DependencyKey {
|
||||
|
||||
let dest = dir.deletingLastPathComponent().appendingPathComponent("app.ipa")
|
||||
|
||||
let zip = Process()
|
||||
zip.executableURL = try await ToolRegistry.locate("zip")
|
||||
zip.currentDirectoryURL = dir.deletingLastPathComponent()
|
||||
zip.arguments = ["-yqru0", dest.path, dir.lastPathComponent]
|
||||
try await zip.runUntilExit()
|
||||
try await Subprocess.run(
|
||||
.name("zip"),
|
||||
arguments: ["-yqru0", dest.path, dir.lastPathComponent],
|
||||
workingDirectory: FilePath(dir.deletingLastPathComponent()),
|
||||
output: .discarded,
|
||||
).checkSuccess()
|
||||
|
||||
return dest
|
||||
},
|
||||
decompress: { ipa, directory, progress in
|
||||
progress(nil)
|
||||
let unzip = Process()
|
||||
unzip.executableURL = try await ToolRegistry.locate("unzip")
|
||||
unzip.arguments = ["-q", ipa.path, "-d", directory.path]
|
||||
try await unzip.runUntilExit()
|
||||
|
||||
try await Subprocess.run(
|
||||
.name("unzip"),
|
||||
arguments: ["-q", ipa.path, "-d", directory.path],
|
||||
output: .discarded,
|
||||
).checkSuccess()
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import Foundation
|
||||
import Dependencies
|
||||
import SystemPackage
|
||||
import libunxip
|
||||
import Subprocess
|
||||
import XKit // HTTPClient, stdoutSafe
|
||||
import PackLib // ToolRegistry
|
||||
import XUtils // System.File{Path,Descriptor}
|
||||
|
||||
struct SDKBuilder {
|
||||
enum Arch: String {
|
||||
@@ -18,7 +18,10 @@ struct SDKBuilder {
|
||||
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)'")
|
||||
throw Console.Error("""
|
||||
Could not read file or directory at path '\(path)'.
|
||||
See 'xtool help sdk' for usage.
|
||||
""")
|
||||
}
|
||||
|
||||
let url = URL(fileURLWithPath: path)
|
||||
@@ -50,17 +53,14 @@ struct SDKBuilder {
|
||||
}
|
||||
|
||||
let input: Input
|
||||
let outputPath: String
|
||||
let output: URL
|
||||
let arch: Arch
|
||||
|
||||
@discardableResult
|
||||
func buildSDK() async throws -> String {
|
||||
// swiftlint:disable:next function_body_length
|
||||
func buildSDK() async throws {
|
||||
// TODO: store relevant info for staleness check
|
||||
let sdkVersion = "develop"
|
||||
|
||||
let output = URL(fileURLWithPath: outputPath, isDirectory: true)
|
||||
.appendingPathComponent("darwin.artifactbundle")
|
||||
|
||||
try? FileManager.default.removeItem(at: output)
|
||||
try FileManager.default.createDirectory(
|
||||
at: output,
|
||||
@@ -137,6 +137,9 @@ struct SDKBuilder {
|
||||
"linker": {
|
||||
"path": "ld64.lld"
|
||||
},
|
||||
"librarian": {
|
||||
"path": "llvm-lib"
|
||||
},
|
||||
"swiftCompiler": {
|
||||
"extraCLIOptions": [
|
||||
"-Xfrontend", "-enable-cross-import-overlays",
|
||||
@@ -150,6 +153,26 @@ struct SDKBuilder {
|
||||
encoding: .utf8
|
||||
)
|
||||
|
||||
// this toolset works with the swiftbuild system on Linux
|
||||
// note that we need Swift 6.4+ because 6.3 has bugs in
|
||||
// resolving the librarian and linker paths.
|
||||
try """
|
||||
{
|
||||
"schemaVersion": "1.0",
|
||||
"rootPath": "toolset/bin",
|
||||
"linker": {
|
||||
"path": "ld"
|
||||
},
|
||||
"librarian": {
|
||||
"path": "llvm-lib"
|
||||
}
|
||||
}
|
||||
""".write(
|
||||
to: output.appendingPathComponent("toolset-swb.json"),
|
||||
atomically: false,
|
||||
encoding: .utf8
|
||||
)
|
||||
|
||||
let sdkDefinition = SDKDefinition(
|
||||
schemaVersion: "4.0",
|
||||
targetTriples: [
|
||||
@@ -168,8 +191,6 @@ struct SDKBuilder {
|
||||
|
||||
try Data("\(sdkVersion)\n".utf8)
|
||||
.write(to: output.appendingPathComponent("darwin-sdk-version.txt"))
|
||||
|
||||
return output.path
|
||||
}
|
||||
|
||||
private func installToolset(in output: URL) async throws {
|
||||
@@ -183,14 +204,6 @@ struct SDKBuilder {
|
||||
withIntermediateDirectories: false
|
||||
)
|
||||
|
||||
let pipe = Pipe()
|
||||
let untar = Process()
|
||||
untar.currentDirectoryURL = toolsetDir
|
||||
untar.executableURL = try await ToolRegistry.locate("tar")
|
||||
untar.arguments = ["xzf", "-"]
|
||||
untar.standardInput = pipe.fileHandleForReading
|
||||
async let tarExit: Void = untar.runUntilExit()
|
||||
|
||||
@Dependency(\.httpClient) var httpClient
|
||||
let url = URL(string: """
|
||||
https://github.com/xtool-org/darwin-tools-linux-llvm/releases/download/\
|
||||
@@ -202,22 +215,40 @@ struct SDKBuilder {
|
||||
case .known(let known): known
|
||||
case .unknown: nil
|
||||
}
|
||||
let writer = pipe.fileHandleForWriting
|
||||
var written: Int64 = 0
|
||||
do {
|
||||
defer { try? writer.close() }
|
||||
|
||||
defer { print() }
|
||||
try await Subprocess.run(
|
||||
.name("tar"),
|
||||
arguments: ["xzf", "-"],
|
||||
workingDirectory: FilePath(toolsetDir),
|
||||
) { _, input, _ in
|
||||
var totalWritten: Int64 = 0
|
||||
for try await chunk in body {
|
||||
try writer.write(contentsOf: chunk)
|
||||
written += Int64(chunk.count)
|
||||
if let length {
|
||||
let progress = Int(Double(written) / Double(length) * 100)
|
||||
var remaining = chunk
|
||||
while !remaining.isEmpty {
|
||||
let written = try await input.write(Array(remaining))
|
||||
remaining = remaining.dropFirst(written)
|
||||
totalWritten += Int64(written)
|
||||
|
||||
guard let length else { continue }
|
||||
let progress = Int(Double(totalWritten) / Double(length) * 100)
|
||||
print("\r[Downloading toolset] \(progress)%", terminator: "")
|
||||
fflush(stdoutSafe)
|
||||
}
|
||||
}
|
||||
try await input.finish()
|
||||
}
|
||||
print()
|
||||
try await tarExit
|
||||
.checkSuccess()
|
||||
|
||||
// swift-build assumes we have an Apple-flavored librarian for Apple platforms
|
||||
// (https://github.com/swiftlang/swift-build/blob/b2433e74e/Sources/SWBCore/SpecImplementations/Tools/LinkerTools.swift#L1735)
|
||||
// but allows us to override this assumption if we explicitly provide the name llvm-lib (look a few lines above in that file)
|
||||
try FileManager.default.moveItem(
|
||||
at: toolsetDir.appending(path: "bin/libtool"),
|
||||
to: toolsetDir.appending(path: "bin/llvm-lib")
|
||||
)
|
||||
|
||||
// TODO: install cctools ld as well
|
||||
}
|
||||
|
||||
// swiftlint:disable:next cyclomatic_complexity
|
||||
@@ -324,10 +355,11 @@ struct SDKBuilder {
|
||||
|
||||
for platform in ["iPhoneOS", "MacOSX", "iPhoneSimulator"] {
|
||||
let lib = "../../../../../Library"
|
||||
let dest = dev.appendingPathComponent("""
|
||||
Platforms/\(platform).platform/Developer/SDKs/\(platform).sdk\
|
||||
/System/Library/Frameworks
|
||||
""").path
|
||||
let platformDir = dev.appending(path: "Platforms/\(platform).platform")
|
||||
|
||||
try patchPlatformManifest(path: platformDir.appending(path: "Info.plist"))
|
||||
|
||||
let dest = platformDir.appending(path: "Developer/SDKs/\(platform).sdk/System/Library/Frameworks").path
|
||||
|
||||
try FileManager.default.createSymbolicLink(
|
||||
atPath: "\(dest)/Testing.framework",
|
||||
@@ -350,9 +382,28 @@ struct SDKBuilder {
|
||||
)
|
||||
}
|
||||
|
||||
try FileManager.default.removeItem(
|
||||
at: dev.appending(path: "Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/clang/include")
|
||||
)
|
||||
|
||||
return dev
|
||||
}
|
||||
|
||||
private func patchPlatformManifest(path: URL) throws {
|
||||
let data = try Data(contentsOf: path)
|
||||
guard var plist = try PropertyListSerialization.propertyList(from: data, options: [], format: nil) as? [String: Any] else {
|
||||
throw Console.Error("Could not read '\(path.path)'")
|
||||
}
|
||||
|
||||
var defaultProperties = (plist["DefaultProperties"] as? [String: Any]) ?? [:]
|
||||
defaultProperties["SWIFT_RESOURCE_DIR"] = "$(PLATFORM_DIR)/../../Toolchains/XcodeDefault.xctoolchain/usr/lib/swift"
|
||||
defaultProperties["CLANG_RESOURCE_DIR"] = "$(SWIFT_RESOURCE_DIR)/clang"
|
||||
plist["DefaultProperties"] = defaultProperties
|
||||
|
||||
let newData = try PropertyListSerialization.data(fromPropertyList: plist, format: .xml, options: 0)
|
||||
try newData.write(to: path)
|
||||
}
|
||||
|
||||
// returns the number of files we actually want to keep,
|
||||
// useful for computing progress % during fs traversal
|
||||
private func extractXIP(inputPath: String, outDir: String) async throws -> Int {
|
||||
@@ -496,13 +547,16 @@ struct SDKEntry {
|
||||
E("clang"),
|
||||
]),
|
||||
E("Platforms", ["iPhoneOS", "MacOSX", "iPhoneSimulator"].map {
|
||||
E("\($0).platform/Developer", [
|
||||
E("SDKs"),
|
||||
E("Library", [
|
||||
E("Frameworks"),
|
||||
E("PrivateFrameworks"),
|
||||
]),
|
||||
E("usr/lib"),
|
||||
E("\($0).platform", [
|
||||
E("Info.plist"),
|
||||
E("Developer", [
|
||||
E("SDKs"),
|
||||
E("Library", [
|
||||
E("Frameworks"),
|
||||
E("PrivateFrameworks"),
|
||||
]),
|
||||
E("usr/lib"),
|
||||
])
|
||||
])
|
||||
}),
|
||||
])
|
||||
|
||||
@@ -5,6 +5,7 @@ import ArgumentParser
|
||||
import Dependencies
|
||||
import PackLib
|
||||
import XUtils
|
||||
import Subprocess
|
||||
|
||||
struct SDKCommand: AsyncParsableCommand {
|
||||
static let configuration = CommandConfiguration(
|
||||
@@ -47,9 +48,10 @@ struct DevSDKBuildCommand: AsyncParsableCommand {
|
||||
func run() async throws {
|
||||
let builderArch = try arch.sdkBuilderArch
|
||||
let input = try SDKBuilder.Input(path: path)
|
||||
let builder = SDKBuilder(input: input, outputPath: outputDir, arch: builderArch)
|
||||
let sdkPath = try await builder.buildSDK()
|
||||
print("Built SDK at \(sdkPath)")
|
||||
let output = URL(fileURLWithPath: outputDir, isDirectory: true).appending(path: "darwin.xtoolsdk")
|
||||
let builder = SDKBuilder(input: input, output: output, arch: builderArch)
|
||||
try await builder.buildSDK()
|
||||
print("Built SDK at \(output.path). You can install it with `xtool sdk install`.")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -83,8 +85,8 @@ struct DevSDKInstallCommand: AsyncParsableCommand {
|
||||
)
|
||||
|
||||
@Argument(
|
||||
help: "Path to Xcode.xip or Xcode.app",
|
||||
completion: .file(extensions: ["xip", "app"])
|
||||
help: "Path to Xcode.xip, Xcode.app, or darwin.xtoolsdk",
|
||||
completion: .file(extensions: ["xip", "app", "xtoolsdk"])
|
||||
)
|
||||
var path: String
|
||||
|
||||
@@ -123,101 +125,22 @@ struct DevSDKStatusCommand: AsyncParsableCommand {
|
||||
}
|
||||
}
|
||||
|
||||
struct DarwinSDK {
|
||||
let bundle: URL
|
||||
let version: String
|
||||
|
||||
init?(bundle: URL) {
|
||||
self.bundle = bundle
|
||||
if let version = try? Data(contentsOf: bundle.appendingPathComponent("darwin-sdk-version.txt")) {
|
||||
self.version = String(decoding: version, as: UTF8.self)
|
||||
.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
} else if bundle.lastPathComponent == "darwin.artifactbundle" {
|
||||
self.version = "unknown"
|
||||
} else {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
static func install(from path: String) async throws {
|
||||
// we can't just move into ~/.swiftpm/swift-sdks because the swiftpm directory
|
||||
// location depends on factors like $XDG_CONFIG_HOME. Rather than replicating
|
||||
// SwiftPM's logic, which may change, it's more reliable to directly invoke
|
||||
// `swift sdk install`. See: https://github.com/xtool-org/xtool/pull/40
|
||||
|
||||
let url = URL(fileURLWithPath: path)
|
||||
guard DarwinSDK(bundle: url) != nil else { throw Console.Error("Invalid Darwin SDK at '\(path)'")}
|
||||
|
||||
let process = Process()
|
||||
process.executableURL = try await ToolRegistry.locate("swift")
|
||||
process.arguments = ["sdk", "install", url.path]
|
||||
try await process.runUntilExit()
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
// should be something like
|
||||
// swiftResourcesPath: /home/user/.swiftpm/swift-sdks/darwin.artifactbundle/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift
|
||||
// swiftlint:disable:previous line_length
|
||||
let resourcesPathPrefix = "swiftResourcesPath: "
|
||||
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 {
|
||||
true
|
||||
}
|
||||
|
||||
func remove() throws {
|
||||
try FileManager.default.removeItem(at: bundle)
|
||||
}
|
||||
}
|
||||
|
||||
private enum SwiftVersion {}
|
||||
extension SwiftVersion {
|
||||
static func current() async throws -> Version {
|
||||
let outPipe = Pipe()
|
||||
let errPipe = Pipe()
|
||||
let swift = Process()
|
||||
swift.executableURL = try await ToolRegistry.locate("swift")
|
||||
swift.arguments = ["--version"]
|
||||
swift.standardOutput = outPipe
|
||||
swift.standardError = errPipe
|
||||
async let outputTask = outPipe.fileHandleForReading.readToEnd()
|
||||
let outputString: String?
|
||||
do {
|
||||
try await swift.runUntilExit()
|
||||
} catch is Process.Failure {
|
||||
outputString = try await Subprocess.run(
|
||||
.name("swift"),
|
||||
arguments: ["--version"],
|
||||
output: .string(limit: .max)
|
||||
)
|
||||
.checkSuccess()
|
||||
.standardOutput
|
||||
} catch {
|
||||
throw Console.Error("Failed to obtain Swift version")
|
||||
}
|
||||
let outputData = try await outputTask
|
||||
var output = String(decoding: outputData ?? Data(), as: UTF8.self)[...]
|
||||
var output = outputString?[...] ?? ""
|
||||
if output.hasPrefix("Apple ") {
|
||||
output = output.dropFirst("Apple ".count)
|
||||
}
|
||||
@@ -243,19 +166,28 @@ struct InstallSDKOperation {
|
||||
#if os(macOS)
|
||||
print("Skipping SDK install; the iOS SDK ships with Xcode on macOS")
|
||||
#else
|
||||
|
||||
let tempDir = try TemporaryDirectory(name: "DarwinSDKBuild")
|
||||
let sdkPath = tempDir.url.appending(path: "darwin.artifactbundle")
|
||||
|
||||
if path.hasSuffix(".xtoolsdk") {
|
||||
print("Installing prebuilt SDK...")
|
||||
try FileManager.default.copyItem(at: URL(filePath: path), to: sdkPath)
|
||||
} else {
|
||||
// validate input before removing existing SDK
|
||||
let input = try SDKBuilder.Input(path: path)
|
||||
let arch = try ArchSelection.auto.sdkBuilderArch
|
||||
|
||||
let builder = SDKBuilder(input: input, output: sdkPath, arch: arch)
|
||||
try await builder.buildSDK()
|
||||
}
|
||||
|
||||
if let sdk = try await DarwinSDK.current() {
|
||||
print("Removing existing SDK...")
|
||||
try sdk.remove()
|
||||
}
|
||||
|
||||
let input = try SDKBuilder.Input(path: path)
|
||||
let arch = try ArchSelection.auto.sdkBuilderArch
|
||||
|
||||
let tempDir = try TemporaryDirectory(name: "DarwinSDKBuild")
|
||||
let builder = SDKBuilder(input: input, outputPath: tempDir.url.path, arch: arch)
|
||||
let sdkPath = try await builder.buildSDK()
|
||||
|
||||
try await DarwinSDK.install(from: sdkPath)
|
||||
try await DarwinSDK.install(from: sdkPath.path)
|
||||
|
||||
// don't destroy tempDir before this point
|
||||
withExtendedLifetime(tempDir) {}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import ArgumentParser
|
||||
import Foundation
|
||||
import XKit
|
||||
import PackLib
|
||||
|
||||
struct SetupCommand: AsyncParsableCommand {
|
||||
static let configuration = CommandConfiguration(
|
||||
|
||||
@@ -0,0 +1,81 @@
|
||||
#if os(macOS)
|
||||
import Subprocess
|
||||
import PackLib
|
||||
import Foundation
|
||||
import XUtils
|
||||
import Dependencies
|
||||
import XKit
|
||||
|
||||
struct SimInstallOperation {
|
||||
var operation: PackOperation
|
||||
var plan: Plan
|
||||
var path: URL
|
||||
|
||||
var watch = false
|
||||
var xLoadLibrary: String?
|
||||
|
||||
// TODO: allow customizing this
|
||||
var simulator = "booted"
|
||||
|
||||
func run() async throws {
|
||||
try await Subprocess.run(
|
||||
.path("/usr/bin/xcrun"),
|
||||
arguments: ["simctl", "install", simulator, path.path],
|
||||
output: .discarded
|
||||
)
|
||||
.checkSuccess()
|
||||
|
||||
print("Installed to simulator")
|
||||
|
||||
let tmp = URL(filePath: FileManager.default.currentDirectoryPath)
|
||||
.appending(path: "xtool/.xload")
|
||||
try? FileManager.default.removeItem(at: tmp)
|
||||
defer { try? FileManager.default.removeItem(at: tmp) }
|
||||
|
||||
let watchTask: Task<Void, Error>?
|
||||
let envVars: [Environment.Key: String?]
|
||||
if watch {
|
||||
try FileManager.default.createDirectory(at: tmp, withIntermediateDirectories: true)
|
||||
guard let temporaryDirectoryPath = FilePath(tmp) else {
|
||||
throw Console.Error("Bad temporaryDirectory path")
|
||||
}
|
||||
|
||||
let hotReloader = try await HotReloader(
|
||||
configuration: .swiftPM(settings: operation.buildSettings()),
|
||||
scratchDirectory: temporaryDirectoryPath,
|
||||
xLoadLibrary: xLoadLibrary
|
||||
)
|
||||
|
||||
watchTask = Task {
|
||||
do {
|
||||
try await hotReloader.watch()
|
||||
} catch {
|
||||
print("Error: watch task failed: \(error)")
|
||||
}
|
||||
}
|
||||
|
||||
envVars = hotReloader.subprocessEnvironment()
|
||||
} else {
|
||||
watchTask = nil
|
||||
envVars = [:]
|
||||
}
|
||||
|
||||
try await Subprocess.run(
|
||||
.path("/usr/bin/xcrun"),
|
||||
arguments: [
|
||||
"simctl", "launch",
|
||||
"--console-pty",
|
||||
simulator, plan.app.bundleID,
|
||||
],
|
||||
environment: .inherit.updating(envVars),
|
||||
platformOptions: .withGracefulShutDown,
|
||||
output: .standardOutput,
|
||||
error: .standardError,
|
||||
)
|
||||
.checkSuccess()
|
||||
|
||||
watchTask?.cancel()
|
||||
try await watchTask?.value
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@@ -0,0 +1,397 @@
|
||||
import Foundation
|
||||
import XUtils
|
||||
import PackLib
|
||||
import BuildServerProtocol
|
||||
import LanguageServerProtocol
|
||||
import LanguageServerProtocolTransport
|
||||
import Subprocess
|
||||
import Dependencies
|
||||
|
||||
actor SwiftWorkspace {
|
||||
private let connection: JSONRPCConnection
|
||||
private let buildDirectory: FilePath
|
||||
private let outDirectory: FilePath
|
||||
private var counter = 0
|
||||
|
||||
struct FileInfo {
|
||||
let file: FilePath
|
||||
let target: BuildTarget
|
||||
let sources: SourcesItem
|
||||
let source: SourceItem
|
||||
|
||||
init?(target: BuildTarget, sources: SourcesItem, source: SourceItem) {
|
||||
guard let path = FilePath(source.uri.arbitrarySchemeURL) else { return nil }
|
||||
self.file = path
|
||||
self.target = target
|
||||
self.sources = sources
|
||||
self.source = source
|
||||
}
|
||||
}
|
||||
|
||||
private var filesToWatch: [FilePath: [FileInfo]] = [:]
|
||||
private var sources: [(BuildTarget, SourcesItem)] {
|
||||
didSet { updateFilesToWatch() }
|
||||
}
|
||||
private var cachedCommands: [FilePath: FrontendCommand] = [:]
|
||||
|
||||
struct FrontendCommand {
|
||||
let commandLine: CommandInvocation
|
||||
let output: FilePath
|
||||
let module: String
|
||||
}
|
||||
|
||||
init(
|
||||
configuration: BuildServerConfiguration,
|
||||
buildDirectory: FilePath,
|
||||
outDirectory: FilePath,
|
||||
) async throws {
|
||||
self.buildDirectory = buildDirectory
|
||||
self.outDirectory = outDirectory
|
||||
|
||||
let handler = StreamingMessageHandler()
|
||||
|
||||
let (connection, _) = try JSONRPCConnection.start(
|
||||
executable: configuration.executable,
|
||||
arguments: configuration.arguments,
|
||||
name: "xtool",
|
||||
protocol: .bspProtocol,
|
||||
stderrLoggingCategory: "xtool-error",
|
||||
client: handler,
|
||||
terminationHandler: { print("Terminated: \($0)") }
|
||||
)
|
||||
self.connection = connection
|
||||
|
||||
_ = try await connection.send(InitializeBuildRequest(
|
||||
displayName: "xtool",
|
||||
version: "1.0.0",
|
||||
bspVersion: "2.2.0",
|
||||
rootUri: .init(URL(filePath: FileManager.default.currentDirectoryPath)),
|
||||
capabilities: BuildClientCapabilities(
|
||||
languageIds: [.swift, .c, .cpp, .objective_c, .objective_cpp],
|
||||
)
|
||||
))
|
||||
|
||||
connection.send(OnBuildInitializedNotification())
|
||||
|
||||
// some BSP servers (eg SourceKit-Bazel-BSP) require an initial build targets request
|
||||
// before they send OnBuildTargetDidChange
|
||||
_ = try await connection.send(WorkspaceBuildTargetsRequest())
|
||||
|
||||
for await case _ as OnBuildTargetDidChangeNotification in handler.notifications { break }
|
||||
|
||||
let result = try await connection.send(WorkspaceBuildTargetsRequest())
|
||||
|
||||
let targets = Dictionary(uniqueKeysWithValues: result.targets.map { ($0.id, $0) })
|
||||
|
||||
let targetInfos = try await connection.send(BuildTargetSourcesRequest(
|
||||
targets: result.targets.map(\.id)
|
||||
))
|
||||
sources = targetInfos.items.compactMap {
|
||||
guard let target = targets[$0.target] else { return nil }
|
||||
return (target, $0)
|
||||
}
|
||||
|
||||
updateFilesToWatch()
|
||||
}
|
||||
|
||||
deinit {
|
||||
connection.close()
|
||||
}
|
||||
|
||||
func updateFilesToWatch() {
|
||||
filesToWatch = Dictionary(
|
||||
grouping: sources.flatMap { target, sources in
|
||||
sources.sources.compactMap { source in
|
||||
// guard !target.id.uri.stringValue.contains("&targetGUID=PACKAGE-TARGET:") else { return nil }
|
||||
FileInfo(target: target, sources: sources, source: source)
|
||||
}
|
||||
},
|
||||
by: \.file
|
||||
)
|
||||
}
|
||||
|
||||
func fileDidChange(_ path: FilePath) async throws {
|
||||
guard filesToWatch[path] != nil else { return }
|
||||
print("Reloading \(path)")
|
||||
_ = try await rebuild(path: path)
|
||||
}
|
||||
|
||||
@discardableResult
|
||||
func rebuild(path: FilePath) async throws -> FilePath {
|
||||
let command = try await frontendCommand(for: path)
|
||||
|
||||
try await Subprocess.run(
|
||||
.path(FilePath(String(command.commandLine.command))),
|
||||
arguments: .init(command.commandLine.arguments.map { String($0) }),
|
||||
output: .standardOutput,
|
||||
error: .standardError,
|
||||
)
|
||||
.checkSuccess()
|
||||
|
||||
let sdk = try command.commandLine.value(for: "-sdk")
|
||||
.orThrow(Console.Error("Could not find -sdk"))
|
||||
|
||||
let target = try command.commandLine.value(for: "-target")
|
||||
.orThrow(Console.Error("Could not find -target"))
|
||||
|
||||
counter += 1
|
||||
|
||||
let outputFile = outDirectory
|
||||
.appending("lib\(path.lastComponent!.stem).\(counter).dylib")
|
||||
|
||||
// link
|
||||
try await Subprocess.run(
|
||||
.path(try await BuildSettings.swiftcURL()),
|
||||
arguments: [
|
||||
command.output.string,
|
||||
"-emit-library",
|
||||
"-sdk", sdk, "-target", target,
|
||||
"-Xlinker", "-undefined", "-Xlinker", "dynamic_lookup",
|
||||
"-o", outputFile.string
|
||||
],
|
||||
output: .standardOutput,
|
||||
error: .standardError,
|
||||
)
|
||||
.checkSuccess()
|
||||
|
||||
return outputFile
|
||||
}
|
||||
|
||||
func frontendCommand(for path: FilePath) async throws -> FrontendCommand {
|
||||
if let cached = cachedCommands[path] {
|
||||
return cached
|
||||
}
|
||||
|
||||
let targets = filesToWatch[path] ?? []
|
||||
|
||||
let target: FileInfo
|
||||
switch targets.count {
|
||||
case 0:
|
||||
throw Console.Error("No targets for file")
|
||||
case 1:
|
||||
target = targets[0]
|
||||
default:
|
||||
print("warning: multiple targets contain this file: \(targets.map(\.target.id.uri))")
|
||||
target = targets[0]
|
||||
}
|
||||
|
||||
guard let fileURL = URL(filePath: path)?.absoluteURL, let lastComponent = path.lastComponent else {
|
||||
throw Console.Error("Bad file path \(path.string)")
|
||||
}
|
||||
|
||||
let options = try await connection.send(TextDocumentSourceKitOptionsRequest(
|
||||
textDocument: .init(target.source.uri),
|
||||
target: target.target.id,
|
||||
language: .swift,
|
||||
))
|
||||
.orThrow(Console.Error("No options"))
|
||||
|
||||
guard let moduleNameIndex = options.compilerArguments.firstIndex(of: "-module-name"),
|
||||
moduleNameIndex < options.compilerArguments.count - 2 else {
|
||||
throw Console.Error("Could not determine module name for file at \(path)")
|
||||
}
|
||||
let moduleName = options.compilerArguments[moduleNameIndex + 1]
|
||||
let moduleBuildDirectory = buildDirectory.appending(moduleName)
|
||||
let moduleBuildDirectoryURL = try URL(filePath: moduleBuildDirectory).orThrow(Console.Error("Bad module name"))
|
||||
try? FileManager.default.createDirectory(at: moduleBuildDirectoryURL, withIntermediateDirectories: true)
|
||||
|
||||
let swiftcOutput = try await Subprocess.run(
|
||||
.path(try await BuildSettings.swiftcURL()),
|
||||
arguments: .init(
|
||||
["-c", "-driver-print-jobs"]
|
||||
+ options.compilerArguments
|
||||
+ ["-working-directory", moduleBuildDirectory.string]
|
||||
),
|
||||
output: .string(limit: .max),
|
||||
error: .standardError
|
||||
).checkSuccess()
|
||||
|
||||
let frontendCommands = (swiftcOutput.standardOutput ?? "").split(separator: "\n")
|
||||
guard let invocation = frontendCommands.lazy.compactMap({ line -> CommandInvocation? in
|
||||
guard let invocation = CommandInvocation(line) else { return nil }
|
||||
guard invocation.value(for: "-primary-file") == fileURL.path else { return nil }
|
||||
return invocation
|
||||
}).first else { throw Console.Error("Could not find frontend command") }
|
||||
|
||||
let command = FrontendCommand(
|
||||
commandLine: invocation,
|
||||
output: moduleBuildDirectory.appending("\(lastComponent.stem).o"),
|
||||
module: moduleName,
|
||||
)
|
||||
cachedCommands[path] = command
|
||||
return command
|
||||
}
|
||||
|
||||
private final class StreamingMessageHandler: MessageHandler {
|
||||
private let (_notifications, onNotification) = AsyncStream<NotificationType>.makeStream()
|
||||
|
||||
var notifications: AsyncStream<NotificationType> { _notifications }
|
||||
|
||||
deinit { onNotification.finish() }
|
||||
|
||||
func handle(_ notification: some NotificationType) {
|
||||
onNotification.yield(notification)
|
||||
}
|
||||
|
||||
func handle<Request: RequestType>(
|
||||
_ request: Request,
|
||||
id: LanguageServerProtocol.RequestID,
|
||||
reply: @escaping @Sendable (LanguageServerProtocol.LSPResult<Request.Response>) -> Void
|
||||
) {
|
||||
fatalError("Can't handle request \(Request.method)")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// https://github.com/swiftlang/sourcekit-lsp/blob/3278ca0e3/Sources/BuildServerIntegration/ExternalBuildServerAdapter.swift#L66
|
||||
struct BuildServerConfiguration {
|
||||
var executable: URL
|
||||
var arguments: [String]
|
||||
}
|
||||
|
||||
// https://build-server-protocol.github.io/docs/overview/server-discovery#the-bsp-connection-details
|
||||
struct BuildServerDefinition: Codable {
|
||||
var name: String
|
||||
var version: String
|
||||
var bspVersion: String
|
||||
var languages: [String]
|
||||
var argv: [String]
|
||||
}
|
||||
|
||||
extension BuildServerConfiguration {
|
||||
static func swiftPM(settings: BuildSettings) async throws -> Self {
|
||||
guard let swiftURL = URL(filePath: try await BuildSettings.swiftURL()) else {
|
||||
throw Console.Error("Swift URL invalid")
|
||||
}
|
||||
return BuildServerConfiguration(
|
||||
executable: swiftURL,
|
||||
arguments: settings.buildServerArguments
|
||||
)
|
||||
}
|
||||
|
||||
static func swiftPM(in url: URL) async throws -> Self? {
|
||||
if url.appending(path: "Package.swift").exists {
|
||||
return try await .swiftPM(settings: .init(configuration: .debug, triple: "arm64-apple-ios-simulator"))
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
static func external(definition: BuildServerDefinition) async throws -> Self {
|
||||
guard !definition.argv.isEmpty else {
|
||||
throw Console.Error("BSP argv must be non-empty")
|
||||
}
|
||||
var arguments = definition.argv
|
||||
let executable = URL(filePath: arguments.removeFirst())
|
||||
return BuildServerConfiguration(
|
||||
executable: executable,
|
||||
arguments: arguments
|
||||
)
|
||||
}
|
||||
|
||||
static func external(definition url: URL) async throws -> Self {
|
||||
let data = try Data(contentsOf: url)
|
||||
let definition = try JSONDecoder().decode(BuildServerDefinition.self, from: data)
|
||||
return try await .external(definition: definition)
|
||||
}
|
||||
|
||||
static func external(in directory: URL) async throws -> Self? {
|
||||
let bsp = directory.appending(path: ".bsp")
|
||||
let bspContents = (try? FileManager.default.contentsOfDirectory(at: bsp, includingPropertiesForKeys: nil)) ?? []
|
||||
let bspFiles = bspContents.filter { $0.pathExtension == "json" }
|
||||
switch bspFiles.count {
|
||||
case 0:
|
||||
return nil
|
||||
case 1:
|
||||
return try await .external(definition: bspFiles[0])
|
||||
default:
|
||||
throw Console.Error("""
|
||||
Found multiple Build Server definitions in '\(bsp.absoluteURL.path)'.
|
||||
|
||||
Please explicitly specify the one you want to use.
|
||||
""")
|
||||
}
|
||||
}
|
||||
|
||||
static func discover(in directory: URL) async throws -> Self? {
|
||||
if let external = try await external(in: directory) {
|
||||
return external
|
||||
}
|
||||
|
||||
if let swiftPM = try await swiftPM(in: directory) {
|
||||
return swiftPM
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
struct CommandInvocation {
|
||||
var command: String
|
||||
var arguments: [String]
|
||||
|
||||
init?(_ string: some StringProtocol) {
|
||||
guard let all = try? CommandParser.parse(string), !all.isEmpty else { return nil }
|
||||
command = all[0]
|
||||
arguments = Array(all.dropFirst())
|
||||
}
|
||||
|
||||
func value(for option: some StringProtocol) -> String? {
|
||||
guard let optionIndex = arguments.firstIndex(where: { $0 == option }) else { return nil }
|
||||
guard optionIndex < arguments.count - 2 else { return nil }
|
||||
return arguments[optionIndex + 1]
|
||||
}
|
||||
}
|
||||
|
||||
enum CommandParser {
|
||||
enum Errors: Error, Hashable {
|
||||
case unclosedQuote
|
||||
case unpairedEscape
|
||||
}
|
||||
|
||||
static func parse(_ string: some StringProtocol) throws -> [String] {
|
||||
try sequence(
|
||||
state: (
|
||||
current: string[...],
|
||||
isInsideQuote: false,
|
||||
)
|
||||
) { state -> Token? in
|
||||
while !state.current.isEmpty {
|
||||
switch state.current.removeFirst() {
|
||||
case "'":
|
||||
state.isInsideQuote.toggle()
|
||||
case "\\" where !state.isInsideQuote:
|
||||
guard !state.current.isEmpty else { return .error(.unpairedEscape) }
|
||||
let actual = state.current.removeFirst()
|
||||
return .value(actual)
|
||||
case " " where !state.isInsideQuote:
|
||||
return .sentinelSpace
|
||||
case let value:
|
||||
return .value(value)
|
||||
}
|
||||
}
|
||||
guard !state.isInsideQuote else {
|
||||
state.isInsideQuote = false
|
||||
return .error(.unclosedQuote)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
.lazy
|
||||
.split(separator: .sentinelSpace)
|
||||
.map {
|
||||
let characters = try $0.compactMap { token -> Character? in
|
||||
switch token {
|
||||
case .sentinelSpace: nil
|
||||
case .error(let error): throw error
|
||||
case .value(let value): value
|
||||
}
|
||||
}
|
||||
return String(characters)
|
||||
}
|
||||
}
|
||||
|
||||
private enum Token: Hashable {
|
||||
case sentinelSpace
|
||||
case value(Character)
|
||||
case error(Errors)
|
||||
}
|
||||
}
|
||||
@@ -30,6 +30,7 @@ private struct XToolCommand: AsyncParsableCommand {
|
||||
NewCommand.self,
|
||||
DevCommand.self,
|
||||
DSCommand.self,
|
||||
HotReloadCommand.self,
|
||||
]
|
||||
),
|
||||
CommandGroup(
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
#if canImport(Subprocess)
|
||||
import Subprocess
|
||||
import Foundation
|
||||
|
||||
extension ExecutionRecord {
|
||||
@discardableResult
|
||||
public func checkSuccess() throws(SubprocessFailure) -> Self {
|
||||
try terminationStatus.checkSuccess()
|
||||
return self
|
||||
}
|
||||
}
|
||||
|
||||
extension ExecutionOutcome {
|
||||
@discardableResult
|
||||
public func checkSuccess() throws(SubprocessFailure) -> Self {
|
||||
try terminationStatus.checkSuccess()
|
||||
return self
|
||||
}
|
||||
}
|
||||
|
||||
extension TerminationStatus {
|
||||
fileprivate func checkSuccess() throws(SubprocessFailure) {
|
||||
if let failure { throw failure }
|
||||
}
|
||||
|
||||
private var failure: SubprocessFailure? {
|
||||
if isSuccess { return nil }
|
||||
switch self {
|
||||
case .exited(let code): return .exited(code)
|
||||
case .signaled(let code): return .signaled(code)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public enum SubprocessFailure: Error {
|
||||
case exited(TerminationStatus.Code)
|
||||
case signaled(TerminationStatus.Code)
|
||||
}
|
||||
|
||||
extension PlatformOptions {
|
||||
public static var withGracefulShutDown: Self {
|
||||
.init().withGracefulShutDown
|
||||
}
|
||||
|
||||
public var withGracefulShutDown: Self {
|
||||
var copy = self
|
||||
copy.teardownSequence = [
|
||||
.gracefulShutDown(
|
||||
allowedDurationToNextStep: .milliseconds(500)
|
||||
)
|
||||
]
|
||||
return copy
|
||||
}
|
||||
}
|
||||
|
||||
extension Environment {
|
||||
public static func currentMap() -> [Environment.Key: String] {
|
||||
Dictionary(
|
||||
uniqueKeysWithValues: ProcessInfo.processInfo.environment.map {
|
||||
(Environment.Key(rawValue: $0)!, $1)
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@@ -0,0 +1,53 @@
|
||||
import Foundation
|
||||
|
||||
#if canImport(System)
|
||||
import System
|
||||
|
||||
public typealias FilePath = System.FilePath
|
||||
public typealias FileDescriptor = System.FileDescriptor
|
||||
public typealias Errno = System.Errno
|
||||
#else
|
||||
import SystemPackage
|
||||
|
||||
public typealias FilePath = SystemPackage.FilePath
|
||||
public typealias FileDescriptor = SystemPackage.FileDescriptor
|
||||
public typealias Errno = SystemPackage.Errno
|
||||
|
||||
extension URL {
|
||||
public init?(filePath: FilePath) {
|
||||
self.init(filePath: filePath.string)
|
||||
}
|
||||
}
|
||||
|
||||
extension FilePath {
|
||||
public init?(_ url: URL) {
|
||||
guard url.isFileURL else { return nil }
|
||||
self.init(url.path)
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
extension FileDescriptor {
|
||||
enum LockMode {
|
||||
case shared
|
||||
case exclusive
|
||||
|
||||
fileprivate var raw: CInt {
|
||||
switch self {
|
||||
case .shared: LOCK_SH
|
||||
case .exclusive: LOCK_EX
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func tryLock(mode: LockMode) throws -> Bool {
|
||||
if flock(rawValue, mode.raw | LOCK_NB) == 0 {
|
||||
return true
|
||||
}
|
||||
let err = errno
|
||||
if err == EWOULDBLOCK {
|
||||
return false
|
||||
}
|
||||
throw Errno(rawValue: err)
|
||||
}
|
||||
}
|
||||
@@ -65,32 +65,98 @@ private struct TemporaryDirectoryRoot {
|
||||
}
|
||||
|
||||
private init() {
|
||||
let base: URL
|
||||
let url: URL
|
||||
let env = ProcessInfo.processInfo.environment
|
||||
if let tmpdir = env["XTL_TMPDIR"] ?? env["TMPDIR"] {
|
||||
base = URL(fileURLWithPath: tmpdir)
|
||||
url = URL(fileURLWithPath: tmpdir).appendingPathComponent("sh.xtool")
|
||||
} else {
|
||||
base = FileManager.default.temporaryDirectory
|
||||
#if os(Linux)
|
||||
// On Linux, /tmp is commonly a tmpfs mount while ~/.swiftpm lives on ext4.
|
||||
// Foundation's FileManager.copyItem uses sendfile(2) internally, which returns
|
||||
// EINVAL when copying between different filesystem types (e.g. tmpfs → ext4).
|
||||
// This causes `swift sdk install` to fail on distros like Linux Mint (#181).
|
||||
// Using a cache dir on the home filesystem avoids the cross-fs copy entirely.
|
||||
let xdgCache = env["XDG_CACHE_HOME"].map { URL(fileURLWithPath: $0) }
|
||||
?? FileManager.default.homeDirectoryForCurrentUser.appendingPathComponent(".cache")
|
||||
url = xdgCache.appendingPathComponent("xtool")
|
||||
#else
|
||||
url = FileManager.default.temporaryDirectory.appendingPathComponent("sh.xtool")
|
||||
#endif
|
||||
}
|
||||
|
||||
let url = base.appendingPathComponent("sh.xtool")
|
||||
try? FileManager.default.removeItem(at: url)
|
||||
do {
|
||||
try FileManager.default.createDirectory(at: url, withIntermediateDirectories: true)
|
||||
} catch {
|
||||
self._url = .failure(Errors.tmpdirCreationFailed(url, error))
|
||||
return
|
||||
Self.pruneOrphans(in: url)
|
||||
|
||||
self._url = Result {
|
||||
let childDir = try Self.claimDirectory(in: url)
|
||||
try FileManager.default.createDirectory(at: childDir, withIntermediateDirectories: true)
|
||||
return childDir
|
||||
}
|
||||
.mapError { $0 as? Errors ?? .tmpdirCreationFailed(url, $0) }
|
||||
}
|
||||
|
||||
private static func claimDirectory(in url: URL) throws -> URL {
|
||||
try FileManager.default.createDirectory(at: url, withIntermediateDirectories: true)
|
||||
|
||||
// #if os(macOS)
|
||||
// let random = UUID().uuidString
|
||||
// let lockFile = url.appending(path: "\(random).lock")
|
||||
// print("Locking")
|
||||
// _ = try FileDescriptor.open(FilePath(lockFile.path), .readWrite, options: [.create, .exclusiveLock])
|
||||
// print("Locked")
|
||||
// return url.appending(path: random)
|
||||
// #else
|
||||
for _ in 0..<10 {
|
||||
let random = UUID().uuidString
|
||||
let lockFile = url.appending(path: "\(random).lock")
|
||||
FileManager.default.createFile(atPath: lockFile.path, contents: nil)
|
||||
let fd = try FileDescriptor.open(FilePath(lockFile.path), .writeOnly, options: [])
|
||||
guard try fd.tryLock(mode: .exclusive) else {
|
||||
// someone else raced us and claimed the right to prune between when we created the file and
|
||||
// when we tried to lock it
|
||||
continue
|
||||
}
|
||||
return url.appending(path: random)
|
||||
}
|
||||
throw Errors.tmpdirClaimFailed(url)
|
||||
// #endif
|
||||
}
|
||||
|
||||
private static func pruneOrphans(in url: URL) {
|
||||
guard let children = try? FileManager.default.contentsOfDirectory(at: url, includingPropertiesForKeys: nil)
|
||||
else { return }
|
||||
for lock in children {
|
||||
do {
|
||||
let basename = lock.lastPathComponent
|
||||
guard basename.hasSuffix(".lock") && basename != ".lock" else { continue }
|
||||
let lockFD = try FileDescriptor.open(FilePath(lock.path), .readWrite)
|
||||
defer { try? lockFD.close() }
|
||||
if try lockFD.tryLock(mode: .exclusive) {
|
||||
// we must remove the directory first. if we instead removed the lock first,
|
||||
// we could be killed after the lock was removed but before the dir was
|
||||
// removed and therefore leave it hanging around.
|
||||
do {
|
||||
try FileManager.default.removeItem(at: lock.deletingPathExtension())
|
||||
} catch CocoaError.fileNoSuchFile {
|
||||
// pass
|
||||
}
|
||||
try FileManager.default.removeItem(at: lock)
|
||||
}
|
||||
} catch {
|
||||
// continue
|
||||
}
|
||||
}
|
||||
self._url = .success(url)
|
||||
}
|
||||
|
||||
enum Errors: Error, CustomStringConvertible {
|
||||
case tmpdirCreationFailed(URL, Error)
|
||||
case tmpdirClaimFailed(URL)
|
||||
|
||||
var description: String {
|
||||
switch self {
|
||||
case let .tmpdirCreationFailed(url, error):
|
||||
"Could not create temporary directory at '\(url.path)': \(error)"
|
||||
"Could not create temporary directory in '\(url.path)': \(error)"
|
||||
case let .tmpdirClaimFailed(url):
|
||||
"Could not claim temporary directory in '\(url.path)'"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,71 +0,0 @@
|
||||
//
|
||||
// XKitDeveloperServicesTests.swift
|
||||
// XKitTests
|
||||
//
|
||||
// Created by Kabir Oberai on 30/10/19.
|
||||
// Copyright © 2019 Kabir Oberai. All rights reserved.
|
||||
//
|
||||
|
||||
import XCTest
|
||||
import SuperutilsTestSupport
|
||||
import XKit
|
||||
|
||||
// swiftlint:disable force_try
|
||||
|
||||
class XKitDeveloperServicesTests: XCTestCase {
|
||||
|
||||
var storage: KeyValueStorage!
|
||||
var client: DeveloperServicesClient!
|
||||
|
||||
override func setUp() {
|
||||
super.setUp()
|
||||
_ = addMockSigner
|
||||
storage = MemoryKeyValueStorage()
|
||||
client = try! .test(storage: storage)
|
||||
}
|
||||
|
||||
override func tearDown() {
|
||||
super.tearDown()
|
||||
client = nil
|
||||
}
|
||||
|
||||
// integration test for provisioning
|
||||
@MainActor func testProvisioningIntegration() async throws {
|
||||
let listTeams = DeveloperServicesListTeamsRequest()
|
||||
let teams = try await client.send(listTeams)
|
||||
let team = teams.first { $0.status == "active" && $0.memberships.contains { $0.platform == .iOS } }!
|
||||
|
||||
let source = try XCTUnwrap(Bundle.module.url(forResource: "test", withExtension: "app"))
|
||||
|
||||
let context = try XCTTry(SigningContext(
|
||||
udid: Config.current.udid,
|
||||
deviceName: SigningContext.hostName,
|
||||
teamID: team.id,
|
||||
client: client,
|
||||
signingInfoManager: MemoryBackedSigningInfoManager()
|
||||
))
|
||||
|
||||
let response = try await DeveloperServicesProvisioningOperation(
|
||||
context: context,
|
||||
app: source,
|
||||
confirmRevocation: { _ in true },
|
||||
progress: { _ in }
|
||||
).perform()
|
||||
print(response)
|
||||
}
|
||||
|
||||
func testListTeams() async throws {
|
||||
let listTeams = DeveloperServicesListTeamsRequest()
|
||||
let teams = try await client.send(listTeams)
|
||||
XCTAssertFalse(teams.isEmpty, "No teams found")
|
||||
|
||||
let team = try XCTUnwrap(
|
||||
teams.first { $0.id.rawValue == Config.current.preferredTeam },
|
||||
"Could not find preferred team"
|
||||
)
|
||||
|
||||
XCTAssertEqual(team.status, "active", "Expected team status active. Got: \(team.status)")
|
||||
XCTAssert(team.memberships.contains { $0.platform == .iOS }, "Team does not have iOS membership")
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,67 +0,0 @@
|
||||
//
|
||||
// XKitGrandSlamTests.swift
|
||||
// XKitTests
|
||||
//
|
||||
// Created by Kabir Oberai on 10/04/20.
|
||||
// Copyright © 2020 Kabir Oberai. All rights reserved.
|
||||
//
|
||||
|
||||
// swiftlint:disable force_try
|
||||
|
||||
import XCTest
|
||||
import SuperutilsTestSupport
|
||||
@testable import XKit
|
||||
|
||||
final class TwoFactorAuthenticator: TwoFactorAuthDelegate {
|
||||
func fetchCode() async -> String? {
|
||||
print("Code: ", terminator: "")
|
||||
return readLine() ?? ""
|
||||
}
|
||||
}
|
||||
|
||||
class XKitGrandSlamTests: XCTestCase {
|
||||
|
||||
var authenticator: TwoFactorAuthenticator!
|
||||
var storage: KeyValueStorage!
|
||||
var client: GrandSlamClient!
|
||||
|
||||
override func setUp() {
|
||||
super.setUp()
|
||||
_ = addMockSigner
|
||||
storage = MemoryKeyValueStorage()
|
||||
client = try! .test(storage: storage)
|
||||
authenticator = TwoFactorAuthenticator()
|
||||
}
|
||||
|
||||
override func tearDown() {
|
||||
super.tearDown()
|
||||
client = nil
|
||||
authenticator = nil
|
||||
}
|
||||
|
||||
func testAuthentication() async throws {
|
||||
let loginData = try await GrandSlamAuthenticateOperation(
|
||||
client: client,
|
||||
username: Config.current.appleID.username,
|
||||
password: Config.current.appleID.password,
|
||||
twoFactorDelegate: authenticator
|
||||
).authenticate()
|
||||
XCTAssertFalse(loginData.adsid.isEmpty)
|
||||
XCTAssertFalse(loginData.cookie.isEmpty)
|
||||
XCTAssertFalse(loginData.identityToken.isEmpty)
|
||||
XCTAssertFalse(loginData.idmsToken.isEmpty)
|
||||
XCTAssertFalse(loginData.sk.isEmpty)
|
||||
|
||||
let now = Date() // *before* the actual request is made
|
||||
|
||||
let tokens = try await GrandSlamFetchAppTokensOperation(
|
||||
client: client,
|
||||
apps: [.xcode],
|
||||
loginData: loginData
|
||||
).perform()
|
||||
let token = try XCTUnwrap(tokens[.xcode], "Xcode token absent from response")
|
||||
XCTAssertGreaterThanOrEqual(token.expiry, now)
|
||||
XCTAssertFalse(token.value.isEmpty)
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,90 +0,0 @@
|
||||
//
|
||||
// XKitSigningTests.swift
|
||||
// XKitTests
|
||||
//
|
||||
// Created by Kabir Oberai on 06/11/19.
|
||||
// Copyright © 2019 Kabir Oberai. All rights reserved.
|
||||
//
|
||||
|
||||
// TODO: Test using mock signer
|
||||
|
||||
#if false
|
||||
|
||||
import XCTest
|
||||
import SuperutilsTestSupport
|
||||
import XKit
|
||||
|
||||
class XKitSigningTests: XCTestCase {
|
||||
|
||||
var client: DeveloperServicesClient!
|
||||
var signerImpl: SignerImpl!
|
||||
var app: URL!
|
||||
|
||||
// swiftlint:disable force_try
|
||||
override func setUp() {
|
||||
super.setUp()
|
||||
_ = addMockSigner
|
||||
client = .test()
|
||||
signerImpl = try! SignerImpl.first()
|
||||
|
||||
let source = try! XCTUnwrap(Bundle.module.url(forResource: "test", withExtension: "app"))
|
||||
let tmp = FileManager.default.temporaryDirectory
|
||||
app = tmp.appendingPathComponent(source.lastPathComponent)
|
||||
if FileManager.default.fileExists(atPath: app.path) {
|
||||
try! FileManager.default.removeItem(at: app)
|
||||
}
|
||||
try! FileManager.default.copyItem(at: source, to: app)
|
||||
}
|
||||
|
||||
override func tearDown() {
|
||||
super.tearDown()
|
||||
client = nil
|
||||
signerImpl = nil
|
||||
try! FileManager.default.removeItem(at: app)
|
||||
app = nil
|
||||
}
|
||||
// swiftlint:enable force_try
|
||||
|
||||
// integration test for signing
|
||||
@MainActor func testSigningIntegration() throws {
|
||||
let listTeams = DeveloperServicesListTeamsRequest()
|
||||
let teams = try XCTTry(client.sendTest(listTeams))
|
||||
let team = teams.first { $0.status == "active" && $0.memberships.contains { $0.platform == .iOS } }!
|
||||
|
||||
let context = try XCTTry(SigningContext(
|
||||
udid: Config.current.udid,
|
||||
deviceName: SigningContext.hostName,
|
||||
teamID: team.id,
|
||||
client: client,
|
||||
signingInfoManager: MemoryBackedSigningInfoManager(),
|
||||
signerImpl: signerImpl
|
||||
))
|
||||
let signer = Signer(context: context)
|
||||
|
||||
let signingWaiter = ResultWaiter<()>(description: "Failed to sign app")
|
||||
signer.sign(app: app, status: { _ in }, progress: { _ in }, completion: signingWaiter.completion)
|
||||
try XCTTry(signingWaiter.wait(timeout: 10000))
|
||||
|
||||
// TODO: Ensure entitlements are correct in new app, also codesign -vvvv
|
||||
}
|
||||
|
||||
func testAnalyze() throws {
|
||||
let infoURL = app.appendingPathComponent("Info.plist")
|
||||
let info = try XCTUnwrap(NSDictionary(contentsOf: infoURL))
|
||||
let execName = try XCTUnwrap(info[kCFBundleExecutableKey as String] as? String)
|
||||
let exec = app.appendingPathComponent(execName)
|
||||
|
||||
let ents = try XCTUnwrap(signerImpl.analyze(executable: exec))
|
||||
let entsPlist = try XCTTry(PropertyListDecoder().decode(Entitlements.self, from: ents))
|
||||
|
||||
XCTAssertFalse(try XCTTry(entsPlist.entitlements().isEmpty))
|
||||
}
|
||||
|
||||
func testSign() throws {
|
||||
let signingWaiter = ResultWaiter<()>(description: "Failed to sign app")
|
||||
// TODO: Get cert, key, ents from fixtures
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -1,32 +0,0 @@
|
||||
//
|
||||
// Config.swift
|
||||
// XKitTests
|
||||
//
|
||||
// Created by Kabir Oberai on 05/11/19.
|
||||
// Copyright © 2019 Kabir Oberai. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import XKit
|
||||
|
||||
struct Config: Decodable {
|
||||
struct AppleID: Decodable {
|
||||
let username: String
|
||||
let password: String
|
||||
/// for non-login tests, just provide a token already
|
||||
let token: DeveloperServicesLoginToken
|
||||
}
|
||||
|
||||
let appleID: AppleID
|
||||
let deviceInfo: DeviceInfo
|
||||
let preferredTeam: String
|
||||
let udid: String
|
||||
|
||||
static let current: Config = {
|
||||
let url = Bundle.module.url(forResource: "config", withExtension: "json")!
|
||||
// swiftlint:disable:next force_try
|
||||
let data = try! Data(contentsOf: url)
|
||||
// swiftlint:disable:next force_try
|
||||
return try! JSONDecoder().decode(Config.self, from: data)
|
||||
}()
|
||||
}
|
||||
@@ -1,62 +0,0 @@
|
||||
//
|
||||
// DeveloperServicesTestClient.swift
|
||||
// XKitTests
|
||||
//
|
||||
// Created by Kabir Oberai on 06/11/19.
|
||||
// Copyright © 2019 Kabir Oberai. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import XCTest
|
||||
@testable import XKit
|
||||
|
||||
#if false
|
||||
|
||||
extension TCPAnisetteDataProvider {
|
||||
|
||||
static func test() -> TCPAnisetteDataProvider {
|
||||
TCPAnisetteDataProvider(localPort: 4321)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
extension NetcatAnisetteDataProvider {
|
||||
|
||||
static func test() -> NetcatAnisetteDataProvider {
|
||||
NetcatAnisetteDataProvider(localPort: 4322, deviceInfo: Config.current.deviceInfo)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
extension ADIDataProvider {
|
||||
|
||||
static func test(storage: KeyValueStorage) throws -> ADIDataProvider {
|
||||
try adiProvider(deviceInfo: Config.current.deviceInfo, storage: storage)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
extension GrandSlamClient {
|
||||
|
||||
static func test(storage: KeyValueStorage) throws -> GrandSlamClient {
|
||||
try GrandSlamClient(
|
||||
deviceInfo: Config.current.deviceInfo,
|
||||
anisetteProvider: ADIDataProvider.test(storage: storage)
|
||||
)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
extension DeveloperServicesClient {
|
||||
|
||||
static func test(storage: KeyValueStorage) throws -> DeveloperServicesClient {
|
||||
try DeveloperServicesClient(
|
||||
loginToken: Config.current.appleID.token,
|
||||
deviceInfo: Config.current.deviceInfo,
|
||||
anisetteProvider: ADIDataProvider.test(storage: storage)
|
||||
)
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
import Foundation
|
||||
import SignerSupport
|
||||
|
||||
let addMockSigner: () = {
|
||||
add_signer(
|
||||
"MockSigner",
|
||||
{ _, _, _, _, _, _, _, _, _, exception in
|
||||
exception.initialize(to: strdup("Mock signer not implemented"))
|
||||
return 1
|
||||
},
|
||||
{ _, _, exception in
|
||||
exception.initialize(to: strdup("Mock analyzer not implemented"))
|
||||
return nil
|
||||
}
|
||||
)
|
||||
}()
|
||||
@@ -1,32 +0,0 @@
|
||||
{
|
||||
"appleID": {
|
||||
"username": "",
|
||||
"password": "",
|
||||
"token": {
|
||||
"adsid": "",
|
||||
"token": "",
|
||||
"expiry": 0
|
||||
}
|
||||
},
|
||||
"deviceInfo": {
|
||||
"clientInfo": {
|
||||
"macOSBuild": "",
|
||||
"darwinVersion": "",
|
||||
"macOSVersion": "",
|
||||
"akdVersion": "",
|
||||
"cfNetworkVersion": "",
|
||||
"authKitVersion": "",
|
||||
"modelID": "",
|
||||
},
|
||||
"xcodeInfo": {
|
||||
"version": "",
|
||||
"build": ""
|
||||
},
|
||||
"deviceID": "",
|
||||
"mlbSerialNumber": "",
|
||||
"romAddress": "",
|
||||
"serialNumber": ""
|
||||
},
|
||||
"preferredTeam": "",
|
||||
"udid": "",
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
import Testing
|
||||
@testable import XToolSupport
|
||||
|
||||
@Test func commandParser() throws {
|
||||
func sut(_ string: some StringProtocol) throws -> [String] {
|
||||
try CommandParser.parse(string)
|
||||
}
|
||||
|
||||
#expect(try sut(#""#).isEmpty)
|
||||
#expect(try sut(#"foo"#) == ["foo"])
|
||||
#expect(try sut(#"foo "#) == ["foo"])
|
||||
#expect(try sut(#"foo one two"#) == ["foo", "one", "two"])
|
||||
#expect(try sut(#"foo 'one two' three"#) == ["foo", "one two", "three"])
|
||||
#expect(try sut(#"foo 'one!two' three"#) == ["foo", "one!two", "three"])
|
||||
#expect(try sut(#"foo one\!two three"#) == ["foo", "one!two", "three"])
|
||||
#expect(try sut(#"foo one\'two three"#) == ["foo", "one'two", "three"])
|
||||
#expect(try sut(#"foo one'two three'four five"#) == ["foo", "onetwo threefour", "five"])
|
||||
|
||||
#expect(throws: CommandParser.Errors.unclosedQuote) {
|
||||
try sut(#"foo one two' three"#)
|
||||
}
|
||||
#expect(throws: CommandParser.Errors.unpairedEscape) {
|
||||
try sut(#"foo a b \"#)
|
||||
}
|
||||
}
|
||||
@@ -2,8 +2,3 @@ source 'https://rubygems.org'
|
||||
|
||||
gem 'fastlane'
|
||||
gem 'fastlane-plugin-xcodegen'
|
||||
|
||||
# https://github.com/fastlane/fastlane/issues/29183#issuecomment-2567093826
|
||||
gem "abbrev"
|
||||
gem "mutex_m"
|
||||
gem "ostruct"
|
||||
|
||||
+62
-58
@@ -1,18 +1,15 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
CFPropertyList (3.0.7)
|
||||
base64
|
||||
nkf
|
||||
rexml
|
||||
CFPropertyList (3.0.8)
|
||||
abbrev (0.1.2)
|
||||
addressable (2.8.7)
|
||||
public_suffix (>= 2.0.2, < 7.0)
|
||||
addressable (2.9.0)
|
||||
public_suffix (>= 2.0.2, < 8.0)
|
||||
artifactory (3.0.17)
|
||||
atomos (0.1.3)
|
||||
aws-eventstream (1.4.0)
|
||||
aws-partitions (1.1172.0)
|
||||
aws-sdk-core (3.233.0)
|
||||
aws-partitions (1.1249.0)
|
||||
aws-sdk-core (3.247.0)
|
||||
aws-eventstream (~> 1, >= 1.3.0)
|
||||
aws-partitions (~> 1, >= 1.992.0)
|
||||
aws-sigv4 (~> 1.9)
|
||||
@@ -20,23 +17,25 @@ GEM
|
||||
bigdecimal
|
||||
jmespath (~> 1, >= 1.6.1)
|
||||
logger
|
||||
aws-sdk-kms (1.113.0)
|
||||
aws-sdk-core (~> 3, >= 3.231.0)
|
||||
aws-sdk-kms (1.125.0)
|
||||
aws-sdk-core (~> 3, >= 3.247.0)
|
||||
aws-sigv4 (~> 1.5)
|
||||
aws-sdk-s3 (1.199.1)
|
||||
aws-sdk-core (~> 3, >= 3.231.0)
|
||||
aws-sdk-s3 (1.222.0)
|
||||
aws-sdk-core (~> 3, >= 3.247.0)
|
||||
aws-sdk-kms (~> 1)
|
||||
aws-sigv4 (~> 1.5)
|
||||
aws-sigv4 (1.12.1)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
babosa (1.0.4)
|
||||
base64 (0.3.0)
|
||||
bigdecimal (3.3.1)
|
||||
benchmark (0.5.0)
|
||||
bigdecimal (4.1.2)
|
||||
claide (1.1.0)
|
||||
colored (1.2)
|
||||
colored2 (3.1.2)
|
||||
commander (4.6.0)
|
||||
highline (~> 2.0.0)
|
||||
csv (3.3.5)
|
||||
declarative (0.0.20)
|
||||
digest-crc (0.7.0)
|
||||
rake (>= 12.0.0, < 14.0.0)
|
||||
@@ -44,7 +43,7 @@ GEM
|
||||
dotenv (2.8.1)
|
||||
emoji_regex (3.2.3)
|
||||
excon (0.112.0)
|
||||
faraday (1.10.4)
|
||||
faraday (1.10.5)
|
||||
faraday-em_http (~> 1.0)
|
||||
faraday-em_synchrony (~> 1.0)
|
||||
faraday-excon (~> 1.1)
|
||||
@@ -56,32 +55,36 @@ GEM
|
||||
faraday-rack (~> 1.0)
|
||||
faraday-retry (~> 1.0)
|
||||
ruby2_keywords (>= 0.0.4)
|
||||
faraday-cookie_jar (0.0.7)
|
||||
faraday-cookie_jar (0.0.8)
|
||||
faraday (>= 0.8.0)
|
||||
http-cookie (~> 1.0.0)
|
||||
http-cookie (>= 1.0.0)
|
||||
faraday-em_http (1.0.0)
|
||||
faraday-em_synchrony (1.0.1)
|
||||
faraday-excon (1.1.0)
|
||||
faraday-httpclient (1.0.1)
|
||||
faraday-multipart (1.1.1)
|
||||
faraday-multipart (1.2.0)
|
||||
multipart-post (~> 2.0)
|
||||
faraday-net_http (1.0.2)
|
||||
faraday-net_http_persistent (1.2.0)
|
||||
faraday-patron (1.0.0)
|
||||
faraday-rack (1.0.0)
|
||||
faraday-retry (1.0.3)
|
||||
faraday-retry (1.0.4)
|
||||
faraday_middleware (1.2.1)
|
||||
faraday (~> 1.0)
|
||||
fastimage (2.4.0)
|
||||
fastlane (2.228.0)
|
||||
CFPropertyList (>= 2.3, < 4.0.0)
|
||||
fastimage (2.4.1)
|
||||
fastlane (2.234.0)
|
||||
CFPropertyList (>= 2.3, < 5.0.0)
|
||||
abbrev (~> 0.1)
|
||||
addressable (>= 2.8, < 3.0.0)
|
||||
artifactory (~> 3.0)
|
||||
aws-sdk-s3 (~> 1.0)
|
||||
aws-sdk-s3 (~> 1.197)
|
||||
babosa (>= 1.0.3, < 2.0.0)
|
||||
bundler (>= 1.12.0, < 3.0.0)
|
||||
base64 (~> 0.2)
|
||||
benchmark (>= 0.1.0)
|
||||
bundler (>= 1.17.3, < 5.0.0)
|
||||
colored (~> 1.2)
|
||||
commander (~> 4.6)
|
||||
csv (~> 3.3)
|
||||
dotenv (>= 2.1.1, < 3.0.0)
|
||||
emoji_regex (>= 0.1, < 4.0)
|
||||
excon (>= 0.71.0, < 1.0.0)
|
||||
@@ -89,20 +92,24 @@ GEM
|
||||
faraday-cookie_jar (~> 0.0.6)
|
||||
faraday_middleware (~> 1.0)
|
||||
fastimage (>= 2.1.0, < 3.0.0)
|
||||
fastlane-sirp (>= 1.0.0)
|
||||
fastlane-sirp (>= 1.1.0)
|
||||
gh_inspector (>= 1.1.2, < 2.0.0)
|
||||
google-apis-androidpublisher_v3 (~> 0.3)
|
||||
google-apis-playcustomapp_v1 (~> 0.1)
|
||||
google-cloud-env (>= 1.6.0, < 2.0.0)
|
||||
google-cloud-env (>= 1.6.0, <= 2.1.1)
|
||||
google-cloud-storage (~> 1.31)
|
||||
highline (~> 2.0)
|
||||
http-cookie (~> 1.0.5)
|
||||
json (< 3.0.0)
|
||||
jwt (>= 2.1.0, < 3)
|
||||
logger (>= 1.6, < 2.0)
|
||||
mini_magick (>= 4.9.4, < 5.0.0)
|
||||
multipart-post (>= 2.0.0, < 3.0.0)
|
||||
mutex_m (~> 0.3)
|
||||
naturally (~> 2.2)
|
||||
nkf (~> 0.2)
|
||||
optparse (>= 0.1.1, < 1.0.0)
|
||||
ostruct (>= 0.1.0)
|
||||
plist (>= 3.1.0, < 4.0.0)
|
||||
rubyzip (>= 2.0.0, < 3.0.0)
|
||||
security (= 0.1.5)
|
||||
@@ -118,41 +125,42 @@ GEM
|
||||
fastlane-plugin-brew (0.1.1)
|
||||
fastlane-plugin-xcodegen (1.1.0)
|
||||
fastlane-plugin-brew (~> 0.1.1)
|
||||
fastlane-sirp (1.0.0)
|
||||
sysrandom (~> 1.0)
|
||||
fastlane-sirp (1.1.0)
|
||||
gh_inspector (1.1.3)
|
||||
google-apis-androidpublisher_v3 (0.54.0)
|
||||
google-apis-core (>= 0.11.0, < 2.a)
|
||||
google-apis-core (0.11.3)
|
||||
google-apis-androidpublisher_v3 (0.100.0)
|
||||
google-apis-core (>= 0.15.0, < 2.a)
|
||||
google-apis-core (0.18.0)
|
||||
addressable (~> 2.5, >= 2.5.1)
|
||||
googleauth (>= 0.16.2, < 2.a)
|
||||
httpclient (>= 2.8.1, < 3.a)
|
||||
googleauth (~> 1.9)
|
||||
httpclient (>= 2.8.3, < 3.a)
|
||||
mini_mime (~> 1.0)
|
||||
mutex_m
|
||||
representable (~> 3.0)
|
||||
retriable (>= 2.0, < 4.a)
|
||||
rexml
|
||||
google-apis-iamcredentials_v1 (0.17.0)
|
||||
google-apis-core (>= 0.11.0, < 2.a)
|
||||
google-apis-playcustomapp_v1 (0.13.0)
|
||||
google-apis-core (>= 0.11.0, < 2.a)
|
||||
google-apis-storage_v1 (0.31.0)
|
||||
google-apis-core (>= 0.11.0, < 2.a)
|
||||
google-apis-iamcredentials_v1 (0.27.0)
|
||||
google-apis-core (>= 0.15.0, < 2.a)
|
||||
google-apis-playcustomapp_v1 (0.17.0)
|
||||
google-apis-core (>= 0.15.0, < 2.a)
|
||||
google-apis-storage_v1 (0.62.0)
|
||||
google-apis-core (>= 0.15.0, < 2.a)
|
||||
google-cloud-core (1.8.0)
|
||||
google-cloud-env (>= 1.0, < 3.a)
|
||||
google-cloud-errors (~> 1.0)
|
||||
google-cloud-env (1.6.0)
|
||||
faraday (>= 0.17.3, < 3.0)
|
||||
google-cloud-errors (1.5.0)
|
||||
google-cloud-storage (1.47.0)
|
||||
google-cloud-env (2.1.1)
|
||||
faraday (>= 1.0, < 3.a)
|
||||
google-cloud-errors (1.6.0)
|
||||
google-cloud-storage (1.60.0)
|
||||
addressable (~> 2.8)
|
||||
digest-crc (~> 0.4)
|
||||
google-apis-iamcredentials_v1 (~> 0.1)
|
||||
google-apis-storage_v1 (~> 0.31.0)
|
||||
google-apis-core (>= 0.18, < 2)
|
||||
google-apis-iamcredentials_v1 (~> 0.18)
|
||||
google-apis-storage_v1 (>= 0.42)
|
||||
google-cloud-core (~> 1.6)
|
||||
googleauth (>= 0.16.2, < 2.a)
|
||||
googleauth (~> 1.9)
|
||||
mini_mime (~> 1.0)
|
||||
googleauth (1.8.1)
|
||||
faraday (>= 0.17.3, < 3.a)
|
||||
googleauth (1.11.2)
|
||||
faraday (>= 1.0, < 3.a)
|
||||
google-cloud-env (~> 2.1)
|
||||
jwt (>= 1.4, < 3.0)
|
||||
multi_json (~> 1.11)
|
||||
os (>= 0.9, < 2.0)
|
||||
@@ -163,29 +171,29 @@ GEM
|
||||
httpclient (2.9.0)
|
||||
mutex_m
|
||||
jmespath (1.6.2)
|
||||
json (2.15.1)
|
||||
json (2.19.5)
|
||||
jwt (2.10.2)
|
||||
base64
|
||||
logger (1.7.0)
|
||||
mini_magick (4.13.2)
|
||||
mini_mime (1.1.5)
|
||||
multi_json (1.17.0)
|
||||
multi_json (1.21.1)
|
||||
multipart-post (2.4.1)
|
||||
mutex_m (0.3.0)
|
||||
nanaimo (0.4.0)
|
||||
naturally (2.3.0)
|
||||
nkf (0.2.0)
|
||||
optparse (0.6.0)
|
||||
optparse (0.8.1)
|
||||
os (1.1.4)
|
||||
ostruct (0.6.3)
|
||||
plist (3.7.2)
|
||||
public_suffix (6.0.2)
|
||||
rake (13.3.0)
|
||||
public_suffix (7.0.5)
|
||||
rake (13.4.2)
|
||||
representable (3.2.0)
|
||||
declarative (< 0.1.0)
|
||||
trailblazer-option (>= 0.1.1, < 0.2.0)
|
||||
uber (< 0.2.0)
|
||||
retriable (3.1.2)
|
||||
retriable (3.4.1)
|
||||
rexml (3.4.4)
|
||||
rouge (3.28.0)
|
||||
ruby2_keywords (0.0.5)
|
||||
@@ -199,7 +207,6 @@ GEM
|
||||
simctl (1.6.10)
|
||||
CFPropertyList
|
||||
naturally
|
||||
sysrandom (1.0.5)
|
||||
terminal-notifier (2.0.0)
|
||||
terminal-table (3.0.2)
|
||||
unicode-display_width (>= 1.1.1, < 3)
|
||||
@@ -228,11 +235,8 @@ PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
abbrev
|
||||
fastlane
|
||||
fastlane-plugin-xcodegen
|
||||
mutex_m
|
||||
ostruct
|
||||
|
||||
BUNDLED WITH
|
||||
2.6.7
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
require_relative "spaceship_patch"
|
||||
|
||||
default_platform(:mac)
|
||||
|
||||
ENV["FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT"] = "120"
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
require "spaceship"
|
||||
|
||||
# the ASC API has started (June 2025) throwing a fit when it
|
||||
# sees DEVELOPER_ID_APPLICATION_G2 in the certificate types filter.
|
||||
# so we patch Spaceship to filter locally instead of via the API.
|
||||
# c.f. https://github.com/fastlane/fastlane/pull/29588
|
||||
|
||||
class << Spaceship::ConnectAPI::Certificate
|
||||
alias_method :all_orig, :all
|
||||
|
||||
def all(**args)
|
||||
types = args[:filter]&.delete(:certificateType)&.split(",")
|
||||
certs = all_orig(**args)
|
||||
types ? certs.select { |cert| types.include?(cert.certificate_type) } : certs
|
||||
end
|
||||
end
|
||||
+1
-1
@@ -11,7 +11,7 @@ targets:
|
||||
XToolMac:
|
||||
type: application
|
||||
platform: macOS
|
||||
deploymentTarget: "13.0"
|
||||
deploymentTarget: "14.0"
|
||||
sources:
|
||||
- path: XToolMac
|
||||
- path: Resources/xtool
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
base = "Documentation/"
|
||||
publish = "xtool.docc/.docc-build"
|
||||
command = "./build.sh"
|
||||
environment = { SWIFT_VERSION = "6.2" }
|
||||
environment = { SWIFT_VERSION = "6.3" }
|
||||
ignore = "git -C .. diff --quiet $CACHED_COMMIT_REF $COMMIT_REF -- Documentation netlify.toml"
|
||||
|
||||
[[redirects]]
|
||||
|
||||
Reference in New Issue
Block a user