Compare commits

..

2 Commits

53 changed files with 1024 additions and 8325 deletions
@@ -1,9 +0,0 @@
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
+13 -19
View File
@@ -19,29 +19,23 @@ jobs:
runs-on: ${{ matrix.host.runner }}
steps:
- name: Checkout
uses: actions/checkout@v6
- name: Build and test
run: |
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@v6
- uses: ./.github/actions/configure-xcode
uses: actions/checkout@v4
- name: Build
run: |
swift build --product xtool && .build/debug/xtool --help
- name: Run tests
run: |
swift test
build-ios:
runs-on: macos-26
docker compose run --build --rm xtool swift build --product xtool
build-macos:
runs-on: macos-15
steps:
- name: Checkout
uses: actions/checkout@v6
- uses: ./.github/actions/configure-xcode
uses: actions/checkout@v4
- name: Build
run: |
swift build --product xtool
build-ios:
runs-on: macos-15
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Build
run: |
set -o pipefail \
+7 -8
View File
@@ -18,27 +18,26 @@ jobs:
contents: write
steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v4
- 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@v7
uses: actions/upload-artifact@v4
with:
name: xtool-${{ matrix.host.arch }}
path: |
Linux/packages/xtool-${{ matrix.host.arch }}.AppImage
Linux/packages/xtool-${{ matrix.host.arch }}.AppImage.zsync
build-mac:
runs-on: macos-26
runs-on: macos-15
permissions:
contents: write
steps:
- name: Checkout
uses: actions/checkout@v6
- uses: ./.github/actions/configure-xcode
uses: actions/checkout@v4
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
@@ -56,7 +55,7 @@ jobs:
cd macOS
bundle exec fastlane package
- name: Upload artifacts
uses: actions/upload-artifact@v7
uses: actions/upload-artifact@v4
with:
name: xtool-mac
path: |
@@ -70,9 +69,9 @@ jobs:
env:
GH_TOKEN: ${{ github.token }}
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v4
- name: Download artifact
uses: actions/download-artifact@v8
uses: actions/download-artifact@v4
with:
pattern: xtool-*
path: output
+1 -1
View File
@@ -11,7 +11,7 @@ jobs:
swiftlint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v4
- name: Lint
run: |
make lint SWIFTLINT_FLAGS='--reporter=github-actions-logging' | tee swiftlint.log
-10
View File
@@ -1,13 +1,3 @@
{
"swiftlint.path": "./.tmp/swiftlint/swiftlint",
"files.watcherExclude":{
"*/.git/**": true,
"*/.build/**": true,
"*/.tmp/**": true,
},
"search.exclude": {
"*/.git/**": true,
"*/.build/**": true,
"*/.tmp/**": true,
}
}
+1 -1
View File
@@ -1,7 +1,7 @@
# Note: We use 22.04 since AppImage recommends building on the
# oldest configuration that you support
FROM swift:6.3-jammy AS build-base
FROM swift:6.1-jammy AS build-base
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -16,14 +16,14 @@ Once you install WSL, you'll also need to set up USB passthrough. See Microsoft'
### Swift
Install the Swift 6.3 toolchain for your Linux distribution from <https://swift.org/install/linux>.
Install the Swift 6.1 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.3 (swift-6.3-RELEASE)
# Swift version 6.1 (swift-6.1-RELEASE)
```
### usbmuxd
@@ -62,7 +62,7 @@ sudo apt-get install usbmuxd
### Xcode.xip
Download **Xcode 26** from <https://developer.apple.com/download/all/?q=Xcode>. Note the path where `Xcode.xip` is saved.
Download **Xcode 16.3** from <https://developer.apple.com/services-account/download?path=/Developer_Tools/Xcode_16.3/Xcode_16.3.xip>. Note the path where `Xcode_16.3.xip` is saved.
> Note:
>
+1 -4
View File
@@ -166,7 +166,4 @@ openapi/openapi.json: openapi/base.json Sources/DeveloperAPI/patch.js
openapi/base.json:
@mkdir -p openapi
# piping curl|bsdtar concatenates xattrs into the JSON :thonk:
curl -fsSL "$(SPEC_URL)" -o openapi/spec.zip
bsdtar -xO -f openapi/spec.zip > openapi/base.json
rm -f openapi/spec.zip
curl -fsSL "$(SPEC_URL)" | bsdtar -xOf- > openapi/base.json
+79 -124
View File
@@ -1,13 +1,13 @@
{
"originHash" : "eb2a57fb4e4c2c83ff1f1fa55631db81988fc6e2e576a05a3cc5c8ed69432c3a",
"originHash" : "30ba8b3b894def5b779d979643d77deb698479066658be3b18dad2fb6a193579",
"pins" : [
{
"identity" : "aexml",
"kind" : "remoteSourceControl",
"location" : "https://github.com/tadija/AEXML.git",
"state" : {
"revision" : "db806756c989760b35108146381535aec231092b",
"version" : "4.7.0"
"revision" : "38f7d00b23ecd891e1ee656fa6aeebd6ba04ecc3",
"version" : "4.6.1"
}
},
{
@@ -15,8 +15,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/swift-server/async-http-client.git",
"state" : {
"revision" : "3a5b74a58782c3b4c1f0bc75e9b67b10c2494e8f",
"version" : "1.33.1"
"revision" : "333f51104b75d1a5b94cb3b99e4c58a3b442c9f7",
"version" : "1.25.2"
}
},
{
@@ -24,8 +24,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/attaswift/BigInt",
"state" : {
"revision" : "e07e00fa1fd435143a2dcf8b7eec9a7710b2fdfe",
"version" : "5.7.0"
"revision" : "114343a705df4725dfe7ab8a2a326b8883cfd79c",
"version" : "5.5.1"
}
},
{
@@ -33,8 +33,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/combine-schedulers",
"state" : {
"revision" : "dcccb979a2183b8df3334237e3dc1ae2b4116a86",
"version" : "1.2.0"
"revision" : "5928286acce13def418ec36d05a001a9641086f2",
"version" : "1.0.3"
}
},
{
@@ -51,8 +51,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/mattpolzin/OpenAPIKit",
"state" : {
"revision" : "57b6318128e3f901c93f4fbf98d1c1464ec168d3",
"version" : "6.2.0"
"revision" : "da7d3a5ddff0dd8e5e9fdb5585d186d645bcc21b",
"version" : "3.5.0"
}
},
{
@@ -69,8 +69,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/onevcat/Rainbow.git",
"state" : {
"revision" : "cdf146ae671b2624917648b61c908d1244b98ca1",
"version" : "4.2.1"
"revision" : "0c627a4f8a39ef37eadec1ceec02e4a7f55561ac",
"version" : "4.1.0"
}
},
{
@@ -96,8 +96,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-argument-parser",
"state" : {
"revision" : "626b5b7b2f45e1b0b1c6f4a309296d1d21d7311b",
"version" : "1.7.1"
"revision" : "41982a3656a71c768319979febd796c6fd111d5c",
"version" : "1.5.0"
}
},
{
@@ -105,17 +105,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-asn1.git",
"state" : {
"revision" : "eb50cbd14606a9161cbc5d452f18797c90ef0bab",
"version" : "1.7.0"
}
},
{
"identity" : "swift-async-algorithms",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-async-algorithms.git",
"state" : {
"revision" : "9d349bcc328ac3c31ce40e746b5882742a0d1272",
"version" : "1.1.3"
"revision" : "a54383ada6cecde007d374f58f864e29370ba5c3",
"version" : "1.3.2"
}
},
{
@@ -123,8 +114,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-atomics.git",
"state" : {
"revision" : "b601256eab081c0f92f059e12818ac1d4f178ff7",
"version" : "1.3.0"
"revision" : "cd142fd2f64be2100422d658e7411e39489da985",
"version" : "1.2.0"
}
},
{
@@ -132,8 +123,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-certificates",
"state" : {
"revision" : "bde8ca32a096825dfce37467137c903418c1893d",
"version" : "1.19.1"
"revision" : "999fd70c7803da89f3904d635a6815a2a7cd7585",
"version" : "1.10.0"
}
},
{
@@ -148,10 +139,10 @@
{
"identity" : "swift-collections",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-collections",
"location" : "https://github.com/apple/swift-collections.git",
"state" : {
"revision" : "fea17c02d767f46b23070fdfdacc28a03a39232a",
"version" : "1.5.1"
"revision" : "671108c96644956dddcd89dd59c203dcdb36cec7",
"version" : "1.1.4"
}
},
{
@@ -159,17 +150,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-concurrency-extras",
"state" : {
"revision" : "5a3825302b1a0d744183200915a47b508c828e6f",
"version" : "1.3.2"
}
},
{
"identity" : "swift-configuration",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-configuration.git",
"state" : {
"revision" : "be76c4ad929eb6c4bcaf3351799f2adf9e6848a9",
"version" : "1.2.0"
"revision" : "82a4ae7170d98d8538ec77238b7eb8e7199ef2e8",
"version" : "1.3.1"
}
},
{
@@ -177,8 +159,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-crypto",
"state" : {
"revision" : "1b6b2e274e85105bfa155183145a1dcfd63331f1",
"version" : "4.5.0"
"revision" : "e8d6eba1fef23ae5b359c46b03f7d94be2f41fed",
"version" : "3.12.3"
}
},
{
@@ -186,26 +168,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-dependencies",
"state" : {
"revision" : "706feb7858a7f6c242879d137b8ee30926aa5b26",
"version" : "1.12.0"
}
},
{
"identity" : "swift-distributed-tracing",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-distributed-tracing.git",
"state" : {
"revision" : "dc4030184203ffafbb2ec614352487235d747fe0",
"version" : "1.4.1"
"revision" : "4c90d6b2b9bf0911af87b103bb40f41771891596",
"version" : "1.9.2"
}
},
{
"identity" : "swift-docc-plugin",
"kind" : "remoteSourceControl",
"location" : "https://github.com/swiftlang/swift-docc-plugin",
"location" : "https://github.com/apple/swift-docc-plugin",
"state" : {
"revision" : "647c708be89f834fa6a6d4945442793a77ddf5b6",
"version" : "1.5.0"
"revision" : "85e4bb4e1cd62cec64a4b8e769dcefdf0c5b9d64",
"version" : "1.4.3"
}
},
{
@@ -222,8 +195,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-http-structured-headers.git",
"state" : {
"revision" : "933538faa42c432d385f02e07df0ace7c5ecfc47",
"version" : "1.7.0"
"revision" : "f280fc7676b9940ff2c6598642751ea333c6544f",
"version" : "1.2.2"
}
},
{
@@ -231,8 +204,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-http-types",
"state" : {
"revision" : "45eb0224913ea070ec4fba17291b9e7ecf4749ca",
"version" : "1.5.1"
"revision" : "a0a57e949a8903563aba4615869310c0ebf14c03",
"version" : "1.4.0"
}
},
{
@@ -240,8 +213,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-log.git",
"state" : {
"revision" : "5073617dac96330a486245e4c0179cb0a6fd2256",
"version" : "1.12.0"
"revision" : "3d8596ed08bd13520157f0355e35caed215ffbfa",
"version" : "1.6.3"
}
},
{
@@ -249,8 +222,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio",
"state" : {
"revision" : "f71c8d2a5e74a2c6d11a0fbe324774b5d6084237",
"version" : "2.99.0"
"revision" : "0f54d58bb5db9e064f332e8524150de379d1e51c",
"version" : "2.82.1"
}
},
{
@@ -258,8 +231,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-extras.git",
"state" : {
"revision" : "5a48717e29f62cb8326d6d42e46b562ca93847a6",
"version" : "1.34.0"
"revision" : "f1f6f772198bee35d99dd145f1513d8581a54f2c",
"version" : "1.26.0"
}
},
{
@@ -267,8 +240,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-http2.git",
"state" : {
"revision" : "81cc18264f92cd307ff98430f89372711d4f6fe9",
"version" : "1.43.0"
"revision" : "4281466512f63d1bd530e33f4aa6993ee7864be0",
"version" : "1.36.0"
}
},
{
@@ -276,8 +249,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-ssl.git",
"state" : {
"revision" : "3f337058ccd7243c4cac7911477d8ad4c598d4da",
"version" : "2.37.0"
"revision" : "6df102a39c8da5fdc2eae29a0f63546d660866fc",
"version" : "2.30.0"
}
},
{
@@ -285,8 +258,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-transport-services.git",
"state" : {
"revision" : "67787bb645a5e67d2edcdfbe48a216cc549222d5",
"version" : "1.28.0"
"revision" : "cd1e89816d345d2523b11c55654570acd5cd4c56",
"version" : "1.24.0"
}
},
{
@@ -294,8 +267,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-numerics.git",
"state" : {
"revision" : "0c0290ff6b24942dadb83a929ffaaa1481df04a2",
"version" : "1.1.1"
"revision" : "e0ec0f5f3af6f3e4d5e7a19d2af26b481acb6ba8",
"version" : "1.0.3"
}
},
{
@@ -303,8 +276,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/swift-server/swift-openapi-async-http-client",
"state" : {
"revision" : "3681f659d9417652b8119f0adbdf57c04b6cb292",
"version" : "1.5.0"
"revision" : "915aeff168625b0f88a5810ee7ab8e9c00af671b",
"version" : "1.1.0"
}
},
{
@@ -312,8 +285,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-openapi-generator",
"state" : {
"revision" : "5dd0da1c7da7bac8f0c458a02a76f69031137a80",
"version" : "1.12.1"
"revision" : "02cab48b66b4b412013827c2938adaf0eb67dc8d",
"version" : "1.7.2"
}
},
{
@@ -321,8 +294,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-openapi-runtime",
"state" : {
"revision" : "f039fa6d6338aab5164f3d1be16281524c9a8f89",
"version" : "1.11.0"
"revision" : "8f33cc5dfe81169fb167da73584b9c72c3e8bc23",
"version" : "1.8.2"
}
},
{
@@ -330,26 +303,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-openapi-urlsession",
"state" : {
"revision" : "576a65b4ffb8c12ddad4950dc21eea2ef071bec2",
"version" : "1.3.0"
}
},
{
"identity" : "swift-service-context",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-service-context.git",
"state" : {
"revision" : "d0997351b0c7779017f88e7a93bc30a1878d7f29",
"version" : "1.3.0"
}
},
{
"identity" : "swift-service-lifecycle",
"kind" : "remoteSourceControl",
"location" : "https://github.com/swift-server/swift-service-lifecycle",
"state" : {
"revision" : "9829955b385e5bb88128b73f1b8389e9b9c3191a",
"version" : "2.11.0"
"revision" : "6fac6f7c428d5feea2639b5f5c8b06ddfb79434b",
"version" : "1.1.0"
}
},
{
@@ -357,8 +312,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/swiftlang/swift-syntax",
"state" : {
"revision" : "9de99a78f099e59caf2b2beec65a4c45d54b2081",
"version" : "603.0.1"
"revision" : "f99ae8aa18f0cf0d53481901f88a0991dc3bd4a2",
"version" : "601.0.1"
}
},
{
@@ -366,8 +321,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-system",
"state" : {
"revision" : "7c6ad0fc39d0763e0b699210e4124afd5041c5df",
"version" : "1.6.4"
"revision" : "a34201439c74b53f0fd71ef11741af7e7caf01e1",
"version" : "1.4.2"
}
},
{
@@ -393,8 +348,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/saagarjha/unxip",
"state" : {
"revision" : "6c3990517fcc4c1db6952fccf4c562fb14097601",
"version" : "3.3.0"
"revision" : "03c32d6b4e7d8a9fb58747e5f8b83397da8bf5ba",
"version" : "3.2.0"
}
},
{
@@ -402,8 +357,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/mxcl/Version",
"state" : {
"revision" : "3043fcd2a50375db76d89ff206a612471833d1c2",
"version" : "2.2.1"
"revision" : "303a0f916772545e1e8667d3104f83be708a723c",
"version" : "2.1.0"
}
},
{
@@ -411,8 +366,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/vapor/websocket-kit.git",
"state" : {
"revision" : "90bbbdab3ede12c803cfbe91646f291c092517a3",
"version" : "2.16.2"
"revision" : "014ccd52891b8c098d7e1033d5e72ed76fef7a86",
"version" : "2.16.0"
}
},
{
@@ -420,8 +375,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/yonaskolb/XcodeGen",
"state" : {
"revision" : "8d3d3476a69ae3e5d68e1adccc701c410c05eb36",
"version" : "2.45.4"
"revision" : "7193eb447a6f60061f069e07bc1efd32d73c0e19",
"version" : "2.43.0"
}
},
{
@@ -429,8 +384,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/tuist/XcodeProj.git",
"state" : {
"revision" : "01bb77000bc8c23a09ea2058f4954612f03cb705",
"version" : "9.10.1"
"revision" : "dc3b87a4e69f9cd06c6cb16199f5d0472e57ef6b",
"version" : "8.24.3"
}
},
{
@@ -438,8 +393,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
"state" : {
"revision" : "dfd70507def84cb5fb821278448a262c6ff2bbad",
"version" : "1.9.0"
"revision" : "39de59b2d47f7ef3ca88a039dff3084688fe27f4",
"version" : "1.5.2"
}
},
{
@@ -456,8 +411,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/jpsim/Yams",
"state" : {
"revision" : "3d6871d5b4a5cd519adf233fbb576e0a2af71c17",
"version" : "5.4.0"
"revision" : "b4b8042411dc7bbb696300a34a4bf3ba1b7ad19b",
"version" : "5.3.1"
}
},
{
@@ -465,8 +420,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/xtool-org/zsign",
"state" : {
"revision" : "6c4a9f52dd8bf374aa938ef9c17d5f261f2c333a",
"version" : "1.7.0"
"revision" : "fb10d47dd24bb84886532497bac149232e67f07a",
"version" : "1.6.0"
}
}
],
+20 -11
View File
@@ -22,8 +22,8 @@ let cSettings: [CSetting] = [
let package = Package(
name: "xtool",
platforms: [
.iOS(.v16),
.macOS(.v13),
.iOS(.v15),
.macOS(.v12),
],
products: [
.library(
@@ -42,19 +42,18 @@ let package = Package(
dependencies: [
.package(url: "https://github.com/xtool-org/xtool-core", .upToNextMinor(from: "1.4.0")),
.package(url: "https://github.com/xtool-org/SwiftyMobileDevice", .upToNextMinor(from: "1.5.0")),
.package(url: "https://github.com/xtool-org/zsign", .upToNextMinor(from: "1.7.0")),
.package(url: "https://github.com/xtool-org/zsign", .upToNextMinor(from: "1.6.0")),
.package(url: "https://github.com/apple/swift-system", from: "1.4.0"),
.package(url: "https://github.com/apple/swift-http-types", from: "1.3.1"),
.package(url: "https://github.com/apple/swift-certificates", from: "1.0.0"),
.package(url: "https://github.com/apple/swift-crypto", from: "4.5.0"),
.package(url: "https://github.com/apple/swift-crypto", from: "3.9.1"),
.package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"),
.package(url: "https://github.com/apple/swift-openapi-generator", from: "1.6.0"),
.package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.0.0"),
.package(url: "https://github.com/apple/swift-openapi-urlsession", from: "1.0.0"),
.package(url: "https://github.com/apple/swift-nio", from: "2.77.0"),
.package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.0.0"),
.package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"),
.package(url: "https://github.com/swift-server/async-http-client.git", from: "1.23.0"),
.package(url: "https://github.com/swift-server/swift-openapi-async-http-client", from: "1.0.0"),
@@ -69,7 +68,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.45.4"),
.package(url: "https://github.com/yonaskolb/XcodeGen", from: "2.43.0"),
],
targets: [
.systemLibrary(name: "XADI"),
@@ -91,14 +90,11 @@ let package = Package(
],
exclude: ["openapi-generator-config.yaml", "patch.js"]
),
// common utilities shared across xtool targets
.target(name: "XUtils"),
.target(
name: "XKit",
dependencies: [
"DeveloperAPI",
"CXKit",
"XUtils",
.byName(name: "XADI", condition: .when(platforms: [.linux])),
.product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
.product(name: "Dependencies", package: "swift-dependencies"),
@@ -138,6 +134,20 @@ 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: [
@@ -155,7 +165,6 @@ let package = Package(
.target(
name: "PackLib",
dependencies: [
"XUtils",
.product(name: "Yams", package: "Yams"),
.product(name: "XcodeGenKit", package: "XcodeGen", condition: .when(platforms: [.macOS])),
]
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+2 -1
View File
@@ -65,7 +65,7 @@ function openAll(schema, path = []) {
function patch(schema) {
const schemas = schema.components.schemas;
// this field is required iff using the private Xcode API
// this field is required when using the private Xcode API
update(schemas.BundleIdCapabilityCreateRequest.properties.data.properties.relationships, {
properties: {
capability: {
@@ -86,6 +86,7 @@ function patch(schema) {
required: ['data'],
}
},
required: ['capability'],
})
// we don't use this but it triggers a deprecation warning. see:
+56
View File
@@ -0,0 +1,56 @@
import Foundation
package struct TemporaryDirectory: ~Copyable {
private var shouldDelete = true
package let url: URL
package init(name: String) throws {
self.url = FileManager.default.temporaryDirectory.appendingPathComponent(name, isDirectory: true)
_delete()
try FileManager.default.createDirectory(at: url, withIntermediateDirectories: true)
}
private func _delete() {
try? FileManager.default.removeItem(at: url)
}
package consuming func persist() -> URL {
shouldDelete = false
return url
}
package consuming func persist(at location: URL) throws {
try FileManager.default.moveItem(at: url, to: location)
// we do this after moving, so that if the move fails we clean up
shouldDelete = false
}
deinit {
if shouldDelete { _delete() }
}
}
extension Data {
// AsyncBytes is Darwin-only :/
package init(reading fileHandle: FileHandle) async throws {
#if canImport(Darwin)
self = try await fileHandle.bytes.reduce(into: Data()) { $0.append($1) }
#else
self = try fileHandle.readToEnd() ?? Data()
#endif
}
package init(reading file: URL) async throws {
#if canImport(Darwin)
self = try await file.resourceBytes.reduce(into: Data()) { $0.append($1) }
#else
try self.init(contentsOf: file)
#endif
}
}
package func stderrPrint(_ message: String, terminator: String = "\n") {
try? FileHandle.standardError.write(contentsOf: Data("\(message)\(terminator)".utf8))
}
-1
View File
@@ -1,6 +1,5 @@
import Foundation
import Yams
import XUtils
public struct PackSchemaBase: Codable, Sendable {
public enum Version: Int, Codable, Sendable {
+1 -6
View File
@@ -1,5 +1,4 @@
import Foundation
import XUtils
public struct Packer: Sendable {
public let buildSettings: BuildSettings
@@ -147,11 +146,7 @@ public struct Packer: Sendable {
let src = URL(fileURLWithPath: "\(name).framework/\(name)", relativeTo: binDir)
let magic = Data("!<arch>\n".utf8)
let thinMagic = Data("!<thin>\n".utf8)
guard let bytes = try? FileHandle(forReadingFrom: src).read(upToCount: magic.count) else {
// if we can't find the binary, it might be a static framework that SwiftPM
// did not copy into the .build directory. we don't need to pack it anyway.
break
}
let bytes = try FileHandle(forReadingFrom: src).read(upToCount: magic.count)
// if the magic matches one of these it's a static archive; don't embed it.
// https://github.com/apple/llvm-project/blob/e716ff14c46490d2da6b240806c04e2beef01f40/llvm/include/llvm/Object/Archive.h#L33
// swiftlint:disable:previous line_length
+1 -2
View File
@@ -1,5 +1,4 @@
import Foundation
import XUtils
public struct Planner: Sendable {
public var buildSettings: BuildSettings
@@ -214,7 +213,7 @@ public struct Planner: Sendable {
}
private func dumpDependencies() async throws -> PackageDependency {
let tempDir = try TemporaryDirectory(name: "xtool-dump")
let tempDir = try TemporaryDirectory(name: "xtool-dump-\(UUID().uuidString)")
let tempFileURL = tempDir.url.appendingPathComponent("dump.json")
// SwiftPM sometimes prints extraneous data to stdout, so ask
+4 -4
View File
@@ -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: BuildSetting] = [
"PRODUCT_BUNDLE_IDENTIFIER": .string(product.bundleID),
"TARGETED_DEVICE_FAMILY": .string(families.map { "\($0)" }.joined(separator: ",")),
var buildSettings: [String: Any] = [
"PRODUCT_BUNDLE_IDENTIFIER": product.bundleID,
"TARGETED_DEVICE_FAMILY": 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"] = .string((fromProjectToRoot + Path(entitlementsPath)).string)
buildSettings["CODE_SIGN_ENTITLEMENTS"] = fromProjectToRoot + Path(entitlementsPath)
}
let additionalDependencies: [Dependency] = if product.type == .application {
@@ -137,8 +137,8 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
id: appID.id
)
),
// not public but required iff using ds2 API
capability: context.auth.isPublicAPI ? nil : .init(
// not public but required when using ds2 API
capability: .init(
data: .init(
_type: .capabilities,
id: typ
@@ -23,16 +23,6 @@ public struct DeveloperServicesCapability: Sendable, Hashable {
self.isFree = isFree
self.settings = settings
}
public init(
rawName: String,
isFree: Bool,
settings: [Components.Schemas.CapabilitySetting]? = nil
) {
self.capabilityType = .init(value2: rawName)
self.isFree = isFree
self.settings = settings
}
}
protocol EntitlementWithCapability: Entitlement {
@@ -73,13 +73,6 @@ 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 {
@@ -174,7 +174,7 @@ public struct ADIDataProvider: AnisetteDataProvider {
.acceptLanguage: "en_US",
.init(AnisetteData.localUserIDKey)!: self.localUserID,
]
request.headerFields[.init("X-MMe-Country")!] = Locale.current.region?.identifier
request.headerFields[.init("X-MMe-Country")!] = Locale.current.regionCode
request.headerFields[.init(DeviceInfo.clientInfoKey)!] = try await clientInfo()
request.headerFields[.init(DeviceInfo.deviceIDKey)!] = self.localUserUID.uuidString
@@ -54,8 +54,7 @@ public struct AnisetteData {
var dictionary: [String: String] {
// GSA doesn't like "en_US@rg=..."; it has to be just "en_US".
let localeIdentifier = if let language = locale.language.languageCode?.identifier,
let region = locale.region?.identifier {
let localeIdentifier = if let language = locale.languageCode, let region = locale.regionCode {
"\(language)_\(region)"
} else {
"en_US"
@@ -56,14 +56,13 @@ extension DeviceInfo {
private static func fetchHardwareModel() -> String? {
var modelSize = 0
guard sysctlbyname("hw.model", nil, &modelSize, nil, 0) == 0,
modelSize > 0 else { return nil }
return String(unsafeUninitializedCapacity: modelSize) { buf in
var len = modelSize
guard sysctlbyname("hw.model", buf.baseAddress, &len, nil, 0) == 0,
len == modelSize else { return 0 }
return len - 1 // exclude NUL
guard sysctlbyname("hw.model", nil, &modelSize, nil, 0) == 0 else { return nil }
guard let rawString = malloc(modelSize) else { return nil }
guard sysctlbyname("hw.model", rawString, &modelSize, nil, 0) == 0 else {
free(rawString)
return nil
}
return String(bytesNoCopy: rawString, length: modelSize - 1, encoding: .utf8, freeWhenDone: true)
}
public static func current() -> DeviceInfo? {
@@ -92,7 +91,7 @@ extension DeviceInfo {
romAddress: "94f6a300e9a0",
mlbSerialNumber: "C02520301W0GF2D1U",
serialNumber: "C02PQKRJG8WP",
modelID: "Mac16,1"
modelID: "MacBookPro11,5"
)
}
}
@@ -17,8 +17,8 @@ public struct DeviceInfo: Codable, Sendable {
public static let xcodeVersion = "14.2 (14C18)"
public struct ClientInfo: Codable {
public static let macOSVersion = "14.3.1"
public static let macOSBuild = "23D60"
public static let macOSVersion = "10.14.6"
public static let macOSBuild = "18G103"
public static let authKitVersion = "1"
public static let akdVersion = "1.0"
@@ -45,7 +45,7 @@ actor GrandSlamLookupManager {
.init(AnisetteData.timeZoneKey)!: TimeZone.current.identifier,
.init("X-Apple-I-TimeZone-Offset")!: "\(TimeZone.current.secondsFromGMT())"
]
request.headerFields[.init("X-MMe-Country")!] = Locale.current.region?.identifier
request.headerFields[.init("X-MMe-Country")!] = Locale.current.regionCode
let (_, body) = try await httpClient.makeRequest(request)
@@ -2,7 +2,6 @@ import Foundation
import SwiftyMobileDevice
import ConcurrencyExtras
import Dependencies
import XUtils
extension LockdownClient {
static let installerLabel = "xtool"
@@ -45,13 +44,19 @@ 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
private var appInstaller: AppInstaller?
private let tempDir = FileManager.default.temporaryDirectoryShim
.appendingPathComponent("sh.xtool.Staging")
private var stage: String?
private nonisolated let updateTask = LockIsolated<Task<Void, Never>?>(nil)
@@ -99,10 +104,16 @@ 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
}
@@ -135,7 +146,7 @@ public actor IntegratedInstaller {
}
}
private func fetchPairingKeys(with lockdownClient: LockdownClient, udid: String) async throws -> Data {
private func fetchPairingKeys(with lockdownClient: LockdownClient) 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")
@@ -192,17 +203,15 @@ public actor IntegratedInstaller {
}
@discardableResult
public func install(
app: URL,
udid: String,
lookupMode: LookupMode,
configureDevice: Bool,
) async throws -> String {
public func install(app: URL) async throws -> String {
try await self.updateStage(to: "Unpacking app", initialProgress: nil)
let _tempDir = try TemporaryDirectory(name: "staging")
let tempDir = _tempDir.url
defer { withExtendedLifetime(_tempDir) {} }
if FileManager.default.fileExists(atPath: tempDir.path) {
try? FileManager.default.removeItem(at: tempDir)
}
try FileManager.default.createDirectory(at: tempDir, withIntermediateDirectories: true)
defer { try? FileManager.default.removeItem(at: tempDir) }
switch app.pathExtension {
case "ipa":
@@ -226,7 +235,7 @@ public actor IntegratedInstaller {
try await self.updateProgress(to: 1)
let payload = tempDir.appendingPathComponent("Payload")
let payload = self.tempDir.appendingPathComponent("Payload")
guard let appDir = payload.implicitContents.first(where: { $0.pathExtension == "app" })
else { throw Error.appExtractionFailed }
@@ -250,7 +259,7 @@ public actor IntegratedInstaller {
let deviceName = try lockdownClient.deviceName()
let pairingKeys: Data? = if configureDevice {
try await fetchPairingKeys(with: lockdownClient, udid: udid)
try await fetchPairingKeys(with: lockdownClient)
} else {
nil
}
@@ -258,9 +267,30 @@ public actor IntegratedInstaller {
try await updateProgress(to: 1)
let bundleID = try await signInPlace(
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(
app: appDir,
targetDevice: .init(udid: udid, name: deviceName),
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
}
)
try await self.updateStage(to: "Packaging", initialProgress: nil)
@@ -289,39 +319,6 @@ 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
@@ -33,6 +33,7 @@ extension EntitlementContainer {
public struct ApplicationIdentifierEntitlement: Entitlement, RawRepresentable {
public static let identifier = "application-identifier"
public static let isFree = true
public var rawValue: String
public init(rawValue: String) { self.rawValue = rawValue }
@@ -40,6 +41,7 @@ public struct ApplicationIdentifierEntitlement: Entitlement, RawRepresentable {
public struct TeamIdentifierEntitlement: Entitlement, RawRepresentable {
public static let identifier = "com.apple.developer.team-identifier"
public static let isFree = true
public var rawValue: String
public init(rawValue: String) { self.rawValue = rawValue }
@@ -47,6 +49,7 @@ public struct TeamIdentifierEntitlement: Entitlement, RawRepresentable {
public struct KeychainAccessGroupsEntitlement: Entitlement, RawRepresentable {
public static let identifier = "keychain-access-groups"
public static let isFree = true
public var rawValue: [String]
public init(rawValue: [String]) { self.rawValue = rawValue }
@@ -63,6 +66,10 @@ public struct KeychainAccessGroupsEntitlement: Entitlement, RawRepresentable {
public struct AppGroupEntitlement: Entitlement, RawRepresentable {
public static let identifier = "com.apple.security.application-groups"
// FIXME: Enable app groups on free accounts
// but first we need to fix the bug where it only assigns one
// app group even if the ents say there are multiple
public static let isFree = false
public var rawValue: [DeveloperServicesAppGroup.GroupID]
public init(rawValue: [DeveloperServicesAppGroup.GroupID]) { self.rawValue = rawValue }
@@ -78,6 +85,7 @@ public struct AppGroupEntitlement: Entitlement, RawRepresentable {
public struct GetTaskAllowEntitlement: Entitlement, RawRepresentable {
public static let identifier = "get-task-allow"
public static let isFree = true
public var rawValue: Bool
public init(rawValue: Bool) { self.rawValue = rawValue }
@@ -85,6 +93,7 @@ public struct GetTaskAllowEntitlement: Entitlement, RawRepresentable {
public struct AssociatedDomainsEntitlement: Entitlement, RawRepresentable {
public static let identifier = "com.apple.developer.associated-domains"
public static let isFree = false
public var rawValue: [String]
public init(rawValue: [String]) { self.rawValue = rawValue }
@@ -100,6 +109,7 @@ public struct AssociatedDomainsEntitlement: Entitlement, RawRepresentable {
public enum APSEnvironmentEntitlement: String, Entitlement {
public static let identifier = "aps-environment"
public static let isFree = false
case development
case production
@@ -107,6 +117,7 @@ public enum APSEnvironmentEntitlement: String, Entitlement {
public enum DataProtectionEntitlement: String, Entitlement {
public static let identifier = "com.apple.developer.default-data-protection"
public static let isFree = true
case complete = "NSFileProtectionComplete"
case unlessOpen = "NSFileProtectionCompleteUnlessOpen"
@@ -115,6 +126,7 @@ public enum DataProtectionEntitlement: String, Entitlement {
public struct NetworkExtensionEntitlement: Entitlement, RawRepresentable {
public static let identifier = "com.apple.developer.networking.networkextension"
public static let isFree = false
public var rawValue: Bool
public init(rawValue: Bool) { self.rawValue = rawValue }
@@ -122,6 +134,7 @@ public struct NetworkExtensionEntitlement: Entitlement, RawRepresentable {
public struct MultipathEntitlement: Entitlement, RawRepresentable {
public static let identifier = "com.apple.developer.networking.multipath"
public static let isFree = false
public var rawValue: Bool
public init(rawValue: Bool) { self.rawValue = rawValue }
@@ -129,6 +142,7 @@ public struct MultipathEntitlement: Entitlement, RawRepresentable {
public struct VPNConfigurationEntitlement: Entitlement, RawRepresentable {
public static let identifier = "com.apple.networking.vpn.configuration"
public static let isFree = false
public var rawValue: Bool
public init(rawValue: Bool) { self.rawValue = rawValue }
@@ -136,6 +150,7 @@ public struct VPNConfigurationEntitlement: Entitlement, RawRepresentable {
public struct SiriKitEntitlement: Entitlement, RawRepresentable {
public static let identifier = "com.apple.developer.siri"
public static let isFree = false
public var rawValue: Bool
public init(rawValue: Bool) { self.rawValue = rawValue }
@@ -143,6 +158,7 @@ public struct SiriKitEntitlement: Entitlement, RawRepresentable {
public struct InterAppAudioEntitlement: Entitlement, RawRepresentable {
public static let identifier = "inter-app-audio"
public static let isFree = true
public var rawValue: Bool
public init(rawValue: Bool) { self.rawValue = rawValue }
@@ -150,6 +166,7 @@ public struct InterAppAudioEntitlement: Entitlement, RawRepresentable {
public struct WirelessAccessoryEntitlement: Entitlement, RawRepresentable {
public static let identifier = "com.apple.external-accessory.wireless-configuration"
public static let isFree = true
public var rawValue: Bool
public init(rawValue: Bool) { self.rawValue = rawValue }
@@ -157,6 +174,7 @@ public struct WirelessAccessoryEntitlement: Entitlement, RawRepresentable {
public struct HomeKitEntitlement: Entitlement, RawRepresentable {
public static let identifier = "com.apple.developer.homekit"
public static let isFree = true
public var rawValue: Bool
public init(rawValue: Bool) { self.rawValue = rawValue }
@@ -164,6 +182,7 @@ public struct HomeKitEntitlement: Entitlement, RawRepresentable {
public struct HealthKitEntitlement: Entitlement, RawRepresentable {
public static let identifier = "com.apple.developer.healthkit"
public static let isFree = true
public var rawValue: Bool
public init(rawValue: Bool) { self.rawValue = rawValue }
+4 -2
View File
@@ -138,9 +138,11 @@ public struct KeychainStorage: KeyValueStorage {
private func makeQuery(forKey key: String, _ parameters: [CFString: Any]) -> CFDictionary {
var query: [CFString: Any] = [
kSecClass: kSecClassGenericPassword,
kSecAttrAccount: key,
kSecUseDataProtectionKeychain: true,
kSecAttrAccount: key
]
if #available(macOS 10.15, *) {
query[kSecUseDataProtectionKeychain] = true
}
query[kSecAttrService] = service
query.merge(parameters) { _, b in b }
return query as CFDictionary
+2 -9
View File
@@ -48,15 +48,8 @@ extension AuthToken {
private static let decoder = JSONDecoder()
static func saved() throws -> Self {
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
throw Console.Error("Please log in with `xtool auth` before running this command.")
}
return try decoder.decode(AuthToken.self, from: data)
}
@@ -70,7 +63,7 @@ extension AuthToken {
try Self.storage.setData(data, forKey: "XTLAuthToken")
}
func authData() -> DeveloperAPIAuthData {
func authData() throws -> DeveloperAPIAuthData {
switch self {
case .appStoreConnect(let data):
return .appStoreConnect(.init(id: data.id, issuerID: data.issuerID, pem: data.pem))
+12 -44
View File
@@ -3,7 +3,6 @@ import ArgumentParser
import PackLib
import XKit
import Dependencies
import XUtils
struct PackOperation {
struct BuildOptions: ParsableArguments {
@@ -80,7 +79,7 @@ struct PackOperation {
}
return try await group.reduce(into: [:]) { $0[$1.0] = $1.1 }
}
print("Applying entitlements...")
print("Pseudo-signing...")
try await Signer.first().sign(
app: bundle,
identity: .adhoc,
@@ -117,12 +116,6 @@ 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
@@ -134,44 +127,21 @@ struct DevBuildCommand: AsyncParsableCommand {
) var triple: String?
func run() async throws {
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
finalURL = url.deletingPathExtension().appendingPathExtension("ipa")
let tmpDir = try TemporaryDirectory(name: "Payload")
let payloadDir = tmpDir.url
let tmpDir = try TemporaryDirectory(name: "sh.xtool.tmp")
let payloadDir = tmpDir.url.appendingPathComponent("Payload", isDirectory: true)
try FileManager.default.createDirectory(
at: payloadDir,
withIntermediateDirectories: true
)
try FileManager.default.moveItem(at: url, to: payloadDir.appendingPathComponent(url.lastPathComponent))
let ipaURL = try await compressor.compress(directory: payloadDir) { progress in
if let progress {
@@ -244,19 +214,17 @@ struct DevRunCommand: AsyncParsableCommand {
let installDelegate = XToolInstallerDelegate()
let installer = IntegratedInstaller(
auth: token.authData(),
udid: client.udid,
lookupMode: .only(client.connectionType),
auth: try token.authData(),
configureDevice: false,
delegate: installDelegate
)
defer { print() }
do {
try await installer.install(
app: output,
udid: client.udid,
lookupMode: .only(client.connectionType),
configureDevice: false,
)
try await installer.install(app: output)
} catch let error as CancellationError {
throw error
} catch {
+5 -7
View File
@@ -24,17 +24,15 @@ struct InstallCommand: AsyncParsableCommand {
let installDelegate = XToolInstallerDelegate()
let installer = IntegratedInstaller(
auth: token.authData(),
udid: client.udid,
lookupMode: .only(client.connectionType),
auth: try token.authData(),
configureDevice: false,
delegate: installDelegate
)
do {
try await installer.install(
app: URL(fileURLWithPath: path),
udid: client.udid,
lookupMode: .only(client.connectionType),
configureDevice: false,
)
try await installer.install(app: URL(fileURLWithPath: path))
print("\nSuccessfully installed!")
} catch let error as CancellationError {
throw error
+1 -5
View File
@@ -18,10 +18,7 @@ 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)'.
See 'xtool help sdk' for usage.
""")
throw Console.Error("Could not read file or directory at path '\(path)'")
}
let url = URL(fileURLWithPath: path)
@@ -142,7 +139,6 @@ struct SDKBuilder {
},
"swiftCompiler": {
"extraCLIOptions": [
"-Xfrontend", "-enable-cross-import-overlays",
"-use-ld=lld"
]
}
+3 -5
View File
@@ -4,7 +4,6 @@ import Version
import ArgumentParser
import Dependencies
import PackLib
import XUtils
struct SDKCommand: AsyncParsableCommand {
static let configuration = CommandConfiguration(
@@ -243,15 +242,14 @@ struct InstallSDKOperation {
#if os(macOS)
print("Skipping SDK install; the iOS SDK ships with Xcode on macOS")
#else
// validate input before removing existing SDK
let input = try SDKBuilder.Input(path: path)
let arch = try ArchSelection.auto.sdkBuilderArch
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()
-6
View File
@@ -1,11 +1,9 @@
import Foundation
import XKit
import ArgumentParser
import XUtils
public enum XTool {
public static func run(arguments: [String]? = nil) async throws {
TemporaryDirectory.prepare()
await XToolCommand.cancellableMain(arguments)
}
}
@@ -66,10 +64,6 @@ extension ParsableCommand where Self: SendableMetatype {
print("Cancelled.")
self.exit()
} catch {
if ProcessInfo.processInfo.environment["XTL_DEBUG_ERRORS"] != nil {
print("ERROR DETAILS:")
print(String(reflecting: error))
}
self.exit(withError: error)
}
}
-25
View File
@@ -1,25 +0,0 @@
import Foundation
extension Data {
// AsyncBytes is Darwin-only :/
package init(reading fileHandle: FileHandle) async throws {
#if canImport(Darwin)
self = try await fileHandle.bytes.reduce(into: Data()) { $0.append($1) }
#else
self = try fileHandle.readToEnd() ?? Data()
#endif
}
package init(reading file: URL) async throws {
#if canImport(Darwin)
self = try await file.resourceBytes.reduce(into: Data()) { $0.append($1) }
#else
try self.init(contentsOf: file)
#endif
}
}
package func stderrPrint(_ message: String, terminator: String = "\n") {
try? FileHandle.standardError.write(contentsOf: Data("\(message)\(terminator)".utf8))
}
-106
View File
@@ -1,106 +0,0 @@
import Foundation
package struct TemporaryDirectory: ~Copyable {
private static let debugTmp = ProcessInfo.processInfo.environment["XTL_DEBUG_TMP"] != nil
private var shouldDelete: Bool
package let url: URL
/// Prepares a fresh tmpdir root.
///
/// Optional, but try calling this at launch to clean up old resources.
package static func prepare() {
_ = TemporaryDirectoryRoot.shared
}
/// Creates a temporary directory where `lastPathComponent` is exactly `name`.
///
/// The directory is deleted on deinit or (if the object never deinits) on next launch.
/// To save the contents, move them elsewhere with ``persist(at:)``.
package init(name: String) throws {
do {
let basename = name.replacingOccurrences(of: ".", with: "_")
self.url = try TemporaryDirectoryRoot.shared.url
// ensures uniqueness
.appendingPathComponent("tmp-\(basename)-\(UUID().uuidString)")
.appendingPathComponent(name, isDirectory: true)
self.shouldDelete = true
} catch {
// non-copyable types can't be partially initialized so we need a stub value
self.url = URL(fileURLWithPath: "")
self.shouldDelete = false
throw error
}
try FileManager.default.createDirectory(at: url, withIntermediateDirectories: true)
if Self.debugTmp {
stderrPrint("Created TemporaryDirectory: \(url.path)")
}
}
private func _delete() {
guard !Self.debugTmp else { return }
try? FileManager.default.removeItem(at: url)
}
package consuming func persist(at location: URL) throws {
try FileManager.default.moveItem(at: url, to: location)
// we do this after moving, so that if the move fails we clean up
shouldDelete = false
}
deinit {
if shouldDelete { _delete() }
}
}
private struct TemporaryDirectoryRoot {
static let shared = TemporaryDirectoryRoot()
private let _url: Result<URL, Errors>
var url: URL {
get throws(Errors) {
try _url.get()
}
}
private init() {
let url: URL
let env = ProcessInfo.processInfo.environment
if let tmpdir = env["XTL_TMPDIR"] ?? env["TMPDIR"] {
url = URL(fileURLWithPath: tmpdir).appendingPathComponent("sh.xtool")
} else {
#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
}
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._url = .success(url)
}
enum Errors: Error, CustomStringConvertible {
case tmpdirCreationFailed(URL, Error)
var description: String {
switch self {
case let .tmpdirCreationFailed(url, error):
"Could not create temporary directory at '\(url.path)': \(error)"
}
}
}
}
@@ -0,0 +1,71 @@
//
// 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")
}
}
@@ -0,0 +1,67 @@
//
// 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)
}
}
@@ -0,0 +1,90 @@
//
// 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
+32
View File
@@ -0,0 +1,32 @@
//
// 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)
}()
}
@@ -0,0 +1,62 @@
//
// 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)
)
}
}
@@ -0,0 +1,16 @@
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
}
)
}()
@@ -0,0 +1,32 @@
{
"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": "",
}
+1 -5
View File
@@ -1,8 +1,4 @@
/XToolMac.xcodeproj/*
!/XToolMac.xcodeproj/project.xcworkspace
/XToolMac.xcodeproj/project.xcworkspace/*
!/XToolMac.xcodeproj/project.xcworkspace/xcshareddata
/XToolMac.xcodeproj
Private*.xcconfig
/fastlane/README.md
+5
View File
@@ -2,3 +2,8 @@ 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 -68
View File
@@ -1,41 +1,40 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.8)
CFPropertyList (3.0.7)
base64
nkf
rexml
abbrev (0.1.2)
addressable (2.9.0)
public_suffix (>= 2.0.2, < 8.0)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
artifactory (3.0.17)
atomos (0.1.3)
aws-eventstream (1.4.0)
aws-partitions (1.1249.0)
aws-sdk-core (3.247.0)
aws-partitions (1.1118.0)
aws-sdk-core (3.226.0)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.992.0)
aws-sigv4 (~> 1.9)
base64
bigdecimal
jmespath (~> 1, >= 1.6.1)
logger
aws-sdk-kms (1.125.0)
aws-sdk-core (~> 3, >= 3.247.0)
aws-sdk-kms (1.105.0)
aws-sdk-core (~> 3, >= 3.225.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.222.0)
aws-sdk-core (~> 3, >= 3.247.0)
aws-sdk-s3 (1.190.0)
aws-sdk-core (~> 3, >= 3.225.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)
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)
@@ -43,7 +42,7 @@ GEM
dotenv (2.8.1)
emoji_regex (3.2.3)
excon (0.112.0)
faraday (1.10.5)
faraday (1.10.4)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
@@ -55,36 +54,32 @@ GEM
faraday-rack (~> 1.0)
faraday-retry (~> 1.0)
ruby2_keywords (>= 0.0.4)
faraday-cookie_jar (0.0.8)
faraday-cookie_jar (0.0.7)
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.2.0)
faraday-multipart (1.1.1)
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.4)
faraday-retry (1.0.3)
faraday_middleware (1.2.1)
faraday (~> 1.0)
fastimage (2.4.1)
fastlane (2.234.0)
CFPropertyList (>= 2.3, < 5.0.0)
abbrev (~> 0.1)
fastimage (2.4.0)
fastlane (2.228.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
aws-sdk-s3 (~> 1.197)
aws-sdk-s3 (~> 1.0)
babosa (>= 1.0.3, < 2.0.0)
base64 (~> 0.2)
benchmark (>= 0.1.0)
bundler (>= 1.17.3, < 5.0.0)
bundler (>= 1.12.0, < 3.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)
@@ -92,24 +87,20 @@ GEM
faraday-cookie_jar (~> 0.0.6)
faraday_middleware (~> 1.0)
fastimage (>= 2.1.0, < 3.0.0)
fastlane-sirp (>= 1.1.0)
fastlane-sirp (>= 1.0.0)
gh_inspector (>= 1.1.2, < 2.0.0)
google-apis-androidpublisher_v3 (~> 0.3)
google-apis-playcustomapp_v1 (~> 0.1)
google-cloud-env (>= 1.6.0, <= 2.1.1)
google-cloud-env (>= 1.6.0, < 2.0.0)
google-cloud-storage (~> 1.31)
highline (~> 2.0)
http-cookie (~> 1.0.5)
json (< 3.0.0)
jwt (>= 2.1.0, < 3)
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)
@@ -125,42 +116,41 @@ GEM
fastlane-plugin-brew (0.1.1)
fastlane-plugin-xcodegen (1.1.0)
fastlane-plugin-brew (~> 0.1.1)
fastlane-sirp (1.1.0)
fastlane-sirp (1.0.0)
sysrandom (~> 1.0)
gh_inspector (1.1.3)
google-apis-androidpublisher_v3 (0.100.0)
google-apis-core (>= 0.15.0, < 2.a)
google-apis-core (0.18.0)
google-apis-androidpublisher_v3 (0.54.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-core (0.11.3)
addressable (~> 2.5, >= 2.5.1)
googleauth (~> 1.9)
httpclient (>= 2.8.3, < 3.a)
googleauth (>= 0.16.2, < 2.a)
httpclient (>= 2.8.1, < 3.a)
mini_mime (~> 1.0)
mutex_m
representable (~> 3.0)
retriable (>= 2.0, < 4.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)
rexml
google-apis-iamcredentials_v1 (0.17.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-playcustomapp_v1 (0.13.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-storage_v1 (0.31.0)
google-apis-core (>= 0.11.0, < 2.a)
google-cloud-core (1.8.0)
google-cloud-env (>= 1.0, < 3.a)
google-cloud-errors (~> 1.0)
google-cloud-env (2.1.1)
faraday (>= 1.0, < 3.a)
google-cloud-errors (1.6.0)
google-cloud-storage (1.60.0)
google-cloud-env (1.6.0)
faraday (>= 0.17.3, < 3.0)
google-cloud-errors (1.5.0)
google-cloud-storage (1.47.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
google-apis-core (>= 0.18, < 2)
google-apis-iamcredentials_v1 (~> 0.18)
google-apis-storage_v1 (>= 0.42)
google-apis-iamcredentials_v1 (~> 0.1)
google-apis-storage_v1 (~> 0.31.0)
google-cloud-core (~> 1.6)
googleauth (~> 1.9)
googleauth (>= 0.16.2, < 2.a)
mini_mime (~> 1.0)
googleauth (1.11.2)
faraday (>= 1.0, < 3.a)
google-cloud-env (~> 2.1)
googleauth (1.8.1)
faraday (>= 0.17.3, < 3.a)
jwt (>= 1.4, < 3.0)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
@@ -171,42 +161,43 @@ GEM
httpclient (2.9.0)
mutex_m
jmespath (1.6.2)
json (2.19.5)
jwt (2.10.2)
json (2.12.2)
jwt (2.10.1)
base64
logger (1.7.0)
mini_magick (4.13.2)
mini_mime (1.1.5)
multi_json (1.21.1)
multi_json (1.15.0)
multipart-post (2.4.1)
mutex_m (0.3.0)
nanaimo (0.4.0)
naturally (2.3.0)
nkf (0.2.0)
optparse (0.8.1)
optparse (0.6.0)
os (1.1.4)
ostruct (0.6.3)
ostruct (0.6.2)
plist (3.7.2)
public_suffix (7.0.5)
rake (13.4.2)
public_suffix (6.0.2)
rake (13.3.0)
representable (3.2.0)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (3.4.1)
rexml (3.4.4)
retriable (3.1.2)
rexml (3.4.1)
rouge (3.28.0)
ruby2_keywords (0.0.5)
rubyzip (2.4.1)
security (0.1.5)
signet (0.21.0)
signet (0.20.0)
addressable (~> 2.8)
faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 4.0)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simctl (1.6.10)
CFPropertyList
naturally
sysrandom (1.0.5)
terminal-notifier (2.0.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
@@ -235,8 +226,11 @@ PLATFORMS
ruby
DEPENDENCIES
abbrev
fastlane
fastlane-plugin-xcodegen
mutex_m
ostruct
BUNDLED WITH
2.6.7
@@ -1 +0,0 @@
../../../../Package.resolved
+11 -1
View File
@@ -5,7 +5,7 @@ struct XToolMacUI: App {
WindowGroup {
ContentView()
}
.windowResizability(.contentSize)
.disableWindowResizingIfPossible()
}
}
@@ -64,6 +64,16 @@ private struct StepView<Content: View>: View {
}
}
extension Scene {
fileprivate func disableWindowResizingIfPossible() -> some Scene {
if #available(macOS 13, *) {
return self.windowResizability(.contentSize)
} else {
return self
}
}
}
#Preview {
ContentView()
}
+2
View File
@@ -1,3 +1,5 @@
require_relative "spaceship_patch"
default_platform(:mac)
ENV["FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT"] = "120"
+16
View File
@@ -0,0 +1,16 @@
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
View File
@@ -11,7 +11,7 @@ targets:
XToolMac:
type: application
platform: macOS
deploymentTarget: "13.0"
deploymentTarget: "12.0"
sources:
- path: XToolMac
- path: Resources/xtool
+1 -1
View File
@@ -5,7 +5,7 @@
base = "Documentation/"
publish = "xtool.docc/.docc-build"
command = "./build.sh"
environment = { SWIFT_VERSION = "6.3" }
environment = { SWIFT_VERSION = "6.1" }
ignore = "git -C .. diff --quiet $CACHED_COMMIT_REF $COMMIT_REF -- Documentation netlify.toml"
[[redirects]]