mirror of
https://github.com/xtool-org/xtool.git
synced 2026-11-21 02:41:46 +03:00
Compare commits
2 Commits
@@ -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
|
||||
+14
-26
@@ -1,11 +1,5 @@
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
pull_request:
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
- push
|
||||
jobs:
|
||||
build-linux:
|
||||
strategy:
|
||||
@@ -19,29 +13,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 \
|
||||
|
||||
@@ -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,19 +0,0 @@
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
pull_request:
|
||||
paths:
|
||||
- '.github/workflows/swiftlint.yml'
|
||||
- '.swiftlint.yml'
|
||||
- '**/*.swift'
|
||||
jobs:
|
||||
swiftlint:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
- name: Lint
|
||||
run: |
|
||||
make lint SWIFTLINT_FLAGS='--reporter=github-actions-logging' | tee swiftlint.log
|
||||
# fail if there are any errors or warnings
|
||||
! grep -Eq '^::(error|warning)' swiftlint.log
|
||||
@@ -12,4 +12,3 @@ DerivedData/
|
||||
.docc-build
|
||||
|
||||
/openapi
|
||||
/.tmp
|
||||
|
||||
@@ -1,73 +0,0 @@
|
||||
swiftlint_version: 0.59.1
|
||||
disabled_rules:
|
||||
- trailing_comma
|
||||
- nesting
|
||||
- fallthrough
|
||||
- shorthand_operator
|
||||
- todo
|
||||
- large_tuple
|
||||
- identifier_name
|
||||
- type_name
|
||||
- unneeded_override
|
||||
- optional_data_string_conversion
|
||||
- for_where
|
||||
- blanket_disable_command
|
||||
opt_in_rules:
|
||||
- closure_end_indentation
|
||||
- closure_spacing
|
||||
- empty_count
|
||||
- explicit_init
|
||||
- fatal_error_message
|
||||
- first_where
|
||||
- implicit_return
|
||||
- joined_default_parameter
|
||||
- literal_expression_end_indentation
|
||||
- overridden_super_call
|
||||
- prohibited_super_call
|
||||
- sorted_first_last
|
||||
- unneeded_parentheses_in_closure_argument
|
||||
- vertical_parameter_alignment_on_call
|
||||
- yoda_condition
|
||||
- nslocalizedstring_key
|
||||
- unused_setter_value
|
||||
- optional_enum_case_matching
|
||||
- prefer_self_type_over_type_of_self
|
||||
- contains_over_range_nil_comparison
|
||||
- flatmap_over_map_reduce
|
||||
- empty_collection_literal
|
||||
- contains_over_first_not_nil
|
||||
- contains_over_filter_count
|
||||
- contains_over_filter_is_empty
|
||||
- reduce_into
|
||||
analyzer_rules:
|
||||
- unused_import
|
||||
custom_rules:
|
||||
spaces_not_tabs:
|
||||
name: "Spaces not Tabs"
|
||||
regex: ^\t
|
||||
message: "Use four spaces, not tabs"
|
||||
point_zero:
|
||||
name: "Point Zero"
|
||||
regex: '(?<!iOS\s)(?<!macOS\s)(?<!\.)\b[\d_]+\.0\b'
|
||||
match_kinds:
|
||||
- number
|
||||
- attribute.builtin
|
||||
message: "Don't add a .0 to the end of floating point literals"
|
||||
force_try: warning
|
||||
force_cast: warning
|
||||
function_body_length: 100
|
||||
line_length: 135
|
||||
file_length: 1000
|
||||
type_body_length: 500
|
||||
cyclomatic_complexity: 12
|
||||
function_parameter_count: 7
|
||||
implicit_return:
|
||||
included:
|
||||
- closure
|
||||
included:
|
||||
- Package.swift
|
||||
- Sources
|
||||
- Tests
|
||||
- macOS/XToolMac
|
||||
excluded:
|
||||
- Sources/DeveloperAPI/Generated
|
||||
@@ -1 +0,0 @@
|
||||
/launch.json
|
||||
Vendored
-6
@@ -1,6 +0,0 @@
|
||||
{
|
||||
"recommendations": [
|
||||
"swiftlang.swift-vscode",
|
||||
"vknabel.vscode-swiftlint",
|
||||
]
|
||||
}
|
||||
Vendored
-13
@@ -1,13 +0,0 @@
|
||||
{
|
||||
"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.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 \
|
||||
|
||||
@@ -1,143 +0,0 @@
|
||||
# Create App Extensions
|
||||
|
||||
Add app extensions to your iOS app.
|
||||
|
||||
## Overview
|
||||
|
||||
iOS includes several [App Extension Points](https://developer.apple.com/documentation/technologyoverviews/app-extensions) to deeply integrate with system functionality: such as Widgets, Share Extensions, and Safari Extensions. With a little setup, you can create App Extensions with xtool.
|
||||
|
||||
This guide will show you how to add a **Widget Extension** to your app. The steps are similar for other extensions as well.
|
||||
|
||||
> Note: This guide assumes you already have an xtool-based application up and running. If you don't, create one first with <doc:First-app>.
|
||||
|
||||
## Step 1: Add a new product
|
||||
|
||||
Start by adding a new product declaration to your `Package.swift`.
|
||||
|
||||
```diff
|
||||
// swift-tools-version: 6.0
|
||||
|
||||
import PackageDescription
|
||||
|
||||
let package = Package(
|
||||
name: "Hello",
|
||||
platforms: [.iOS(.v17)],
|
||||
products: [
|
||||
.library(
|
||||
name: "Hello",
|
||||
targets: ["Hello"]
|
||||
),
|
||||
+ .library(
|
||||
+ name: "HelloWidget",
|
||||
+ targets: ["HelloWidget"]
|
||||
+ ),
|
||||
],
|
||||
targets: [
|
||||
.target(name: "Hello"),
|
||||
+ .target(name: "HelloWidget"),
|
||||
]
|
||||
)
|
||||
```
|
||||
|
||||
## Step 2: Update xtool.yml
|
||||
|
||||
Now that we have two products, we'll need to tell xtool which one corresponds to the _application_ and which one corresponds to the _extension_.
|
||||
|
||||
You should already have a bare-bones `xtool.yml` file that describes metadata about your package (the bundle ID, at the bare minimum.) We'll add the new information to this file.
|
||||
|
||||
```diff
|
||||
version: 1
|
||||
bundleID: com.example.Hello
|
||||
+ product: Hello
|
||||
+ extensions:
|
||||
+ - product: HelloWidget
|
||||
+ infoPath: HelloWidget-Info.plist
|
||||
```
|
||||
|
||||
## Step 3: Add an Info.plist
|
||||
|
||||
App extensions require an `Info.plist` file that tells the system what kind of extension they are, amongst other things. In the previous step, we promised xtool that this file will be located at `./HelloWidget-Info.plist` in your project. We'll now create this file.
|
||||
|
||||
```xml
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>NSExtension</key>
|
||||
<dict>
|
||||
<key>NSExtensionPointIdentifier</key>
|
||||
<string>com.apple.widgetkit-extension</string>
|
||||
</dict>
|
||||
</dict>
|
||||
</plist>
|
||||
```
|
||||
|
||||
> Note:
|
||||
>
|
||||
> The value `com.apple.widgetkit-extension` tells the system that this is a Widget Extension. If you're creating a different type of Extension, your `Info.plist` might look different.
|
||||
>
|
||||
> For a list of possible `NSExtensionPointIdentifier` values, see [Apple's documentation](https://developer.apple.com/documentation/bundleresources/information-property-list/nsextension/nsextensionpointidentifier) on the subject. You may also need other keys like `NSExtensionPrincipalClass`: refer to Apple's ~better~ legacy [documentation library](https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/AppExtensionKeys.html) for details.
|
||||
>
|
||||
> Finally, note that the above refers to the old paradigm of **Foundation Extensions**. Apple has started moving towards a newer framework called **ExtensionKit** for recent extension types. The main difference for extension consumers is that you replace `NSExtension -> EXAppExtensionAttributes`, and `NSExtensionPointIdentifier -> EXExtensionPointIdentifier`. xtool doesn't support ExtensionKit yet, but it's [planned](https://github.com/xtool-org/xtool/issues/138).
|
||||
|
||||
## Step 4: Code your widget
|
||||
|
||||
We can finally write the code for the widget. Create a new file at `Sources/HelloWidget/Widget.swift` with these contents:
|
||||
|
||||
```swift
|
||||
import WidgetKit
|
||||
import SwiftUI
|
||||
|
||||
@main struct Bundle: WidgetBundle {
|
||||
var body: some Widget {
|
||||
HelloWidget()
|
||||
}
|
||||
}
|
||||
|
||||
struct HelloWidget: Widget {
|
||||
var body: some WidgetConfiguration {
|
||||
StaticConfiguration(
|
||||
kind: "HelloWidget",
|
||||
provider: Provider()
|
||||
) { entry in
|
||||
VStack {
|
||||
Text(entry.date, style: .date)
|
||||
}
|
||||
.containerBackground(.fill.tertiary, for: .widget)
|
||||
}
|
||||
.configurationDisplayName("HelloWidget")
|
||||
.description("This is an example widget.")
|
||||
}
|
||||
|
||||
struct Entry: TimelineEntry {
|
||||
var date = Date()
|
||||
}
|
||||
|
||||
struct Provider: TimelineProvider {
|
||||
func placeholder(in context: Context) -> Entry {
|
||||
Entry()
|
||||
}
|
||||
|
||||
func getSnapshot(
|
||||
in context: Context,
|
||||
completion: @escaping (Entry) -> Void
|
||||
) {
|
||||
completion(Entry())
|
||||
}
|
||||
|
||||
func getTimeline(
|
||||
in context: Context,
|
||||
completion: @escaping (Timeline<Entry>) -> Void
|
||||
) {
|
||||
completion(Timeline(
|
||||
entries: [Entry()],
|
||||
policy: .after(.now + 3600)
|
||||
))
|
||||
}
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
> Note: Blindly refreshing once an hour isn't a great strategy in practice but it makes for a short snippet. I never said this was a tutorial on writing _good_ WidgetKit code; there's plenty of other resources online if that's your goal, including Apple's own [documentation](https://developer.apple.com/documentation/widgetkit).
|
||||
|
||||
Finally, build and run with `xtool dev`. You should be able to locate the widget in your widget library and add it to your home screen!
|
||||
@@ -107,36 +107,3 @@ iconPath: Resources/AppIcon.png
|
||||
> Tip:
|
||||
>
|
||||
> Your app icon must be a png, and it should ideally have a resolution of 1024x1024px.
|
||||
|
||||
## Add entitlements
|
||||
|
||||
You may need to add special [entitlements](https://developer.apple.com/documentation/bundleresources/entitlements) to your app, for example you need the `com.apple.developer.homekit` entitlement in order to connect to HomeKit devices.
|
||||
|
||||
First create an `App.entitlements` file with the necessary entitlements:
|
||||
|
||||
```plist
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>com.apple.developer.homekit</key>
|
||||
<true/>
|
||||
</dict>
|
||||
</plist>
|
||||
```
|
||||
|
||||
Then, tell xtool about it via `xtool.yml`:
|
||||
|
||||
```yaml
|
||||
entitlementsPath: App.entitlements
|
||||
```
|
||||
|
||||
> Troubleshooting:
|
||||
>
|
||||
> There are a number of situations in which xtool may not be able to successfully apply an entitlement to your app.
|
||||
>
|
||||
> - Some entitlements, such as [Network Extension](https://developer.apple.com/documentation/bundleresources/entitlements/com.apple.developer.networking.networkextension), don't work with free developer accounts. You might need to enrol in one of the Apple Developer Programs to use these.
|
||||
> - Other entitlements, like [User Notifications Filtering](https://developer.apple.com/documentation/bundleresources/entitlements/com.apple.developer.usernotifications.filtering), require special permission from Apple. If you do have the appropriate permission, these may or may not work with xtool.
|
||||
> - Many entitlements require specific "Capabilities" to be enabled on your app in the Developer Services portal. xtool handles this for you, but we need to add code to xtool for each Entitlement-Capability mapping. If you run into a Capability that we don't handle yet, please let us know.
|
||||
>
|
||||
> Entitlements are a large surface area. If you find any bugs or missing functionality, please [create a GitHub Issue](https://github.com/xtool-org/xtool/issues/new/choose).
|
||||
|
||||
@@ -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:
|
||||
>
|
||||
|
||||
@@ -31,4 +31,3 @@ xtool is a cross-platform (Linux/WSL/macOS) tool that replicates Xcode functiona
|
||||
### Common tasks
|
||||
|
||||
- <doc:Control>
|
||||
- <doc:Appex>
|
||||
|
||||
@@ -126,23 +126,6 @@ docs:
|
||||
docs-preview:
|
||||
./Documentation/build.sh preview
|
||||
|
||||
SWIFTLINT_VERSION = $(shell head -1 .swiftlint.yml | cut -d' ' -f2)
|
||||
SWIFTLINT_BIN = .tmp/swiftlint/swiftlint-$(SWIFTLINT_VERSION)
|
||||
SWIFTLINT_URL = https://github.com/realm/SwiftLint/releases/download/$(SWIFTLINT_VERSION)/$(if $(IS_MAC),portable_swiftlint,swiftlint_linux).zip
|
||||
|
||||
.PHONY: lint
|
||||
lint: $(SWIFTLINT_BIN)
|
||||
$(SWIFTLINT_BIN) $(SWIFTLINT_FLAGS)
|
||||
|
||||
$(SWIFTLINT_BIN):
|
||||
@rm -rf .tmp/swiftlint
|
||||
@mkdir -p .tmp/swiftlint
|
||||
curl -fSL $(SWIFTLINT_URL) -o .tmp/swiftlint/swiftlint.zip
|
||||
unzip -q .tmp/swiftlint/swiftlint.zip swiftlint -d .tmp/swiftlint
|
||||
@rm -f .tmp/swiftlint/swiftlint.zip
|
||||
@mv .tmp/swiftlint/swiftlint $@
|
||||
@ln -s swiftlint-$(SWIFTLINT_VERSION) .tmp/swiftlint/swiftlint
|
||||
|
||||
SPEC_URL = https://developer.apple.com/sample-code/app-store-connect/app-store-connect-openapi-specification.zip
|
||||
|
||||
.PHONY: api
|
||||
@@ -161,12 +144,9 @@ api: openapi/openapi.json
|
||||
update-api:
|
||||
@+$(MAKE) -B api
|
||||
|
||||
openapi/openapi.json: openapi/base.json Sources/DeveloperAPI/patch.js
|
||||
node Sources/DeveloperAPI/patch.js < openapi/base.json > openapi/openapi.json
|
||||
openapi/openapi.json: openapi/base.json Sources/DeveloperAPI/openapi-overlay.yaml
|
||||
npx --yes bump-cli overlay openapi/base.json Sources/DeveloperAPI/openapi-overlay.yaml > openapi/openapi.json
|
||||
|
||||
openapi/base.json:
|
||||
@mkdir -p openapi
|
||||
# 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
|
||||
|
||||
+83
-137
@@ -1,13 +1,13 @@
|
||||
{
|
||||
"originHash" : "80db0cddb0e78cf6a4c79f94537cdfebd8004679161532fbae8a57ee9d1d8cd1",
|
||||
"originHash" : "6980154be7e8da0aace058cc72033471d7d9573fa77fdbf53972129e4cd1d0a2",
|
||||
"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,35 +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"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-subprocess",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/swiftlang/swift-subprocess",
|
||||
"state" : {
|
||||
"revision" : "11633673a41f509f8945f23c96c7acd4adafd679",
|
||||
"version" : "0.5.0"
|
||||
"revision" : "6fac6f7c428d5feea2639b5f5c8b06ddfb79434b",
|
||||
"version" : "1.1.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -366,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"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -375,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 +339,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/xtool-org/SwiftyMobileDevice",
|
||||
"state" : {
|
||||
"revision" : "280d0dc8153469944491aee2f19af29e9c7a77f0",
|
||||
"version" : "1.5.0"
|
||||
"revision" : "5ee5f680d065519dd6ac56c96435a7db0d599ade",
|
||||
"version" : "1.4.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -402,8 +348,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/saagarjha/unxip",
|
||||
"state" : {
|
||||
"revision" : "6c3990517fcc4c1db6952fccf4c562fb14097601",
|
||||
"version" : "3.3.0"
|
||||
"revision" : "d6f0009109f7502f8f5b3f23dcd5b43cf5b29b32",
|
||||
"version" : "3.1.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -411,8 +357,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/mxcl/Version",
|
||||
"state" : {
|
||||
"revision" : "3043fcd2a50375db76d89ff206a612471833d1c2",
|
||||
"version" : "2.2.1"
|
||||
"revision" : "303a0f916772545e1e8667d3104f83be708a723c",
|
||||
"version" : "2.1.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -420,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"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -429,8 +375,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/yonaskolb/XcodeGen",
|
||||
"state" : {
|
||||
"revision" : "8d3d3476a69ae3e5d68e1adccc701c410c05eb36",
|
||||
"version" : "2.45.4"
|
||||
"revision" : "7193eb447a6f60061f069e07bc1efd32d73c0e19",
|
||||
"version" : "2.43.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -438,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"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -447,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 +402,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/xtool-org/xtool-core",
|
||||
"state" : {
|
||||
"revision" : "d412ac768d1e73d16ad7ccc6805f12fc701709f6",
|
||||
"version" : "1.4.0"
|
||||
"revision" : "63c644eef014f7faff53daaebe8bad37c31fbbe5",
|
||||
"version" : "1.3.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -465,8 +411,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/jpsim/Yams",
|
||||
"state" : {
|
||||
"revision" : "3d6871d5b4a5cd519adf233fbb576e0a2af71c17",
|
||||
"version" : "5.4.0"
|
||||
"revision" : "b4b8042411dc7bbb696300a34a4bf3ba1b7ad19b",
|
||||
"version" : "5.3.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -474,8 +420,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/xtool-org/zsign",
|
||||
"state" : {
|
||||
"revision" : "6c4a9f52dd8bf374aa938ef9c17d5f261f2c333a",
|
||||
"version" : "1.7.0"
|
||||
"revision" : "e9853fd3be36ea1a61fa9d4b7f71f4b4d8244369",
|
||||
"version" : "1.4.0"
|
||||
}
|
||||
}
|
||||
],
|
||||
|
||||
+24
-26
@@ -22,8 +22,8 @@ let cSettings: [CSetting] = [
|
||||
let package = Package(
|
||||
name: "xtool",
|
||||
platforms: [
|
||||
.iOS(.v16),
|
||||
.macOS(.v13),
|
||||
.iOS(.v15),
|
||||
.macOS(.v12),
|
||||
],
|
||||
products: [
|
||||
.library(
|
||||
@@ -40,22 +40,20 @@ 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/xtool-core", .upToNextMinor(from: "1.3.0")),
|
||||
.package(url: "https://github.com/xtool-org/SwiftyMobileDevice", .upToNextMinor(from: "1.4.0")),
|
||||
.package(url: "https://github.com/xtool-org/zsign", .upToNextMinor(from: "1.4.0")),
|
||||
|
||||
.package(url: "https://github.com/apple/swift-system", from: "1.4.0"),
|
||||
.package(url: "https://github.com/apple/swift-http-types", from: "1.3.1"),
|
||||
.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/swiftlang/swift-subprocess", .upToNextMinor(from: "0.5.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"),
|
||||
@@ -67,10 +65,10 @@ let package = Package(
|
||||
.package(url: "https://github.com/attaswift/BigInt", from: "5.5.0"),
|
||||
.package(url: "https://github.com/mxcl/Version", from: "2.1.0"),
|
||||
.package(url: "https://github.com/jpsim/Yams", from: "5.1.3"),
|
||||
.package(url: "https://github.com/saagarjha/unxip", from: "3.2.0"),
|
||||
.package(url: "https://github.com/saagarjha/unxip", from: "3.1.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"),
|
||||
@@ -90,26 +88,13 @@ let package = Package(
|
||||
dependencies: [
|
||||
.product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"),
|
||||
],
|
||||
exclude: ["openapi-generator-config.yaml", "patch.js"]
|
||||
),
|
||||
// common utilities shared across xtool targets
|
||||
.target(
|
||||
name: "XUtils",
|
||||
dependencies: [
|
||||
.product(name: "SystemPackage", package: "swift-system"),
|
||||
.product(
|
||||
name: "Subprocess",
|
||||
package: "swift-subprocess",
|
||||
condition: .when(platforms: [.linux, .macOS])
|
||||
),
|
||||
]
|
||||
exclude: ["openapi-generator-config.yaml", "openapi-overlay.yaml"]
|
||||
),
|
||||
.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"),
|
||||
@@ -149,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: [
|
||||
@@ -166,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])),
|
||||
]
|
||||
|
||||
@@ -18,8 +18,6 @@ struct mobileprovision {
|
||||
|
||||
static mobileprovision_t mobileprovision_create(PKCS7 *raw) {
|
||||
mobileprovision_t profile = malloc(sizeof(struct mobileprovision));
|
||||
if (!profile) return NULL;
|
||||
|
||||
profile->raw = raw;
|
||||
return profile;
|
||||
}
|
||||
@@ -43,12 +41,6 @@ void *mobileprovision_copy_data(mobileprovision_t profile, size_t *len) {
|
||||
if (data_len < 0) return NULL;
|
||||
*len = data_len;
|
||||
void *ret = malloc(data_len);
|
||||
|
||||
if (!ret) {
|
||||
OPENSSL_free(data);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
memcpy(ret, data, data_len);
|
||||
OPENSSL_free(data);
|
||||
return ret;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,28 @@
|
||||
overlay: 1.0.0
|
||||
info:
|
||||
title: Overlay for App Store Connect API
|
||||
version: 1.0.0
|
||||
actions:
|
||||
- target: '$.components.schemas.BundleIdCapabilityCreateRequest.properties.data.properties.relationships'
|
||||
update:
|
||||
properties:
|
||||
capability:
|
||||
type: object
|
||||
properties:
|
||||
data:
|
||||
type: object
|
||||
properties:
|
||||
type:
|
||||
type: string
|
||||
enum: [capabilities]
|
||||
id:
|
||||
"$ref": "#/components/schemas/CapabilityType"
|
||||
required: [id, type]
|
||||
required: [data]
|
||||
required: [capability]
|
||||
- target: '$.components.schemas.Device.properties.attributes.properties.deviceClass'
|
||||
update:
|
||||
enum: ["APPLE_VISION_PRO"]
|
||||
- target: '$.components.schemas.BundleIdPlatform'
|
||||
update:
|
||||
enum: ["SERVICES"]
|
||||
@@ -1,109 +0,0 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
import fs from 'fs';
|
||||
|
||||
function update(schema, value) {
|
||||
for (const key in value) {
|
||||
const val = value[key];
|
||||
if (val === null) {
|
||||
delete schema[key];
|
||||
} else if (Array.isArray(val)) {
|
||||
schema[key] = (schema[key] ?? []).concat(val);
|
||||
} else if (typeof val === 'object') {
|
||||
if (schema[key] === undefined) {
|
||||
schema[key] = {};
|
||||
}
|
||||
update(schema[key], val);
|
||||
} else {
|
||||
schema[key] = val;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// in-place update
|
||||
function replace(schema, value) {
|
||||
Object.keys(schema).forEach(k => delete schema[k]);
|
||||
Object.assign(schema, value);
|
||||
}
|
||||
|
||||
function clone(schema) {
|
||||
return JSON.parse(JSON.stringify(schema));
|
||||
}
|
||||
|
||||
function makeOpen(enumSchema) {
|
||||
replace(enumSchema, {
|
||||
anyOf: [
|
||||
clone(enumSchema),
|
||||
{ type: 'string' },
|
||||
]
|
||||
});
|
||||
}
|
||||
|
||||
function openAll(schema, path = []) {
|
||||
if (Array.isArray(schema)) {
|
||||
schema.forEach((s, i) => openAll(s, [...path, i]))
|
||||
} else if (typeof schema === 'object' && schema !== null) {
|
||||
const keys = new Set(Object.keys(schema))
|
||||
if (keys.size === 2
|
||||
&& keys.has('type')
|
||||
&& keys.has('enum')
|
||||
&& schema.type === 'string'
|
||||
&& Array.isArray(schema.enum)) {
|
||||
// several polymorphic schemas have a field literally named 'type', that always has a single case.
|
||||
// skip that instance, but make all other enums open.
|
||||
if (!(path[path.length - 1] === 'type' && schema.enum.length === 1)) {
|
||||
makeOpen(schema);
|
||||
}
|
||||
} else {
|
||||
for (const key in schema) {
|
||||
openAll(schema[key], [...path, key]);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function patch(schema) {
|
||||
const schemas = schema.components.schemas;
|
||||
|
||||
// this field is required iff using the private Xcode API
|
||||
update(schemas.BundleIdCapabilityCreateRequest.properties.data.properties.relationships, {
|
||||
properties: {
|
||||
capability: {
|
||||
type: 'object',
|
||||
properties: {
|
||||
data: {
|
||||
type: 'object',
|
||||
properties: {
|
||||
type: {
|
||||
type: 'string',
|
||||
enum: ['capabilities'],
|
||||
},
|
||||
id: { $ref: '#/components/schemas/CapabilityType' },
|
||||
},
|
||||
required: ['id', 'type'],
|
||||
},
|
||||
},
|
||||
required: ['data'],
|
||||
}
|
||||
},
|
||||
})
|
||||
|
||||
// we don't use this but it triggers a deprecation warning. see:
|
||||
// https://github.com/apple/swift-openapi-generator/issues/715
|
||||
schemas.App.properties.relationships.properties.inAppPurchases.deprecated = false;
|
||||
|
||||
// openapi-generator expects response enums to be exhaustive. Apple's ASC OpenAPI spec
|
||||
// misses some cases that they do, actually, return. So we make all bona fide enums in
|
||||
// schema.components.schemas open. We don't do this on the schema.paths side because
|
||||
// most (all?) of the enums in there are on the request side rather than the response.
|
||||
// https://swiftpackageindex.com/apple/swift-openapi-generator/1.7.2/documentation/swift-openapi-generator/useful-openapi-patterns#Open-enums-and-oneOfs
|
||||
openAll(schemas);
|
||||
|
||||
return schema;
|
||||
}
|
||||
|
||||
const text = fs.readFileSync(process.stdin.fd, 'utf8');
|
||||
const json = JSON.parse(text);
|
||||
const patched = patch(json);
|
||||
const patchedText = JSON.stringify(patched);
|
||||
console.log(patchedText);
|
||||
@@ -1,11 +1,9 @@
|
||||
import Foundation
|
||||
import Subprocess
|
||||
import XUtils
|
||||
|
||||
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 { FilePath($0) }
|
||||
ProcessInfo.processInfo.environment["SWIFTPM_CUSTOM_BIN_DIR"].map { URL(fileURLWithPath: $0) }
|
||||
|
||||
private static let envURL = URL(fileURLWithPath: "/usr/bin/env")
|
||||
|
||||
@@ -36,16 +34,18 @@ public struct BuildSettings: Sendable {
|
||||
|
||||
#if os(macOS)
|
||||
private static func xcrun(_ arguments: [String]) async throws -> String {
|
||||
let result = try await Subprocess.run(
|
||||
.path("/usr/bin/xcrun"),
|
||||
arguments: .init(arguments),
|
||||
output: .string(limit: .max)
|
||||
).checkSuccess()
|
||||
return result.standardOutput?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
|
||||
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)
|
||||
}
|
||||
|
||||
private static let swiftURL = Task {
|
||||
try await FilePath(xcrun(["-f", "swift"]))
|
||||
try await URL(fileURLWithPath: xcrun(["-f", "swift"]))
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -53,11 +53,12 @@ public struct BuildSettings: Sendable {
|
||||
forTool tool: String,
|
||||
arguments: [String],
|
||||
packagePathOverride: String? = nil
|
||||
) async throws -> Subprocess.Configuration {
|
||||
let executable: Executable
|
||||
) async throws -> Process {
|
||||
let process = Process()
|
||||
|
||||
let baseArguments: [String]
|
||||
if let customBinDir = Self.customBinDir {
|
||||
executable = .path(customBinDir.appending("swift-\(tool)"))
|
||||
process.executableURL = customBinDir.appendingPathComponent("swift-\(tool)")
|
||||
baseArguments = []
|
||||
} else {
|
||||
#if os(macOS)
|
||||
@@ -66,9 +67,9 @@ public struct BuildSettings: Sendable {
|
||||
// 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.
|
||||
executable = .path(try await Self.swiftURL.value)
|
||||
process.executableURL = try await Self.swiftURL.value
|
||||
#else
|
||||
executable = .name("swift")
|
||||
process.executableURL = try await ToolRegistry.locate("swift")
|
||||
#endif
|
||||
baseArguments = [tool]
|
||||
}
|
||||
@@ -78,18 +79,11 @@ public struct BuildSettings: Sendable {
|
||||
"--configuration", configuration.rawValue,
|
||||
]
|
||||
|
||||
var rawEnv = ProcessInfo.processInfo.environment
|
||||
rawEnv.removeValue(forKey: "SDKROOT")
|
||||
let env = Dictionary(uniqueKeysWithValues: rawEnv.map {
|
||||
(Environment.Key(rawValue: $0)!, $1)
|
||||
})
|
||||
|
||||
return Configuration(
|
||||
executable,
|
||||
arguments: .init(baseArguments + extraArguments + sdkOptions + options + arguments),
|
||||
environment: .custom(env),
|
||||
platformOptions: .withGracefulShutDown,
|
||||
)
|
||||
var env = ProcessInfo.processInfo.environment
|
||||
env.removeValue(forKey: "SDKROOT")
|
||||
process.environment = env
|
||||
process.arguments = baseArguments + extraArguments + sdkOptions + options + arguments
|
||||
return process
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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,6 +1,5 @@
|
||||
import Foundation
|
||||
import Yams
|
||||
import XUtils
|
||||
|
||||
public struct PackSchemaBase: Codable, Sendable {
|
||||
public enum Version: Int, Codable, Sendable {
|
||||
@@ -15,26 +14,11 @@ public struct PackSchemaBase: Codable, Sendable {
|
||||
public var product: String?
|
||||
|
||||
public var infoPath: String?
|
||||
public var entitlementsPath: String?
|
||||
|
||||
public var iconPath: String?
|
||||
public var resources: [String]?
|
||||
|
||||
public var extensions: [Extension]?
|
||||
|
||||
public struct Extension: Codable, Sendable {
|
||||
public var product: String
|
||||
public var bundleID: String?
|
||||
public var infoPath: String
|
||||
public var resources: [String]?
|
||||
public var entitlementsPath: String?
|
||||
}
|
||||
}
|
||||
|
||||
@dynamicMemberLookup
|
||||
public struct PackSchema: Sendable {
|
||||
public typealias Extension = PackSchemaBase.Extension
|
||||
|
||||
public enum IDSpecifier: Sendable {
|
||||
case orgID(String)
|
||||
case bundleID(String)
|
||||
@@ -74,7 +58,6 @@ public struct PackSchema: Sendable {
|
||||
}
|
||||
}
|
||||
|
||||
// swiftlint:disable:next force_try
|
||||
public static let `default` = try! PackSchema(validating: .init(
|
||||
version: .v1,
|
||||
orgID: "com.example"
|
||||
@@ -85,8 +68,4 @@ public struct PackSchema: Sendable {
|
||||
let base = try YAMLDecoder().decode(PackSchemaBase.self, from: data)
|
||||
try self.init(validating: base)
|
||||
}
|
||||
|
||||
public subscript<Subject>(dynamicMember keyPath: KeyPath<PackSchemaBase, Subject>) -> Subject {
|
||||
self.base[keyPath: keyPath]
|
||||
}
|
||||
}
|
||||
|
||||
+77
-150
@@ -1,6 +1,4 @@
|
||||
import Foundation
|
||||
import XUtils
|
||||
import Subprocess
|
||||
|
||||
public struct Packer: Sendable {
|
||||
public let buildSettings: BuildSettings
|
||||
@@ -22,44 +20,34 @@ public struct Packer: Sendable {
|
||||
// swift-tools-version: 6.0
|
||||
import PackageDescription
|
||||
let package = Package(
|
||||
name: "\(plan.app.product)-Builder",
|
||||
name: "\(plan.product)-Builder",
|
||||
platforms: [
|
||||
.iOS("\(plan.app.deploymentTarget)"),
|
||||
.iOS("\(plan.deploymentTarget)"),
|
||||
],
|
||||
dependencies: [
|
||||
.package(name: "RootPackage", path: "../.."),
|
||||
],
|
||||
targets: [
|
||||
\(
|
||||
plan.allProducts.map {
|
||||
"""
|
||||
.executableTarget(
|
||||
name: "\($0.targetName)",
|
||||
dependencies: [
|
||||
.product(name: "\($0.product)", package: "RootPackage"),
|
||||
],
|
||||
linkerSettings: \($0.linkerSettings)
|
||||
)
|
||||
"""
|
||||
}
|
||||
.joined(separator: ",\n")
|
||||
)
|
||||
.executableTarget(
|
||||
name: "\(plan.product)-App",
|
||||
dependencies: [
|
||||
.product(name: "\(plan.product)", package: "RootPackage"),
|
||||
]
|
||||
),
|
||||
]
|
||||
)\n
|
||||
"""
|
||||
try Data(contents.utf8).write(to: packageSwift)
|
||||
let sources = packageDir.appendingPathComponent("Sources")
|
||||
try? FileManager.default.createDirectory(at: sources, withIntermediateDirectories: true)
|
||||
try Data().write(to: sources.appendingPathComponent("stub.c"))
|
||||
|
||||
for product in plan.allProducts {
|
||||
let sources: URL = packageDir.appendingPathComponent("Sources/\(product.targetName)", isDirectory: true)
|
||||
try FileManager.default.createDirectory(at: sources, withIntermediateDirectories: true)
|
||||
try Data().write(to: sources.appendingPathComponent("stub.c", isDirectory: false))
|
||||
}
|
||||
|
||||
let buildConfig = try await buildSettings.swiftPMInvocation(
|
||||
let builder = try await buildSettings.swiftPMInvocation(
|
||||
forTool: "build",
|
||||
arguments: [
|
||||
"--package-path", packageDir.path,
|
||||
"--scratch-path", ".build",
|
||||
"--product", "\(plan.product)-App",
|
||||
// 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.)
|
||||
@@ -67,62 +55,25 @@ public struct Packer: Sendable {
|
||||
// in order to dump the plan, so we can skip resolution here to skirt
|
||||
// the issue.
|
||||
"--disable-automatic-resolution",
|
||||
"-Xlinker", "-rpath", "-Xlinker", "@executable_path/Frameworks",
|
||||
]
|
||||
)
|
||||
try await Subprocess.run(
|
||||
buildConfig,
|
||||
output: .currentStandardError,
|
||||
error: .currentStandardError,
|
||||
)
|
||||
.checkSuccess()
|
||||
builder.standardOutput = FileHandle.standardError
|
||||
try await builder.runUntilExit()
|
||||
}
|
||||
|
||||
public func pack() async throws -> URL {
|
||||
try await build()
|
||||
|
||||
let output = try TemporaryDirectory(name: "\(plan.app.product).app")
|
||||
|
||||
let outputURL = output.url
|
||||
let output = try TemporaryDirectory(name: "\(plan.product).app")
|
||||
|
||||
let binDir = URL(
|
||||
fileURLWithPath: ".build/\(buildSettings.triple)/\(buildSettings.configuration.rawValue)",
|
||||
isDirectory: true
|
||||
)
|
||||
|
||||
try await withThrowingTaskGroup(of: Void.self) { group in
|
||||
for product in plan.allProducts {
|
||||
try pack(
|
||||
product: product,
|
||||
binDir: binDir,
|
||||
outputURL: product.directory(inApp: outputURL),
|
||||
&group
|
||||
)
|
||||
}
|
||||
let outputURL = output.url
|
||||
|
||||
while !group.isEmpty {
|
||||
do {
|
||||
try await group.next()
|
||||
} catch is CancellationError {
|
||||
// continue
|
||||
} catch {
|
||||
group.cancelAll()
|
||||
throw error
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let dest = URL(fileURLWithPath: "xtool").appendingPathComponent(outputURL.lastPathComponent)
|
||||
try? FileManager.default.removeItem(at: dest)
|
||||
try output.persist(at: dest)
|
||||
return dest
|
||||
}
|
||||
|
||||
@Sendable private func pack(
|
||||
product: Plan.Product,
|
||||
binDir: URL,
|
||||
outputURL: URL,
|
||||
_ group: inout ThrowingTaskGroup<Void, Error>
|
||||
) throws {
|
||||
@Sendable func packFileToRoot(srcName: String) async throws {
|
||||
let srcURL = URL(fileURLWithPath: srcName)
|
||||
let destURL = outputURL.appendingPathComponent(srcURL.lastPathComponent)
|
||||
@@ -140,93 +91,69 @@ public struct Packer: Sendable {
|
||||
try Task.checkCancellation()
|
||||
}
|
||||
|
||||
// Ensure output directory is available
|
||||
try? FileManager.default.createDirectory(at: outputURL, withIntermediateDirectories: true)
|
||||
|
||||
for command in product.resources {
|
||||
try await withThrowingTaskGroup(of: Void.self) { group in
|
||||
for command in plan.resources {
|
||||
group.addTask {
|
||||
switch command {
|
||||
case .bundle(let package, let target):
|
||||
try await packFile(srcName: "\(package)_\(target).bundle")
|
||||
case .binaryTarget(let name):
|
||||
let src = URL(fileURLWithPath: "\(name).framework/\(name)", relativeTo: binDir)
|
||||
let magic = Data("!<arch>\n".utf8)
|
||||
let thinMagic = Data("!<thin>\n".utf8)
|
||||
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
|
||||
if bytes != magic && bytes != thinMagic {
|
||||
try await packFile(srcName: "\(name).framework", dstName: "Frameworks/\(name).framework", sign: true)
|
||||
}
|
||||
case .library(let name):
|
||||
try await packFile(srcName: "lib\(name).dylib", dstName: "Frameworks/lib\(name).dylib", sign: true)
|
||||
case .root(let source):
|
||||
try await packFileToRoot(srcName: source)
|
||||
}
|
||||
}
|
||||
}
|
||||
if let iconPath = plan.iconPath {
|
||||
group.addTask {
|
||||
try await packFileToRoot(srcName: iconPath)
|
||||
}
|
||||
}
|
||||
group.addTask {
|
||||
switch command {
|
||||
case .bundle(let package, let target):
|
||||
try await packFile(srcName: "\(package)_\(target).bundle")
|
||||
case .binaryTarget(let name):
|
||||
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
|
||||
}
|
||||
// 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
|
||||
if bytes != magic && bytes != thinMagic {
|
||||
try await packFile(srcName: "\(name).framework", dstName: "Frameworks/\(name).framework", sign: true)
|
||||
}
|
||||
case .library(let name):
|
||||
try await packFile(srcName: "lib\(name).dylib", dstName: "Frameworks/lib\(name).dylib", sign: true)
|
||||
case .root(let source):
|
||||
try await packFileToRoot(srcName: source)
|
||||
try await packFile(srcName: "\(plan.product)-App", dstName: plan.product)
|
||||
}
|
||||
group.addTask {
|
||||
var info = plan.infoPlist
|
||||
|
||||
if let iconPath = plan.iconPath {
|
||||
let iconName = URL(fileURLWithPath: iconPath).deletingPathExtension().lastPathComponent
|
||||
info["CFBundleIconFile"] = iconName
|
||||
}
|
||||
|
||||
let infoPath = outputURL.appendingPathComponent("Info.plist")
|
||||
let encodedPlist = try PropertyListSerialization.data(
|
||||
fromPropertyList: info,
|
||||
format: .xml,
|
||||
options: 0
|
||||
)
|
||||
try encodedPlist.write(to: infoPath)
|
||||
}
|
||||
while !group.isEmpty {
|
||||
do {
|
||||
try await group.next()
|
||||
} catch is CancellationError {
|
||||
// continue
|
||||
} catch {
|
||||
group.cancelAll()
|
||||
throw error
|
||||
}
|
||||
}
|
||||
}
|
||||
if let iconPath = product.iconPath {
|
||||
group.addTask {
|
||||
try await packFileToRoot(srcName: iconPath)
|
||||
}
|
||||
}
|
||||
group.addTask {
|
||||
try await packFile(srcName: product.targetName, dstName: product.product)
|
||||
}
|
||||
group.addTask {
|
||||
var info = product.infoPlist
|
||||
|
||||
if product.type == .application {
|
||||
info["UIRequiredDeviceCapabilities"] = ["arm64"]
|
||||
info["LSRequiresIPhoneOS"] = true
|
||||
info["CFBundleSupportedPlatforms"] = ["iPhoneOS"]
|
||||
}
|
||||
|
||||
if let iconPath = product.iconPath {
|
||||
let iconName = URL(fileURLWithPath: iconPath).deletingPathExtension().lastPathComponent
|
||||
info["CFBundleIconFile"] = iconName
|
||||
}
|
||||
|
||||
let infoPath = outputURL.appendingPathComponent("Info.plist")
|
||||
let encodedPlist = try PropertyListSerialization.data(
|
||||
fromPropertyList: info,
|
||||
format: .xml,
|
||||
options: 0
|
||||
)
|
||||
try encodedPlist.write(to: infoPath)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extension Plan.Product {
|
||||
fileprivate var linkerSettings: String {
|
||||
switch self.type {
|
||||
case .application: """
|
||||
[
|
||||
.unsafeFlags([
|
||||
"-Xlinker", "-rpath", "-Xlinker", "@executable_path/Frameworks",
|
||||
]),
|
||||
]
|
||||
"""
|
||||
case .appExtension: """
|
||||
[
|
||||
// Link to Foundation framework which implements the _NSExtensionMain entrypoint
|
||||
.linkedFramework("Foundation"),
|
||||
.unsafeFlags([
|
||||
// Set the entry point to Foundation`_NSExtensionMain
|
||||
"-Xlinker", "-e", "-Xlinker", "_NSExtensionMain",
|
||||
// Include frameworks that the host app may use
|
||||
"-Xlinker", "-rpath", "-Xlinker", "@executable_path/../../Frameworks",
|
||||
// ...as well as our own
|
||||
"-Xlinker", "-rpath", "-Xlinker", "@executable_path/Frameworks",
|
||||
]),
|
||||
]
|
||||
"""
|
||||
}
|
||||
let dest = URL(fileURLWithPath: "xtool")
|
||||
.appendingPathComponent(output.url.lastPathComponent)
|
||||
try? FileManager.default.removeItem(at: dest)
|
||||
try output.persist(at: dest)
|
||||
return dest
|
||||
}
|
||||
}
|
||||
|
||||
+63
-211
@@ -1,6 +1,4 @@
|
||||
import Foundation
|
||||
import XUtils
|
||||
import Subprocess
|
||||
|
||||
public struct Planner: Sendable {
|
||||
public var buildSettings: BuildSettings
|
||||
@@ -20,12 +18,14 @@ public struct Planner: Sendable {
|
||||
return decoder
|
||||
}()
|
||||
|
||||
// anything older than this requires bundling the stdlib which
|
||||
// is doable but probably not worth the effort
|
||||
private static let minSupportedIOSVersion = "13.0"
|
||||
public func createPlan() async throws -> Plan {
|
||||
// TODO: cache plan using (Package.swift+Package.resolved) as the key?
|
||||
|
||||
private func buildGraph() async throws -> PackageGraph {
|
||||
let dependencyRoot = try await dumpDependencies()
|
||||
let dependencyData = try await _dumpAction(
|
||||
arguments: ["show-dependencies", "--format", "json"],
|
||||
path: buildSettings.packagePath
|
||||
)
|
||||
let dependencyRoot = try Self.decoder.decode(PackageDependency.self, from: dependencyData)
|
||||
|
||||
let packages = try await withThrowingTaskGroup(
|
||||
of: (PackageDependency, PackageDump).self,
|
||||
@@ -64,74 +64,18 @@ public struct Planner: Sendable {
|
||||
}
|
||||
|
||||
let rootPackage = packages[dependencyRoot.identity]!
|
||||
let deploymentTarget = rootPackage.platforms?.first { $0.name == "ios" }?.version ?? "13.0"
|
||||
|
||||
return PackageGraph(
|
||||
root: rootPackage,
|
||||
packages: packages,
|
||||
packagesByProductName: packagesByProductName
|
||||
)
|
||||
}
|
||||
let libraries = rootPackage.products?.filter { $0.type == .autoLibrary } ?? []
|
||||
|
||||
public func createPlan() async throws -> Plan {
|
||||
// TODO: cache plan using (Package.swift+Package.resolved) as the key?
|
||||
|
||||
let graph = try await buildGraph()
|
||||
|
||||
let app = try await product(
|
||||
from: graph,
|
||||
matching: schema.product,
|
||||
type: .application,
|
||||
plist: schema.infoPath,
|
||||
idSpecifier: schema.idSpecifier,
|
||||
iconPath: schema.iconPath,
|
||||
rootResources: schema.resources,
|
||||
entitlementsPath: schema.entitlementsPath
|
||||
)
|
||||
|
||||
let extensionProducts: [Plan.Product]
|
||||
if let extensions = schema.extensions, !extensions.isEmpty {
|
||||
extensionProducts = try await withThrowingTaskGroup(of: Plan.Product.self) { group in
|
||||
for ext in extensions {
|
||||
group.addTask {
|
||||
try await product(
|
||||
from: graph,
|
||||
matching: ext.product,
|
||||
type: .appExtension,
|
||||
plist: ext.infoPath,
|
||||
idSpecifier: ext.bundleID.flatMap(PackSchema.IDSpecifier.bundleID) ?? .orgID(app.bundleID),
|
||||
iconPath: nil,
|
||||
rootResources: ext.resources,
|
||||
entitlementsPath: ext.entitlementsPath
|
||||
)
|
||||
}
|
||||
}
|
||||
return try await group.reduce(into: []) { $0.append($1) }
|
||||
}
|
||||
} else {
|
||||
extensionProducts = []
|
||||
}
|
||||
|
||||
return Plan(app: app, extensions: extensionProducts)
|
||||
}
|
||||
|
||||
// swiftlint:disable cyclomatic_complexity function_parameter_count
|
||||
private func product(
|
||||
from graph: PackageGraph,
|
||||
matching name: String?,
|
||||
type: Plan.ProductType,
|
||||
plist: String?,
|
||||
idSpecifier: PackSchema.IDSpecifier,
|
||||
iconPath: String?,
|
||||
rootResources: [String]?,
|
||||
entitlementsPath: String?
|
||||
) async throws -> Plan.Product {
|
||||
let library = try selectLibrary(
|
||||
from: graph.root.products?.filter { $0.type == .autoLibrary } ?? [],
|
||||
matching: name
|
||||
from: libraries,
|
||||
matching: schema.base.product
|
||||
)
|
||||
var resources: [Plan.Resource] = []
|
||||
|
||||
var resources: [Resource] = []
|
||||
var visited: Set<String> = []
|
||||
var targets = library.targets.map { (graph.root, $0) }
|
||||
var targets = library.targets.map { (rootPackage, $0) }
|
||||
while let (targetPackage, targetName) = targets.popLast() {
|
||||
guard let target = targetPackage.targets?.first(where: { $0.name == targetName }) else {
|
||||
throw StringError("Could not find target '\(targetName)' in package '\(targetPackage.name)'")
|
||||
@@ -147,7 +91,15 @@ public struct Planner: Sendable {
|
||||
targets.append((targetPackage, targetName))
|
||||
}
|
||||
for productName in (target.productDependencies ?? []) {
|
||||
let (package, product) = try graph.product(name: productName)
|
||||
guard let packageID = packagesByProductName[productName] else {
|
||||
throw StringError("Could not find package containing product '\(productName)'")
|
||||
}
|
||||
guard let package = packages[packageID] else {
|
||||
throw StringError("Could not find package by id '\(packageID)'")
|
||||
}
|
||||
guard let product = package.products?.first(where: { $0.name == productName }) else {
|
||||
throw StringError("Could not find product '\(productName)' in package '\(packageID)'")
|
||||
}
|
||||
if product.type == .dynamicLibrary {
|
||||
resources.append(.library(name: productName))
|
||||
}
|
||||
@@ -155,44 +107,37 @@ public struct Planner: Sendable {
|
||||
}
|
||||
}
|
||||
|
||||
if let rootResources {
|
||||
if let rootResources = schema.base.resources {
|
||||
resources += rootResources.map { .root(source: $0) }
|
||||
}
|
||||
|
||||
let bundleID = idSpecifier.formBundleID(product: library.name)
|
||||
let deploymentTarget = graph.root.platforms?.first { $0.name == "ios" }?.version
|
||||
?? Self.minSupportedIOSVersion
|
||||
let bundleID = schema.idSpecifier.formBundleID(product: library.name)
|
||||
|
||||
var infoPlist: [String: Sendable] = [
|
||||
"CFBundleInfoDictionaryVersion": "6.0",
|
||||
"UIRequiredDeviceCapabilities": ["arm64"],
|
||||
"LSRequiresIPhoneOS": true,
|
||||
"CFBundleSupportedPlatforms": ["iPhoneOS"],
|
||||
"CFBundlePackageType": "APPL",
|
||||
"UIDeviceFamily": [1, 2],
|
||||
"CFBundleDevelopmentRegion": "en",
|
||||
"UISupportedInterfaceOrientations": ["UIInterfaceOrientationPortrait"],
|
||||
"UISupportedInterfaceOrientations~ipad": [
|
||||
"UIInterfaceOrientationPortrait",
|
||||
"UIInterfaceOrientationPortraitUpsideDown",
|
||||
"UIInterfaceOrientationLandscapeLeft",
|
||||
"UIInterfaceOrientationLandscapeRight"
|
||||
],
|
||||
"UILaunchScreen": [:] as [String: Sendable],
|
||||
"CFBundleVersion": "1",
|
||||
"CFBundleShortVersionString": "1.0.0",
|
||||
"MinimumOSVersion": deploymentTarget,
|
||||
"CFBundleIdentifier": bundleID,
|
||||
"CFBundleName": library.name,
|
||||
"CFBundleExecutable": library.name,
|
||||
"CFBundleDisplayName": library.name,
|
||||
"CFBundlePackageType": type.fourCharCode,
|
||||
"CFBundleName": "\(library.name)",
|
||||
"CFBundleExecutable": "\(library.name)",
|
||||
]
|
||||
|
||||
switch type {
|
||||
case .application:
|
||||
infoPlist["UIDeviceFamily"] = [1, 2]
|
||||
infoPlist["UISupportedInterfaceOrientations"] = ["UIInterfaceOrientationPortrait"]
|
||||
infoPlist["UISupportedInterfaceOrientations~ipad"] = [
|
||||
"UIInterfaceOrientationPortrait",
|
||||
"UIInterfaceOrientationPortraitUpsideDown",
|
||||
"UIInterfaceOrientationLandscapeLeft",
|
||||
"UIInterfaceOrientationLandscapeRight",
|
||||
]
|
||||
infoPlist["UILaunchScreen"] = [:] as [String: Sendable]
|
||||
case .appExtension:
|
||||
// Should set default parameters?
|
||||
infoPlist["NSExtension"] = [:] as [String: Sendable]
|
||||
}
|
||||
|
||||
if let plist {
|
||||
if let plist = self.schema.base.infoPath {
|
||||
let data = try await Data(reading: URL(fileURLWithPath: plist))
|
||||
let info = try PropertyListSerialization.propertyList(from: data, format: nil)
|
||||
if let info = info as? [String: Sendable] {
|
||||
@@ -202,60 +147,33 @@ public struct Planner: Sendable {
|
||||
}
|
||||
}
|
||||
|
||||
return Plan.Product(
|
||||
type: type,
|
||||
return Plan(
|
||||
product: library.name,
|
||||
deploymentTarget: deploymentTarget,
|
||||
bundleID: bundleID,
|
||||
infoPlist: infoPlist,
|
||||
resources: resources,
|
||||
iconPath: iconPath,
|
||||
entitlementsPath: entitlementsPath
|
||||
)
|
||||
}
|
||||
|
||||
private func dumpDependencies() async throws -> PackageDependency {
|
||||
let tempDir = try TemporaryDirectory(name: "xtool-dump")
|
||||
let tempFileURL = tempDir.url.appendingPathComponent("dump.json")
|
||||
|
||||
// SwiftPM sometimes prints extraneous data to stdout, so ask
|
||||
// it to write the JSON to a temp file instead. See:
|
||||
// https://github.com/xtool-org/xtool/pull/97#discussion_r2203618825
|
||||
_ = try await _dumpAction(
|
||||
arguments: ["-q", "show-dependencies", "--format", "json", "-o", tempFileURL.path],
|
||||
path: buildSettings.packagePath
|
||||
)
|
||||
|
||||
return try Self.decoder.decode(
|
||||
PackageDependency.self,
|
||||
from: Data(contentsOf: tempFileURL)
|
||||
iconPath: self.schema.base.iconPath
|
||||
)
|
||||
}
|
||||
|
||||
private func dumpPackage(at path: String) async throws -> PackageDump {
|
||||
let data = try await _dumpAction(arguments: ["-q", "describe", "--type", "json"], path: path)
|
||||
let data = try await _dumpAction(arguments: ["describe", "--type", "json"], path: path)
|
||||
try Task.checkCancellation()
|
||||
|
||||
// As in dumpDependencies, we may end up with extraneous data, but `describe`
|
||||
// doesn't have a `-o` flag for a clean workaround. Resort to a heuristic,
|
||||
// looking for the opening brace.
|
||||
let fromBrace = data.drop(while: { $0 != Character("{").asciiValue })
|
||||
return try Self.decoder.decode(PackageDump.self, from: fromBrace)
|
||||
return try Self.decoder.decode(PackageDump.self, from: data)
|
||||
}
|
||||
|
||||
private func _dumpAction(arguments: [String], path: String) async throws -> Data {
|
||||
let dumpConfig = try await buildSettings.swiftPMInvocation(
|
||||
let dump = try await buildSettings.swiftPMInvocation(
|
||||
forTool: "package",
|
||||
arguments: arguments,
|
||||
packagePathOverride: path
|
||||
)
|
||||
return try await Subprocess.run(
|
||||
dumpConfig,
|
||||
output: .data(limit: .max),
|
||||
error: .currentStandardError,
|
||||
)
|
||||
.checkSuccess()
|
||||
.standardOutput
|
||||
let pipe = Pipe()
|
||||
dump.standardOutput = pipe
|
||||
async let task = Data(reading: pipe.fileHandleForReading)
|
||||
try await dump.runUntilExit()
|
||||
return try await task
|
||||
}
|
||||
|
||||
private func selectLibrary(
|
||||
@@ -293,66 +211,19 @@ public struct Planner: Sendable {
|
||||
}
|
||||
|
||||
public struct Plan: Sendable {
|
||||
public var app: Product
|
||||
public var extensions: [Product]
|
||||
public var product: String
|
||||
public var deploymentTarget: String
|
||||
public var bundleID: String
|
||||
public var infoPlist: [String: any Sendable]
|
||||
public var resources: [Resource]
|
||||
public var iconPath: String?
|
||||
}
|
||||
|
||||
public var allProducts: [Product] {
|
||||
[app] + extensions
|
||||
}
|
||||
|
||||
public enum Resource: Codable, Sendable, Hashable {
|
||||
case bundle(package: String, target: String)
|
||||
case binaryTarget(name: String)
|
||||
case library(name: String)
|
||||
case root(source: String)
|
||||
}
|
||||
|
||||
public struct Product: Sendable {
|
||||
public var type: ProductType
|
||||
public var product: String
|
||||
public var deploymentTarget: String
|
||||
public var bundleID: String
|
||||
public var infoPlist: [String: any Sendable]
|
||||
public var resources: [Resource]
|
||||
public var iconPath: String?
|
||||
public var entitlementsPath: String?
|
||||
|
||||
public var targetName: String {
|
||||
"\(self.product)-\(self.type.targetSuffix)"
|
||||
}
|
||||
|
||||
public func directory(inApp baseDir: URL) -> URL {
|
||||
switch type {
|
||||
case .application:
|
||||
baseDir
|
||||
.appendingPathComponent(".", isDirectory: true)
|
||||
case .appExtension:
|
||||
baseDir
|
||||
.appendingPathComponent("PlugIns", isDirectory: true)
|
||||
.appendingPathComponent(product, isDirectory: true)
|
||||
.appendingPathExtension("appex")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public enum ProductType: Sendable {
|
||||
case application
|
||||
case appExtension
|
||||
|
||||
fileprivate var targetSuffix: String {
|
||||
switch self {
|
||||
case .application: "App"
|
||||
case .appExtension: "Extension"
|
||||
}
|
||||
}
|
||||
|
||||
fileprivate var fourCharCode: String {
|
||||
switch self {
|
||||
case .application: "APPL"
|
||||
case .appExtension: "XPC!"
|
||||
}
|
||||
}
|
||||
}
|
||||
public enum Resource: Codable, Sendable {
|
||||
case bundle(package: String, target: String)
|
||||
case binaryTarget(name: String)
|
||||
case library(name: String)
|
||||
case root(source: String)
|
||||
}
|
||||
|
||||
private struct PackageDependency: Decodable {
|
||||
@@ -428,22 +299,3 @@ private struct PackageDump: Decodable {
|
||||
let targets: [Target]?
|
||||
let platforms: [Platform]?
|
||||
}
|
||||
|
||||
private struct PackageGraph {
|
||||
let root: PackageDump
|
||||
let packages: [String: PackageDump]
|
||||
let packagesByProductName: [String: String]
|
||||
|
||||
func product(name productName: String) throws -> (PackageDump, PackageDump.Product) {
|
||||
guard let packageID = packagesByProductName[productName] else {
|
||||
throw StringError("Could not find package containing product '\(productName)'")
|
||||
}
|
||||
guard let package = packages[packageID] else {
|
||||
throw StringError("Could not find package by id '\(packageID)'")
|
||||
}
|
||||
guard let product = package.products?.first(where: { $0.name == productName }) else {
|
||||
throw StringError("Could not find product '\(productName)' in package '\(packageID)'")
|
||||
}
|
||||
return (package, product)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
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,5 +1,4 @@
|
||||
import Foundation
|
||||
import Subprocess
|
||||
|
||||
package enum ToolRegistry {
|
||||
package enum Errors: Error, CustomStringConvertible {
|
||||
@@ -17,6 +16,11 @@ 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)
|
||||
@@ -26,10 +30,20 @@ package enum ToolRegistry {
|
||||
private var cache: [String: Task<URL, Error>] = [:]
|
||||
|
||||
private func _locate(tool: String) async throws -> URL {
|
||||
guard let path = try? await Executable.name(tool).resolveExecutablePath(in: .inherit),
|
||||
let url = URL(filePath: path)
|
||||
else { throw Errors.toolNotFound(tool) }
|
||||
return 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)
|
||||
}
|
||||
|
||||
func locate(tool: String) async throws -> URL {
|
||||
|
||||
@@ -13,93 +13,62 @@ public struct XcodePacker {
|
||||
self.plan = plan
|
||||
}
|
||||
|
||||
// swiftlint:disable:next function_body_length
|
||||
public func createProject() async throws -> URL {
|
||||
let targetName = "\(plan.product)-App"
|
||||
|
||||
let xtoolDir: Path = "xtool"
|
||||
|
||||
let projectDir: Path = xtoolDir + ".xtool-tmp"
|
||||
try? xtoolDir.delete()
|
||||
try projectDir.mkpath()
|
||||
|
||||
let infoPath = projectDir + "Info.plist"
|
||||
|
||||
var plist = plan.infoPlist
|
||||
let families = (plist.removeValue(forKey: "UIDeviceFamily") as? [Int]) ?? [1, 2]
|
||||
plist["CFBundleExecutable"] = targetName
|
||||
plist["CFBundleName"] = targetName
|
||||
plist["CFBundleDisplayName"] = plan.product
|
||||
|
||||
let encodedPlist = try PropertyListSerialization.data(fromPropertyList: plist, format: .xml, options: 0)
|
||||
try infoPath.write(encodedPlist)
|
||||
|
||||
let emptyFile = projectDir + "empty.c"
|
||||
try emptyFile.write(Data("// leave this file empty".utf8))
|
||||
|
||||
let fromProjectToRoot = try Path(".").relativePath(from: projectDir)
|
||||
|
||||
guard let deploymentTarget = Version(tolerant: plan.app.deploymentTarget) else {
|
||||
throw StringError("Could not parse deployment target '\(plan.app.deploymentTarget)'")
|
||||
}
|
||||
|
||||
let emptyText = Data("""
|
||||
// leave this file empty
|
||||
""".utf8)
|
||||
|
||||
let targets = try plan.allProducts.map { product in
|
||||
let productDir = projectDir + product.product
|
||||
try productDir.mkpath()
|
||||
|
||||
let emptyFile = productDir + "empty.c"
|
||||
try emptyFile.write(emptyText)
|
||||
|
||||
let infoPath = productDir + "Info.plist"
|
||||
|
||||
var plist = product.infoPlist
|
||||
let families = (plist.removeValue(forKey: "UIDeviceFamily") as? [Int]) ?? [1, 2]
|
||||
plist["CFBundleExecutable"] = product.targetName
|
||||
plist["CFBundleName"] = product.targetName
|
||||
plist["CFBundleDisplayName"] = product.product
|
||||
|
||||
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: ",")),
|
||||
]
|
||||
|
||||
if product.type == .appExtension {
|
||||
buildSettings["APPLICATION_EXTENSION_API_ONLY"] = true
|
||||
}
|
||||
|
||||
if let entitlementsPath = product.entitlementsPath {
|
||||
buildSettings["CODE_SIGN_ENTITLEMENTS"] = .string((fromProjectToRoot + Path(entitlementsPath)).string)
|
||||
}
|
||||
|
||||
let additionalDependencies: [Dependency] = if product.type == .application {
|
||||
plan.extensions.map {
|
||||
Dependency(
|
||||
type: .target,
|
||||
reference: $0.targetName
|
||||
)
|
||||
}
|
||||
} else {
|
||||
[]
|
||||
}
|
||||
return Target(
|
||||
name: product.targetName,
|
||||
type: product.type == .application ? .application : .appExtension,
|
||||
platform: .iOS,
|
||||
deploymentTarget: deploymentTarget,
|
||||
settings: Settings(buildSettings: buildSettings),
|
||||
sources: [
|
||||
TargetSource(
|
||||
path: try emptyFile.relativePath(from: projectDir).string,
|
||||
buildPhase: .sources
|
||||
),
|
||||
],
|
||||
dependencies: [
|
||||
Dependency(
|
||||
type: .package(products: [product.product]),
|
||||
reference: "RootPackage"
|
||||
),
|
||||
] + additionalDependencies,
|
||||
info: Plist(
|
||||
path: try infoPath.relativePath(from: projectDir).string,
|
||||
attributes: [:]
|
||||
)
|
||||
)
|
||||
guard let deploymentTarget = Version(tolerant: plan.deploymentTarget) else {
|
||||
throw StringError("Could not parse deployment target '\(plan.deploymentTarget)'")
|
||||
}
|
||||
|
||||
let project = Project(
|
||||
name: plan.app.targetName,
|
||||
targets: targets,
|
||||
name: plan.product,
|
||||
targets: [
|
||||
Target(
|
||||
name: targetName,
|
||||
type: .application,
|
||||
platform: .iOS,
|
||||
deploymentTarget: deploymentTarget,
|
||||
settings: Settings(buildSettings: [
|
||||
"PRODUCT_BUNDLE_IDENTIFIER": plan.bundleID,
|
||||
"TARGETED_DEVICE_FAMILY": families.map { "\($0)" }.joined(separator: ","),
|
||||
]),
|
||||
sources: [
|
||||
TargetSource(path: (fromProjectToRoot + emptyFile).string),
|
||||
],
|
||||
dependencies: [
|
||||
Dependency(
|
||||
type: .package(products: [plan.product]),
|
||||
reference: "RootPackage"
|
||||
),
|
||||
],
|
||||
info: Plist(
|
||||
path: (fromProjectToRoot + infoPath).string,
|
||||
attributes: [:]
|
||||
)
|
||||
)
|
||||
],
|
||||
packages: [
|
||||
"RootPackage": .local(
|
||||
path: fromProjectToRoot.string,
|
||||
@@ -116,8 +85,8 @@ public struct XcodePacker {
|
||||
// TODO: Handle plan.iconPath
|
||||
|
||||
let generator = ProjectGenerator(project: project)
|
||||
let xcodeproj = projectDir + "\(plan.app.product).xcodeproj"
|
||||
let xcworkspace = xtoolDir + "\(plan.app.product).xcworkspace"
|
||||
let xcodeproj = projectDir + "\(plan.product).xcodeproj"
|
||||
let xcworkspace = xtoolDir + "\(plan.product).xcworkspace"
|
||||
do {
|
||||
let current = Path.current
|
||||
Path.current = xcodeproj.parent()
|
||||
@@ -130,6 +99,18 @@ public struct XcodePacker {
|
||||
xcodeProject.pbxproj.delete(object: packageRef)
|
||||
}
|
||||
|
||||
if let emptyFileRef = xcodeProject.pbxproj.fileReferences.first(where: { $0.path == "empty.c" }),
|
||||
let existingGroup = xcodeProject.pbxproj.groups.first(where: {
|
||||
$0.children.contains { $0.uuid == emptyFileRef.uuid }
|
||||
}),
|
||||
let existingGroupGroup = xcodeProject.pbxproj.groups.first(where: {
|
||||
$0.children.contains { $0.uuid == existingGroup.uuid }
|
||||
}) {
|
||||
existingGroupGroup.children.removeAll(where: { $0.uuid == existingGroup.uuid })
|
||||
existingGroupGroup.children.insert(emptyFileRef, at: 0)
|
||||
xcodeProject.pbxproj.delete(object: existingGroup)
|
||||
}
|
||||
|
||||
try xcodeProject.write(path: Path(xcodeproj.lastComponent))
|
||||
}
|
||||
|
||||
|
||||
+3
-4
@@ -15,14 +15,13 @@ public struct ASCKey: Sendable {
|
||||
|
||||
actor ASCJWTGenerator {
|
||||
// the duration for which we generate JWTs.
|
||||
// ASC allows a maximum of 20 minutes. We use
|
||||
// 15 minutes to account for clock drift.
|
||||
private static let ttl: TimeInterval = 60 * 15
|
||||
// ASC allows a maximum of 20 minutes.
|
||||
private static let ttl: TimeInterval = 60 * 20
|
||||
|
||||
// the minimum remaining ttl for us to consider reusing a previous key.
|
||||
// that is, we reuse the last JWT if it has at least [threshold] seconds
|
||||
// left before it expires.
|
||||
private static let tolerance: TimeInterval = 60 * 2
|
||||
private static let tolerance: TimeInterval = 60
|
||||
|
||||
private static let encoder: JSONEncoder = {
|
||||
let encoder = JSONEncoder()
|
||||
@@ -41,22 +41,14 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
|
||||
private func upsertApp(
|
||||
bundleID: String,
|
||||
entitlements: Entitlements,
|
||||
isFreeTeam: Bool
|
||||
isFreeTeam: Bool,
|
||||
appIDs: [String: Components.Schemas.BundleId]
|
||||
) async throws -> Components.Schemas.BundleId {
|
||||
let newBundleID = ProvisioningIdentifiers.identifier(fromSanitized: bundleID, context: self.context)
|
||||
|
||||
let existing = try await context.developerAPIClient
|
||||
.bundleIdsGetCollection(query: .init(
|
||||
filter_lbrack_identifier_rbrack_: [bundleID]
|
||||
))
|
||||
.ok.body.json.data
|
||||
// filter[identifier] is a prefix filter so we need to manually upgrade to equality
|
||||
.first(where: { $0.attributes?.identifier == newBundleID })
|
||||
|
||||
let appID: Components.Schemas.BundleId
|
||||
if let existing {
|
||||
if let existing = appIDs[bundleID] {
|
||||
appID = existing
|
||||
} else {
|
||||
let newBundleID = ProvisioningIdentifiers.identifier(fromSanitized: bundleID, context: self.context)
|
||||
let name = ProvisioningIdentifiers.appName(fromSanitized: bundleID)
|
||||
let createResponse = try await context.developerAPIClient.bundleIdsCreateInstance(
|
||||
body: .json(
|
||||
@@ -65,7 +57,7 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
|
||||
_type: .bundleIds,
|
||||
attributes: .init(
|
||||
name: name,
|
||||
platform: .init(.ios),
|
||||
platform: .ios,
|
||||
identifier: newBundleID
|
||||
)
|
||||
)
|
||||
@@ -113,8 +105,8 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
|
||||
}
|
||||
} else {
|
||||
// DeveloperServices doesn't allow deleting these capabilities
|
||||
let requiredCapabilities: Set<Components.Schemas.CapabilityType.Value1Payload> = [.inAppPurchase]
|
||||
if let capType = cap.attributes?.capabilityType?.value1, !requiredCapabilities.contains(capType) {
|
||||
let requiredCapabilities: Set<Components.Schemas.CapabilityType> = [.inAppPurchase]
|
||||
if let capType = cap.attributes?.capabilityType, !requiredCapabilities.contains(capType) {
|
||||
_ = try await context.developerAPIClient
|
||||
.bundleIdCapabilitiesDeleteInstance(path: .init(id: cap.id))
|
||||
.noContent
|
||||
@@ -137,8 +129,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
|
||||
@@ -158,7 +150,8 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
|
||||
/// that the app has).
|
||||
private func addApp(
|
||||
_ app: URL,
|
||||
isFreeTeam: Bool
|
||||
isFreeTeam: Bool,
|
||||
appIDs: [String: Components.Schemas.BundleId]
|
||||
) async throws -> ProvisioningInfo {
|
||||
let infoURL = app.appendingPathComponent("Info.plist")
|
||||
guard let data = try? Data(contentsOf: infoURL),
|
||||
@@ -172,7 +165,7 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
|
||||
var entitlements: Entitlements
|
||||
// if the executable doesn't already have entitlements, that's
|
||||
// okay. We don't have to throw an error.
|
||||
if let entitlementsData = try? await context.signer.analyze(executable: executableURL),
|
||||
if let entitlementsData = try? await context.signerImpl.analyze(executable: executableURL),
|
||||
let decodedEntitlements = try? PropertyListDecoder().decode(Entitlements.self, from: entitlementsData) {
|
||||
entitlements = decodedEntitlements
|
||||
|
||||
@@ -186,7 +179,7 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
|
||||
entitlements = try Entitlements(entitlements: [])
|
||||
}
|
||||
|
||||
let appID = try await upsertApp(bundleID: bundleID, entitlements: entitlements, isFreeTeam: isFreeTeam)
|
||||
let appID = try await upsertApp(bundleID: bundleID, entitlements: entitlements, isFreeTeam: isFreeTeam, appIDs: appIDs)
|
||||
let newBundleID = appID.attributes!.identifier!
|
||||
|
||||
let teamID = try signingInfo.certificate.teamID()
|
||||
@@ -232,17 +225,28 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
|
||||
)
|
||||
}
|
||||
|
||||
// keyed by sanitized bundle ID
|
||||
private func getCurrentAppIDs() async throws -> [String: Components.Schemas.BundleId] {
|
||||
let bundleIDs = try await context.developerAPIClient.bundleIdsGetCollection().ok.body.json.data
|
||||
let keyedIDs = bundleIDs
|
||||
.compactMap { id -> (String, Components.Schemas.BundleId)? in
|
||||
guard let bundleID = id.attributes?.identifier else { return nil }
|
||||
return (ProvisioningIdentifiers.sanitize(identifier: bundleID), id)
|
||||
}
|
||||
return Dictionary(keyedIDs, uniquingKeysWith: { $1 })
|
||||
}
|
||||
|
||||
/// Registers the app + its extensions, returning the profile and entitlements of each
|
||||
public func perform() async throws -> [URL: ProvisioningInfo] {
|
||||
var apps: [URL] = [root]
|
||||
|
||||
for pluginsDir in ["PlugIns", "Extensions"] {
|
||||
let plugins = root.appendingPathComponent(pluginsDir)
|
||||
guard plugins.dirExists else { continue }
|
||||
let plugins = root.appendingPathComponent("PlugIns")
|
||||
if plugins.dirExists {
|
||||
apps += plugins.implicitContents.filter { $0.pathExtension.lowercased() == "appex" }
|
||||
}
|
||||
|
||||
let isFreeTeam = try await context.auth.team()?.isFree == true
|
||||
async let isFreeTeamTask = context.auth.team()?.isFree == true
|
||||
async let appIDsTask = getCurrentAppIDs()
|
||||
let (isFreeTeam, appIDs) = try await (isFreeTeamTask, appIDsTask)
|
||||
|
||||
return try await withThrowingTaskGroup(
|
||||
of: (URL, ProvisioningInfo).self,
|
||||
@@ -250,7 +254,7 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
|
||||
) { group in
|
||||
for app in apps {
|
||||
group.addTask {
|
||||
let info = try await addApp(app, isFreeTeam: isFreeTeam)
|
||||
let info = try await addApp(app, isFreeTeam: isFreeTeam, appIDs: appIDs)
|
||||
return (app, info)
|
||||
}
|
||||
}
|
||||
|
||||
+5
-15
@@ -15,21 +15,11 @@ public struct DeveloperServicesCapability: Sendable, Hashable {
|
||||
public var settings: [Components.Schemas.CapabilitySetting]?
|
||||
|
||||
public init(
|
||||
_ capabilityType: Components.Schemas.CapabilityType.Value1Payload,
|
||||
_ capabilityType: Components.Schemas.CapabilityType,
|
||||
isFree: Bool,
|
||||
settings: [Components.Schemas.CapabilitySetting]? = nil
|
||||
) {
|
||||
self.capabilityType = .init(capabilityType)
|
||||
self.isFree = isFree
|
||||
self.settings = settings
|
||||
}
|
||||
|
||||
public init(
|
||||
rawName: String,
|
||||
isFree: Bool,
|
||||
settings: [Components.Schemas.CapabilitySetting]? = nil
|
||||
) {
|
||||
self.capabilityType = .init(value2: rawName)
|
||||
self.capabilityType = capabilityType
|
||||
self.isFree = isFree
|
||||
self.settings = settings
|
||||
}
|
||||
@@ -49,7 +39,7 @@ extension Entitlement {
|
||||
|
||||
extension DataProtectionEntitlement: EntitlementWithCapability {
|
||||
var capability: DeveloperServicesCapability {
|
||||
let option: Components.Schemas.CapabilityOption.KeyPayload.Value1Payload = switch self {
|
||||
let option: Components.Schemas.CapabilityOption.KeyPayload = switch self {
|
||||
case .complete: .completeProtection
|
||||
case .unlessOpen: .protectedUnlessOpen
|
||||
case .untilFirstAuth: .protectedUntilFirstUserAuth
|
||||
@@ -59,8 +49,8 @@ extension DataProtectionEntitlement: EntitlementWithCapability {
|
||||
isFree: true,
|
||||
settings: [
|
||||
.init(
|
||||
key: .init(.dataProtectionPermissionLevel),
|
||||
options: [.init(key: .init(option))]
|
||||
key: .dataProtectionPermissionLevel,
|
||||
options: [.init(key: option)]
|
||||
)
|
||||
]
|
||||
)
|
||||
|
||||
+1
-1
@@ -54,7 +54,7 @@ public struct DeveloperServicesFetchCertificateOperation: DeveloperServicesOpera
|
||||
_type: .certificates,
|
||||
attributes: .init(
|
||||
csrContent: csr.pemString,
|
||||
certificateType: .init(.development)
|
||||
certificateType: .development
|
||||
)
|
||||
)))
|
||||
)
|
||||
|
||||
+36
-66
@@ -6,14 +6,11 @@ import OpenAPIURLSession
|
||||
import Dependencies
|
||||
|
||||
extension DeveloperAPIClient {
|
||||
@TaskLocal fileprivate static var cursor: [URLQueryItem] = []
|
||||
|
||||
public init(
|
||||
auth: DeveloperAPIAuthData
|
||||
) {
|
||||
@Dependency(\.httpClient) var httpClient
|
||||
self.init(
|
||||
// swiftlint:disable:next force_try
|
||||
serverURL: try! Servers.Server1.url(),
|
||||
configuration: .init(
|
||||
dateTranscoder: .iso8601WithFractionalSeconds
|
||||
@@ -25,39 +22,6 @@ extension DeveloperAPIClient {
|
||||
]
|
||||
)
|
||||
}
|
||||
|
||||
/// Perform a paginated request, starting at the page given by `link`.
|
||||
///
|
||||
/// `link` should be a URL that contains a `cursor` query parameter. The
|
||||
/// cursor will be applied to any requests made inside the closure.
|
||||
public static func withNextLink<T>(
|
||||
_ link: String?,
|
||||
isolation: isolated (any Actor)? = #isolation,
|
||||
perform action: () async throws -> T
|
||||
) async throws -> T {
|
||||
let cursor: [URLQueryItem]
|
||||
|
||||
if let link {
|
||||
guard let components = URLComponents(string: link),
|
||||
let newOffset = components.queryItems?.first(where: { $0.name == "cursor" }),
|
||||
let newLimit = components.queryItems?.first(where: { $0.name == "limit" })
|
||||
else { throw Errors.badNextLink(link) }
|
||||
// the next value will contain a cursor (offset) *and* a limit even if we didn't
|
||||
// provide a limit in our initial request. we need to include the limit in subsequent
|
||||
// requests, otherwise the cursor isn't respected.
|
||||
cursor = [newOffset, newLimit]
|
||||
} else {
|
||||
cursor = []
|
||||
}
|
||||
|
||||
return try await $cursor.withValue(cursor) {
|
||||
try await action()
|
||||
}
|
||||
}
|
||||
|
||||
public enum Errors: Error {
|
||||
case badNextLink(String)
|
||||
}
|
||||
}
|
||||
|
||||
public enum DeveloperAPIAuthData: Sendable {
|
||||
@@ -73,13 +37,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 {
|
||||
@@ -169,13 +126,9 @@ public struct DeveloperAPIXcodeAuthMiddleware: ClientMiddleware {
|
||||
|
||||
let path = request.path ?? "/"
|
||||
var components = URLComponents(string: path) ?? .init()
|
||||
|
||||
var items = components.queryItems ?? []
|
||||
items.upsertQueryItems(DeveloperAPIClient.cursor + [
|
||||
components.queryItems = (components.queryItems ?? []) + [
|
||||
URLQueryItem(name: "teamId", value: authData.teamID.rawValue)
|
||||
])
|
||||
components.queryItems = items
|
||||
|
||||
]
|
||||
let query = components.percentEncodedQuery ?? ""
|
||||
|
||||
components.query = nil
|
||||
@@ -261,28 +214,45 @@ public struct DeveloperAPIASCAuthMiddleware: ClientMiddleware {
|
||||
_ baseURL: URL
|
||||
) async throws -> (HTTPResponse, HTTPBody?)
|
||||
) async throws -> (HTTPResponse, HTTPBody?) {
|
||||
var request = request
|
||||
|
||||
let jwt = try await generator.generate()
|
||||
var request = request
|
||||
request.headerFields[.authorization] = "Bearer \(jwt)"
|
||||
|
||||
let cursor = DeveloperAPIClient.cursor
|
||||
if !cursor.isEmpty {
|
||||
var components = URLComponents(string: request.path ?? "") ?? .init()
|
||||
var items = components.queryItems ?? []
|
||||
items.upsertQueryItems(cursor)
|
||||
components.queryItems = items
|
||||
request.path = components.string
|
||||
}
|
||||
|
||||
return try await next(request, body, baseURL)
|
||||
}
|
||||
}
|
||||
|
||||
extension [URLQueryItem] {
|
||||
fileprivate mutating func upsertQueryItems(_ items: [URLQueryItem]) {
|
||||
let newNames = Set(items.map(\.name))
|
||||
removeAll { newNames.contains($0.name) }
|
||||
append(contentsOf: items)
|
||||
struct LoggingMiddleware: ClientMiddleware {
|
||||
static let regex: NSRegularExpression? = {
|
||||
guard let pat = ProcessInfo.processInfo.environment["XTL_DEV_LOG"] else { return nil }
|
||||
return try? NSRegularExpression(pattern: pat)
|
||||
}()
|
||||
|
||||
func intercept(
|
||||
_ request: HTTPRequest,
|
||||
body: HTTPBody?,
|
||||
baseURL: URL,
|
||||
operationID: String,
|
||||
next: (HTTPRequest, HTTPBody?, URL) async throws -> (HTTPResponse, HTTPBody?)
|
||||
) async throws -> (HTTPResponse, HTTPBody?) {
|
||||
var (response, body) = try await next(request, body, baseURL)
|
||||
|
||||
guard Self.regex?.firstMatch(
|
||||
in: operationID,
|
||||
range: NSRange(operationID.startIndex..., in: operationID)
|
||||
) != nil
|
||||
else { return (response, body) }
|
||||
|
||||
print("\n\(operationID) response status -> \(response.status)")
|
||||
|
||||
if let unwrapped = body {
|
||||
let data = try await Data(collecting: unwrapped, upTo: .max)
|
||||
// body may only be consumable once, replace it with the collected data
|
||||
body = .init(data)
|
||||
|
||||
let text = String(decoding: data, as: UTF8.self)
|
||||
print("\(operationID) response body -> \(text)")
|
||||
}
|
||||
|
||||
return (response, body)
|
||||
}
|
||||
}
|
||||
@@ -39,7 +39,7 @@ public struct DeveloperServicesProvisioningOperation: DeveloperServicesOperation
|
||||
|
||||
public func perform() async throws -> Response {
|
||||
progress(0/3)
|
||||
try await DeveloperServicesAddDeviceOperation(context: context).perform()
|
||||
_ = try await DeveloperServicesFetchDeviceOperation(context: context).perform()
|
||||
|
||||
progress(1/3)
|
||||
let signingInfo = try await DeveloperServicesFetchCertificateOperation(
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
import Foundation
|
||||
import DeveloperAPI
|
||||
|
||||
public struct DeveloperServicesAddDeviceOperation: DeveloperServicesOperation {
|
||||
public let context: SigningContext
|
||||
public init(context: SigningContext) {
|
||||
self.context = context
|
||||
}
|
||||
|
||||
public func perform() async throws {
|
||||
guard let targetDevice = context.targetDevice else { return }
|
||||
|
||||
// try to register the device
|
||||
let response = try await context.developerAPIClient.devicesCreateInstance(
|
||||
body: .json(.init(data: .init(
|
||||
_type: .devices,
|
||||
attributes: .init(
|
||||
name: targetDevice.name,
|
||||
platform: .init(.ios),
|
||||
udid: targetDevice.udid
|
||||
)
|
||||
)))
|
||||
)
|
||||
|
||||
// we get a 409 CONFLICT if the device was already registered.
|
||||
// handle this by returning gracefully.
|
||||
if (try? response.conflict) != nil {
|
||||
return
|
||||
}
|
||||
|
||||
// otherwise, we should get a 201 CREATED to indicate that the device
|
||||
// was added. any other case is unexpected, and this will throw.
|
||||
_ = try response.created
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
//
|
||||
// DeveloperServicesFetchDeviceOperation.swift
|
||||
// XKit
|
||||
//
|
||||
// Created by Kabir Oberai on 13/10/19.
|
||||
// Copyright © 2019 Kabir Oberai. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import DeveloperAPI
|
||||
|
||||
public struct DeveloperServicesFetchDeviceOperation: DeveloperServicesOperation {
|
||||
public let context: SigningContext
|
||||
public init(context: SigningContext) {
|
||||
self.context = context
|
||||
}
|
||||
|
||||
public func perform() async throws -> Components.Schemas.Device {
|
||||
let devices = try await context.developerAPIClient.devicesGetCollection().ok.body.json.data
|
||||
|
||||
if let device = devices.first(where: { $0.attributes?.udid == self.context.udid }) {
|
||||
return device
|
||||
}
|
||||
|
||||
let response = try await context.developerAPIClient.devicesCreateInstance(
|
||||
body: .json(.init(data: .init(
|
||||
_type: .devices,
|
||||
attributes: .init(
|
||||
name: self.context.deviceName,
|
||||
platform: .ios,
|
||||
udid: self.context.udid
|
||||
)
|
||||
)))
|
||||
)
|
||||
|
||||
return try response.created.body.json.data
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,78 +0,0 @@
|
||||
import DeveloperAPI
|
||||
|
||||
/// An `AsyncSequence` that unfolds a paginated DeveloperAPI request.
|
||||
///
|
||||
/// Some Developer API GET requests are paginated. Each response contains
|
||||
/// a `links.next` field that points to the next page. This API allows you to
|
||||
/// consume all pages as an `AsyncSequence`. For example, you can
|
||||
/// enumerate all devices with
|
||||
///
|
||||
/// ```swift
|
||||
/// let pages = DeveloperAPIPages {
|
||||
/// try await client.devicesGetCollection().ok.body.json
|
||||
/// } next: {
|
||||
/// $0.links.next
|
||||
/// }
|
||||
/// for try await page in pages {
|
||||
/// print(page.data)
|
||||
/// }
|
||||
/// ```
|
||||
public struct DeveloperAPIPages<Page>: AsyncSequence {
|
||||
// inspired by PagedRequest from
|
||||
// https://github.com/AvdLee/appstoreconnect-swift-sdk
|
||||
|
||||
public var request: @Sendable () async throws -> Page
|
||||
public var getNext: @Sendable (Page) -> String?
|
||||
|
||||
public init(
|
||||
request: @escaping @Sendable () async throws -> Page,
|
||||
next getNext: @escaping @Sendable (Page) -> String?
|
||||
) {
|
||||
self.request = request
|
||||
self.getNext = getNext
|
||||
}
|
||||
|
||||
public func makeAsyncIterator() -> AsyncIterator {
|
||||
AsyncIterator(request: request, getNext: getNext)
|
||||
}
|
||||
|
||||
public struct AsyncIterator: AsyncIteratorProtocol {
|
||||
fileprivate enum State {
|
||||
case initial
|
||||
case hasNext(String)
|
||||
case end
|
||||
}
|
||||
|
||||
fileprivate let request: @Sendable () async throws -> Page
|
||||
fileprivate let getNext: @Sendable (Page) -> String?
|
||||
|
||||
fileprivate var state: State = .initial
|
||||
|
||||
public mutating func next() async throws -> Page? {
|
||||
guard !Task.isCancelled else { return nil }
|
||||
|
||||
let cursor: String?
|
||||
|
||||
switch state {
|
||||
case .initial:
|
||||
cursor = nil
|
||||
case .hasNext(let next):
|
||||
cursor = next
|
||||
case .end:
|
||||
return nil
|
||||
}
|
||||
|
||||
let page = try await DeveloperAPIClient.withNextLink(cursor) {
|
||||
try await request()
|
||||
}
|
||||
|
||||
if let next = getNext(page), next != cursor {
|
||||
state = .hasNext(next)
|
||||
} else {
|
||||
state = .end
|
||||
}
|
||||
|
||||
return page
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,39 +0,0 @@
|
||||
import Foundation
|
||||
import OpenAPIRuntime
|
||||
import HTTPTypes
|
||||
|
||||
struct LoggingMiddleware: ClientMiddleware {
|
||||
static let regex: NSRegularExpression? = {
|
||||
guard let pat = ProcessInfo.processInfo.environment["XTL_DEV_LOG"] else { return nil }
|
||||
return try? NSRegularExpression(pattern: pat)
|
||||
}()
|
||||
|
||||
func intercept(
|
||||
_ request: HTTPRequest,
|
||||
body: HTTPBody?,
|
||||
baseURL: URL,
|
||||
operationID: String,
|
||||
next: (HTTPRequest, HTTPBody?, URL) async throws -> (HTTPResponse, HTTPBody?)
|
||||
) async throws -> (HTTPResponse, HTTPBody?) {
|
||||
var (response, body) = try await next(request, body, baseURL)
|
||||
|
||||
guard Self.regex?.firstMatch(
|
||||
in: operationID,
|
||||
range: NSRange(operationID.startIndex..., in: operationID)
|
||||
) != nil
|
||||
else { return (response, body) }
|
||||
|
||||
print("\n\(operationID) response status -> \(response.status)")
|
||||
|
||||
if let unwrapped = body {
|
||||
let data = try await Data(collecting: unwrapped, upTo: .max)
|
||||
// body may only be consumable once, replace it with the collected data
|
||||
body = .init(data)
|
||||
|
||||
let text = String(decoding: data, as: UTF8.self)
|
||||
print("\(operationID) response body -> \(text)")
|
||||
}
|
||||
|
||||
return (response, body)
|
||||
}
|
||||
}
|
||||
@@ -1,31 +0,0 @@
|
||||
import DeveloperAPI
|
||||
|
||||
// syntactic sugar to make it nicer to work with `anyOf:` types
|
||||
public protocol OpenAPIExtensibleEnum {
|
||||
associatedtype Value1Payload: RawRepresentable<String>, Codable, Hashable, Sendable, CaseIterable
|
||||
var value1: Value1Payload? { get set }
|
||||
var value2: String? { get set }
|
||||
|
||||
init(value1: Value1Payload?, value2: String?)
|
||||
}
|
||||
|
||||
extension OpenAPIExtensibleEnum {
|
||||
public var rawValue: String {
|
||||
value2!
|
||||
}
|
||||
|
||||
public init(_ value: Value1Payload) {
|
||||
self.init(value1: value, value2: nil)
|
||||
}
|
||||
}
|
||||
|
||||
extension Components.Schemas.BundleIdPlatform: OpenAPIExtensibleEnum {}
|
||||
extension Components.Schemas.CapabilityOption.KeyPayload: OpenAPIExtensibleEnum {}
|
||||
extension Components.Schemas.CapabilitySetting.KeyPayload: OpenAPIExtensibleEnum {}
|
||||
extension Components.Schemas.CapabilityType: OpenAPIExtensibleEnum {}
|
||||
extension Components.Schemas.CertificateType: OpenAPIExtensibleEnum {}
|
||||
extension Components.Schemas.Device.AttributesPayload.DeviceClassPayload: OpenAPIExtensibleEnum {}
|
||||
extension Components.Schemas.Device.AttributesPayload.StatusPayload: OpenAPIExtensibleEnum {}
|
||||
extension Components.Schemas.Profile.AttributesPayload.ProfileStatePayload: OpenAPIExtensibleEnum {}
|
||||
extension Components.Schemas.Profile.AttributesPayload.ProfileTypePayload: OpenAPIExtensibleEnum {}
|
||||
extension Components.Schemas.ProfileCreateRequest.DataPayload.AttributesPayload.ProfileTypePayload: OpenAPIExtensibleEnum {}
|
||||
+1
-11
@@ -71,7 +71,6 @@ public struct DeveloperServicesFetchProfileOperation: DeveloperServicesOperation
|
||||
|
||||
let allDevices = try await context.developerAPIClient.devicesGetCollection()
|
||||
.ok.body.json.data
|
||||
.filter { $0.attributes?.deviceClass?.value1?.supportsIOSApps == true }
|
||||
|
||||
let response = try await context.developerAPIClient.profilesCreateInstance(
|
||||
body: .json(
|
||||
@@ -80,7 +79,7 @@ public struct DeveloperServicesFetchProfileOperation: DeveloperServicesOperation
|
||||
_type: .profiles,
|
||||
attributes: .init(
|
||||
name: "XTL profile \(bundleID.id)",
|
||||
profileType: .init(.iosAppDevelopment)
|
||||
profileType: .iosAppDevelopment
|
||||
),
|
||||
relationships: .init(
|
||||
bundleId: .init(
|
||||
@@ -107,12 +106,3 @@ public struct DeveloperServicesFetchProfileOperation: DeveloperServicesOperation
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
extension Components.Schemas.Device.AttributesPayload.DeviceClassPayload.Value1Payload {
|
||||
fileprivate var supportsIOSApps: Bool {
|
||||
switch self {
|
||||
case .ipad, .iphone, .ipod: true
|
||||
default: false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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
|
||||
@@ -225,11 +225,7 @@ public struct ADIDataProvider: AnisetteDataProvider {
|
||||
) async throws -> AnisetteData {
|
||||
let requestTime = Date()
|
||||
var routingInfo = routingInfo
|
||||
let (mid, otp) = try await rawProvider.requestOTP(
|
||||
userID: localUserUID,
|
||||
routingInfo: &routingInfo,
|
||||
provisioningInfo: provisioningInfo
|
||||
)
|
||||
let (mid, otp) = try await rawProvider.requestOTP(userID: localUserUID, routingInfo: &routingInfo, provisioningInfo: provisioningInfo)
|
||||
return AnisetteData(
|
||||
clientTime: requestTime,
|
||||
routingInfo: routingInfo,
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
import Foundation
|
||||
import XADI
|
||||
import Dependencies
|
||||
import Subprocess
|
||||
|
||||
public actor XADIProvider: RawADIProvider {
|
||||
@MainActor private static var loadTask: Task<Void, Error>?
|
||||
@@ -46,17 +45,17 @@ public actor XADIProvider: RawADIProvider {
|
||||
let archDir = "lib/\(arch)"
|
||||
|
||||
// TODO: Use ZIPFoundation
|
||||
try await Subprocess.run(
|
||||
.name("unzip"),
|
||||
arguments: [
|
||||
"-q",
|
||||
applemusic.path,
|
||||
"\(archDir)/libCoreADI.so",
|
||||
"\(archDir)/libstoreservicescore.so",
|
||||
"-d", tmp.path
|
||||
],
|
||||
output: .discarded
|
||||
).checkSuccess()
|
||||
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 FileManager.default.moveItem(
|
||||
at: tmp.appending(path: archDir),
|
||||
to: libDir
|
||||
@@ -154,7 +153,7 @@ public actor XADIProvider: RawADIProvider {
|
||||
var midLen: UInt32 = 0
|
||||
var otpBytes: UnsafeMutableRawPointer?
|
||||
var otpLen: UInt32 = 0
|
||||
|
||||
|
||||
let adiDirectory = directory.appending(path: "adi")
|
||||
try? FileManager.default.createDirectory(at: adiDirectory, withIntermediateDirectories: true)
|
||||
let adiFile = adiDirectory.appending(path: "adi.pb")
|
||||
|
||||
@@ -111,7 +111,7 @@ struct SRPClient {
|
||||
|
||||
let hashedPassword = Data(SHA256.hash(data: Data(password.utf8)))
|
||||
let pbkdfInput = if isLegacyProtocol {
|
||||
Data(hashedPassword.map { String(format: "%02hhx", $0) }.joined().utf8)
|
||||
Data(hashedPassword.map { String(format: "%02hhx", $0) }.joined(separator: "").utf8)
|
||||
} else {
|
||||
hashedPassword
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ struct GrandSlamLoginData: Decodable {
|
||||
let cookie: Data
|
||||
|
||||
var identityToken: String {
|
||||
Data("\(adsid):\(idmsToken)".utf8).base64EncodedString()
|
||||
"\(adsid):\(idmsToken)".data(using: .utf8)!.base64EncodedString()
|
||||
}
|
||||
|
||||
private enum CodingKeys: String, CodingKey {
|
||||
|
||||
@@ -46,3 +46,4 @@ struct GrandSlamValidateSMSRequest: GrandSlamTwoFactorRequest {
|
||||
])
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -24,11 +24,10 @@ extension HTTPClientDependencyKey: DependencyKey {
|
||||
let appleRootCA = try! NIOSSLCertificate(bytes: Array(appleRootPEM.utf8), format: .pem)
|
||||
var tlsConfiguration: TLSConfiguration = .makeClientConfiguration()
|
||||
tlsConfiguration.additionalTrustRoots = [.certificates([appleRootCA])]
|
||||
var config = HTTPClient.Configuration(
|
||||
let config = HTTPClient.Configuration(
|
||||
tlsConfiguration: tlsConfiguration,
|
||||
decompression: .enabled(limit: .none)
|
||||
)
|
||||
config.timeout.connect = .seconds(60)
|
||||
return HTTPClient(configuration: config)
|
||||
}()
|
||||
}
|
||||
|
||||
@@ -75,6 +75,11 @@ public actor AppInstaller {
|
||||
}
|
||||
}
|
||||
|
||||
// serial queue
|
||||
private let installQueue = DispatchQueue(
|
||||
label: "com.kabiroberai.xtool.install-queue"
|
||||
)
|
||||
|
||||
public let ipa: URL
|
||||
public let udid: String
|
||||
public let connectionPreferences: Connection.Preferences
|
||||
|
||||
@@ -139,11 +139,7 @@ public actor Connection {
|
||||
|
||||
}
|
||||
|
||||
#if compiler(<6.2)
|
||||
private typealias SendableMetatype = Any
|
||||
#endif
|
||||
|
||||
private actor WeakPool<Key: Hashable & SendableMetatype, Value: AnyObject & Sendable, Failure: Error> {
|
||||
private actor WeakPool<Key: Hashable, Value: AnyObject & Sendable, Failure: Error> {
|
||||
init() {}
|
||||
|
||||
private var pendingValues: [Key: Task<Result<Value, Failure>, Never>] = [:]
|
||||
|
||||
@@ -10,7 +10,7 @@ import Foundation
|
||||
import SwiftyMobileDevice
|
||||
import ConcurrencyExtras
|
||||
|
||||
public actor HeartbeatHandler {
|
||||
public actor HeartbeatHandler: Sendable {
|
||||
private struct Error: Swift.Error {}
|
||||
|
||||
private struct ReceivedPacket: Decodable {
|
||||
|
||||
@@ -15,7 +15,7 @@ public final class IPAUploader: Sendable {
|
||||
case unexpectedSymlink(at: URL)
|
||||
}
|
||||
|
||||
private static let packagePath = URL(fileURLWithPath: "/PublicStaging")
|
||||
private static let packagePath = URL(fileURLWithPath: "PublicStaging")
|
||||
private static let bufferSize = 1 << 20 // 1 MB
|
||||
|
||||
public final class UploadedIPA: Sendable {
|
||||
|
||||
@@ -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,11 +235,13 @@ 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 }
|
||||
|
||||
try await updateStage(to: "Preparing device")
|
||||
try await updateStage(to: "Logging in")
|
||||
|
||||
try await self.updateStage(to: "Preparing device")
|
||||
|
||||
// TODO: Maybe use `Connection` here instead of creating the lockdown
|
||||
// client manually?
|
||||
@@ -250,7 +261,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 +269,31 @@ public actor IntegratedInstaller {
|
||||
|
||||
try await updateProgress(to: 1)
|
||||
|
||||
let bundleID = try await signInPlace(
|
||||
let context = try SigningContext(
|
||||
udid: udid,
|
||||
deviceName: deviceName,
|
||||
auth: auth
|
||||
)
|
||||
|
||||
let signer = Signer(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 +322,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 }
|
||||
|
||||
@@ -1,7 +1,14 @@
|
||||
//
|
||||
// Signer.swift
|
||||
// XKit
|
||||
//
|
||||
// Created by Kabir Oberai on 13/10/19.
|
||||
// Copyright © 2019 Kabir Oberai. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
/// Provisions and codesigns.
|
||||
public struct AutoSigner {
|
||||
public struct Signer {
|
||||
|
||||
public enum Error: LocalizedError {
|
||||
case noSigners
|
||||
@@ -85,9 +92,10 @@ public struct AutoSigner {
|
||||
let entitlements = provisioningDict.mapValues(\.entitlements)
|
||||
|
||||
status(NSLocalizedString("signer.signing", value: "Signing", comment: ""))
|
||||
try await context.signer.sign(
|
||||
try await context.signerImpl.sign(
|
||||
app: app,
|
||||
identity: .real(signingInfo.certificate, signingInfo.privateKey),
|
||||
certificate: signingInfo.certificate,
|
||||
privateKey: signingInfo.privateKey,
|
||||
entitlementMapping: entitlements,
|
||||
progress: progress
|
||||
)
|
||||
@@ -1,10 +1,23 @@
|
||||
//
|
||||
// SignerImpl.swift
|
||||
// XKit
|
||||
//
|
||||
// Created by Kabir Oberai on 10/10/19.
|
||||
// Copyright © 2019 Kabir Oberai. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import CXKit
|
||||
import SignerSupport
|
||||
import ConcurrencyExtras
|
||||
|
||||
/// a wrapper around `signer_t`
|
||||
public actor Signer {
|
||||
/// a wrapper around signer_t
|
||||
public actor SignerImpl {
|
||||
|
||||
private static let signingQueue = DispatchQueue(
|
||||
label: "com.kabiroberai.xtool.signing-queue",
|
||||
attributes: .concurrent
|
||||
)
|
||||
|
||||
public enum Error: LocalizedError {
|
||||
case notFound
|
||||
@@ -31,11 +44,6 @@ public actor Signer {
|
||||
}
|
||||
}
|
||||
|
||||
public enum Identity {
|
||||
case real(Certificate, PrivateKey)
|
||||
case adhoc
|
||||
}
|
||||
|
||||
private let signer: UnsafePointer<signer_t>
|
||||
public var name: String {
|
||||
String(cString: signer.pointee.name)
|
||||
@@ -45,23 +53,24 @@ public actor Signer {
|
||||
self.signer = signer.value
|
||||
}
|
||||
|
||||
public static func all() -> some Collection<Signer> {
|
||||
public static func all() -> some Collection<SignerImpl> {
|
||||
var list = get_signers()
|
||||
var arr: [Signer] = []
|
||||
var arr: [SignerImpl] = []
|
||||
while let curr = list {
|
||||
arr.append(Signer(signer: UncheckedSendable(curr)))
|
||||
arr.append(SignerImpl(signer: UncheckedSendable(curr)))
|
||||
list = curr.pointee.next
|
||||
}
|
||||
return arr
|
||||
}
|
||||
|
||||
public static func first() throws -> Signer {
|
||||
public static func first() throws -> SignerImpl {
|
||||
try all().first.orThrow(Error.notFound)
|
||||
}
|
||||
|
||||
private func _sign(
|
||||
app: URL,
|
||||
identity: Identity,
|
||||
certificate: Certificate,
|
||||
privateKey: PrivateKey,
|
||||
entitlementMapping: [URL: Entitlements],
|
||||
progress: @escaping (Double?) -> Void
|
||||
) throws {
|
||||
@@ -90,32 +99,14 @@ public actor Signer {
|
||||
}
|
||||
let sendableProgress = UncheckedSendable(progress)
|
||||
let sendableEntsArray = UncheckedSendable(entsArray)
|
||||
|
||||
let certificateData: Data
|
||||
let privateKeyData: Data
|
||||
let lengthOverride: Int?
|
||||
switch identity {
|
||||
case .real(let certificate, let privateKey):
|
||||
certificateData = try certificate.data()
|
||||
privateKeyData = privateKey.data
|
||||
lengthOverride = nil
|
||||
case .adhoc:
|
||||
// we can't use empty data here because withUnsafeBytes
|
||||
// might return a bufferpointer with a nil base address,
|
||||
// but signer.h expects non-null values. The real fix is
|
||||
// updating xtool-core/SignerSupport/signer.h to annotate
|
||||
// the pointers as nullable, but alas that requires effort.
|
||||
certificateData = Data([0])
|
||||
privateKeyData = Data([0])
|
||||
lengthOverride = 0
|
||||
}
|
||||
|
||||
try certificateData.withUnsafeBytes { cert in
|
||||
try privateKeyData.withUnsafeBytes { priv in
|
||||
try certificate.data().withUnsafeBytes { cert in
|
||||
let sendableCert = UncheckedSendable(cert)
|
||||
try privateKey.data.withUnsafeBytes { priv in
|
||||
var exception: UnsafeMutablePointer<Int8>?
|
||||
defer { exception.map { free($0) } }
|
||||
|
||||
let progress = sendableProgress.value
|
||||
let cert = sendableCert.value
|
||||
let entsArray = sendableEntsArray.value
|
||||
|
||||
guard let certBase = cert.baseAddress,
|
||||
@@ -126,10 +117,11 @@ public actor Signer {
|
||||
defer { box.release() }
|
||||
guard signer.pointee.sign(
|
||||
app.path,
|
||||
certBase, lengthOverride ?? cert.count,
|
||||
privBase, lengthOverride ?? priv.count,
|
||||
certBase, cert.count,
|
||||
privBase, priv.count,
|
||||
entsArray, entsArray.count,
|
||||
{
|
||||
// swiftlint:disable:previous opening_brace
|
||||
(Unmanaged<AnyObject>
|
||||
.fromOpaque($0)
|
||||
.takeUnretainedValue()
|
||||
@@ -148,16 +140,15 @@ public actor Signer {
|
||||
|
||||
public func sign(
|
||||
app: URL,
|
||||
identity: Identity,
|
||||
certificate: Certificate,
|
||||
privateKey: PrivateKey,
|
||||
entitlementMapping: [URL: Entitlements],
|
||||
progress: @escaping (Double?) -> Void
|
||||
) async throws {
|
||||
// TODO: #131: update Zupersign to handle multiple entitlements files
|
||||
// this is a temp hack to just pass along the root app entitlements
|
||||
let entitlementMapping = entitlementMapping.filter { $0.key.path == app.path }
|
||||
try self._sign(
|
||||
app: app,
|
||||
identity: identity,
|
||||
certificate: certificate,
|
||||
privateKey: privateKey,
|
||||
entitlementMapping: entitlementMapping,
|
||||
progress: progress
|
||||
)
|
||||
|
||||
@@ -11,27 +11,25 @@ import DeveloperAPI
|
||||
|
||||
public struct SigningContext: Sendable {
|
||||
|
||||
public struct TargetDevice: Sendable, Hashable {
|
||||
public var udid: String
|
||||
public var name: String
|
||||
}
|
||||
|
||||
public var auth: DeveloperAPIAuthData
|
||||
public var targetDevice: TargetDevice?
|
||||
public var signer: Signer
|
||||
public let udid: String
|
||||
public let deviceName: String
|
||||
public let auth: DeveloperAPIAuthData
|
||||
public let signerImpl: SignerImpl
|
||||
|
||||
public var developerAPIClient: DeveloperAPIClient {
|
||||
DeveloperAPIClient(auth: auth)
|
||||
}
|
||||
|
||||
public init(
|
||||
udid: String,
|
||||
deviceName: String,
|
||||
auth: DeveloperAPIAuthData,
|
||||
targetDevice: TargetDevice? = nil,
|
||||
signer: Signer? = nil
|
||||
signerImpl: SignerImpl? = nil
|
||||
) throws {
|
||||
self.udid = udid
|
||||
self.deviceName = deviceName
|
||||
self.auth = auth
|
||||
self.targetDevice = targetDevice
|
||||
self.signer = try signer ?? .first()
|
||||
self.signerImpl = try signerImpl ?? .first()
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -21,8 +21,8 @@ extension ProvisioningIdentifiers {
|
||||
return identifier.split(separator: ".").dropFirst().joined(separator: ".")
|
||||
}
|
||||
|
||||
static func identifier(fromSanitized sanitized: String, context: SigningContext) -> String {
|
||||
let uuid = context.auth.identityID.split(separator: "-")[0].uppercased()
|
||||
static func identifier(fromSanitized sanitized: String, context: SigningContext? = nil) -> String {
|
||||
let uuid = (context?.auth.identityID ?? UUID().uuidString).split(separator: "-")[0].uppercased()
|
||||
return "\(Self.idPrefix)\(uuid).\(sanitized)"
|
||||
}
|
||||
|
||||
@@ -36,7 +36,7 @@ extension ProvisioningIdentifiers {
|
||||
return sanitize(identifier: id)
|
||||
}
|
||||
|
||||
static func groupID(fromSanitized sanitized: String, context: SigningContext) -> DeveloperServicesAppGroup.GroupID {
|
||||
static func groupID(fromSanitized sanitized: String, context: SigningContext? = nil) -> DeveloperServicesAppGroup.GroupID {
|
||||
.init(rawValue: "\(Self.groupPrefix)\(identifier(fromSanitized: sanitized, context: context))")
|
||||
}
|
||||
|
||||
|
||||
@@ -47,7 +47,7 @@ private struct UnimplementedSigningInfoManager: SigningInfoManager {
|
||||
func info(forIdentityID identityID: String) throws -> SigningInfo? {
|
||||
unimplemented(placeholder: nil)
|
||||
}
|
||||
|
||||
|
||||
func setInfo(_ info: SigningInfo?, forIdentityID identityID: String) throws {
|
||||
unimplemented()
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@ struct AuthOperation {
|
||||
var password: String?
|
||||
var logoutFromExisting: Bool
|
||||
|
||||
var mode: AuthMode?
|
||||
var mode: AuthMode? = nil
|
||||
var quiet = false
|
||||
|
||||
func run() async throws {
|
||||
|
||||
@@ -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))
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import Foundation
|
||||
import XKit
|
||||
import XUtils
|
||||
import SystemPackage
|
||||
import NIOPosix
|
||||
import NIOCore
|
||||
|
||||
|
||||
@@ -20,18 +20,9 @@ struct DSCertificatesListCommand: AsyncParsableCommand {
|
||||
abstract: "List certificates"
|
||||
)
|
||||
|
||||
// swiftlint:disable:next cyclomatic_complexity
|
||||
func run() async throws {
|
||||
let client = DeveloperAPIClient(auth: try AuthToken.saved().authData())
|
||||
|
||||
let certificates = try await DeveloperAPIPages {
|
||||
try await client.certificatesGetCollection().ok.body.json
|
||||
} next: {
|
||||
$0.links.next
|
||||
}
|
||||
.map(\.data)
|
||||
.reduce(into: [], +=)
|
||||
|
||||
let certificates = try await client.certificatesGetCollection().ok.body.json.data
|
||||
for certificate in certificates {
|
||||
print("- id: \(certificate.id)")
|
||||
guard let attributes = certificate.attributes else {
|
||||
|
||||
@@ -22,15 +22,7 @@ struct DSDevicesListCommand: AsyncParsableCommand {
|
||||
|
||||
func run() async throws {
|
||||
let client = DeveloperAPIClient(auth: try AuthToken.saved().authData())
|
||||
|
||||
let devices = try await DeveloperAPIPages {
|
||||
try await client.devicesGetCollection().ok.body.json
|
||||
} next: {
|
||||
$0.links.next
|
||||
}
|
||||
.map(\.data)
|
||||
.reduce(into: [], +=)
|
||||
|
||||
let devices = try await client.devicesGetCollection().ok.body.json.data
|
||||
for device in devices {
|
||||
print("- id: \(device.id)")
|
||||
guard let attributes = device.attributes else {
|
||||
|
||||
@@ -22,15 +22,7 @@ struct DSIdentifiersListCommand: AsyncParsableCommand {
|
||||
|
||||
func run() async throws {
|
||||
let client = DeveloperAPIClient(auth: try AuthToken.saved().authData())
|
||||
|
||||
let bundleIDs = try await DeveloperAPIPages {
|
||||
try await client.bundleIdsGetCollection().ok.body.json
|
||||
} next: {
|
||||
$0.links.next
|
||||
}
|
||||
.map(\.data)
|
||||
.reduce(into: [], +=)
|
||||
|
||||
let bundleIDs = try await client.bundleIdsGetCollection().ok.body.json.data
|
||||
for bundleID in bundleIDs {
|
||||
print("- id: \(bundleID.id)")
|
||||
guard let attributes = bundleID.attributes else {
|
||||
|
||||
@@ -22,18 +22,9 @@ struct DSProfilesListCommand: AsyncParsableCommand {
|
||||
|
||||
private static let encoder = JSONEncoder()
|
||||
|
||||
// swiftlint:disable:next cyclomatic_complexity
|
||||
func run() async throws {
|
||||
let client = DeveloperAPIClient(auth: try AuthToken.saved().authData())
|
||||
|
||||
let profiles = try await DeveloperAPIPages {
|
||||
try await client.profilesGetCollection().ok.body.json
|
||||
} next: {
|
||||
$0.links.next
|
||||
}
|
||||
.map(\.data)
|
||||
.reduce(into: [], +=)
|
||||
|
||||
let profiles = try await client.profilesGetCollection().ok.body.json.data
|
||||
for profile in profiles {
|
||||
print("- id: \(profile.id)")
|
||||
guard let attributes = profile.attributes else {
|
||||
|
||||
@@ -3,7 +3,6 @@ import ArgumentParser
|
||||
import PackLib
|
||||
import XKit
|
||||
import Dependencies
|
||||
import XUtils
|
||||
|
||||
struct PackOperation {
|
||||
struct BuildOptions: ParsableArguments {
|
||||
@@ -63,33 +62,7 @@ struct PackOperation {
|
||||
buildSettings: buildSettings,
|
||||
plan: plan
|
||||
)
|
||||
let bundle = try await packer.pack()
|
||||
|
||||
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)
|
||||
}
|
||||
}
|
||||
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 try await packer.pack()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -105,6 +78,7 @@ struct DevXcodeCommand: AsyncParsableCommand {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
struct DevBuildCommand: AsyncParsableCommand {
|
||||
static let configuration = CommandConfiguration(
|
||||
commandName: "build",
|
||||
@@ -117,12 +91,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 +102,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,25 +189,16 @@ 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,
|
||||
)
|
||||
} catch let error as CancellationError {
|
||||
throw error
|
||||
} catch {
|
||||
print("\nError: \(error)")
|
||||
throw ExitCode.failure
|
||||
}
|
||||
try await installer.install(app: output)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -282,8 +218,6 @@ struct DevCommand: AsyncParsableCommand {
|
||||
extension BuildConfiguration: ExpressibleByArgument {}
|
||||
|
||||
#if os(macOS)
|
||||
import Subprocess
|
||||
|
||||
struct SimInstallOperation {
|
||||
var path: URL
|
||||
|
||||
@@ -291,12 +225,10 @@ struct SimInstallOperation {
|
||||
var simulator = "booted"
|
||||
|
||||
func run() async throws {
|
||||
try await Subprocess.run(
|
||||
.path("/usr/bin/xcrun"),
|
||||
arguments: ["simctl", "install", simulator, path.path],
|
||||
output: .discarded
|
||||
)
|
||||
.checkSuccess()
|
||||
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")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,23 +24,19 @@ 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
|
||||
} catch {
|
||||
print("\nError: \(error)")
|
||||
throw ExitCode.failure
|
||||
print("\nFailed :(")
|
||||
print("Error: \(error)")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ struct LaunchCommand: AsyncParsableCommand {
|
||||
commandName: "launch",
|
||||
abstract: "Launch an installed app"
|
||||
)
|
||||
|
||||
|
||||
@OptionGroup var connectionOptions: ConnectionOptions
|
||||
|
||||
@Argument(
|
||||
|
||||
@@ -21,7 +21,6 @@ struct NewCommand: AsyncParsableCommand {
|
||||
)
|
||||
) var skipSetup = false
|
||||
|
||||
// swiftlint:disable:next function_body_length
|
||||
func run() async throws {
|
||||
if !skipSetup {
|
||||
// perform any remaining setup steps first
|
||||
@@ -115,7 +114,7 @@ struct NewCommand: AsyncParsableCommand {
|
||||
.swiftpm/configuration/registries.json
|
||||
.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
|
||||
.netrc
|
||||
|
||||
|
||||
/xtool
|
||||
"""
|
||||
),
|
||||
@@ -135,7 +134,7 @@ struct NewCommand: AsyncParsableCommand {
|
||||
"Sources/\(moduleName)/\(moduleName)App.swift",
|
||||
"""
|
||||
import SwiftUI
|
||||
|
||||
|
||||
@main
|
||||
struct \(moduleName)App: App {
|
||||
var body: some Scene {
|
||||
@@ -151,7 +150,7 @@ struct NewCommand: AsyncParsableCommand {
|
||||
"Sources/\(moduleName)/ContentView.swift",
|
||||
"""
|
||||
import SwiftUI
|
||||
|
||||
|
||||
struct ContentView: View {
|
||||
var body: some View {
|
||||
VStack {
|
||||
|
||||
@@ -2,8 +2,6 @@ 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
|
||||
@@ -14,23 +12,20 @@ extension ZIPCompressor: DependencyKey {
|
||||
|
||||
let dest = dir.deletingLastPathComponent().appendingPathComponent("app.ipa")
|
||||
|
||||
try await Subprocess.run(
|
||||
.name("zip"),
|
||||
arguments: ["-yqru0", dest.path, dir.lastPathComponent],
|
||||
workingDirectory: FilePath(dir.deletingLastPathComponent()),
|
||||
output: .discarded,
|
||||
).checkSuccess()
|
||||
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()
|
||||
|
||||
return dest
|
||||
},
|
||||
decompress: { ipa, directory, progress in
|
||||
progress(nil)
|
||||
|
||||
try await Subprocess.run(
|
||||
.name("unzip"),
|
||||
arguments: ["-q", ipa.path, "-d", directory.path],
|
||||
output: .discarded,
|
||||
).checkSuccess()
|
||||
let unzip = Process()
|
||||
unzip.executableURL = try await ToolRegistry.locate("unzip")
|
||||
unzip.arguments = ["-q", ipa.path, "-d", directory.path]
|
||||
try await unzip.runUntilExit()
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import Foundation
|
||||
import Dependencies
|
||||
import SystemPackage
|
||||
import libunxip
|
||||
import Subprocess
|
||||
import XKit // HTTPClient, stdoutSafe
|
||||
import XUtils // System.File{Path,Descriptor}
|
||||
import PackLib // ToolRegistry
|
||||
|
||||
struct SDKBuilder {
|
||||
enum Arch: String {
|
||||
@@ -16,50 +16,28 @@ struct SDKBuilder {
|
||||
case app(String)
|
||||
|
||||
init(path: String) throws {
|
||||
var isDir: ObjCBool = false
|
||||
guard FileManager.default.fileExists(atPath: path, isDirectory: &isDir) else {
|
||||
throw Console.Error("""
|
||||
Could not read file or directory at path '\(path)'.
|
||||
See 'xtool help sdk' for usage.
|
||||
""")
|
||||
}
|
||||
|
||||
let url = URL(fileURLWithPath: path)
|
||||
|
||||
if isDir.boolValue {
|
||||
self = .app(path)
|
||||
let devDir = url.appendingPathComponent("Contents/Developer")
|
||||
guard devDir.dirExists else {
|
||||
throw Console.Error("""
|
||||
The provided directory at '\(path)' does not appear to be a version of Xcode: \
|
||||
could not read '\(devDir.path)'.
|
||||
""")
|
||||
}
|
||||
} else {
|
||||
if path.hasSuffix(".xip") {
|
||||
self = .xip(path)
|
||||
let handle = try FileHandle(forReadingFrom: url)
|
||||
defer { try? handle.close() }
|
||||
|
||||
let expectedMagic = "xar!".utf8
|
||||
let actualMagic = try handle.read(upToCount: expectedMagic.count) ?? Data()
|
||||
|
||||
guard actualMagic.elementsEqual(expectedMagic) else {
|
||||
throw Console.Error("""
|
||||
The file at '\(path)' does not appear to be a valid XIP file.
|
||||
""")
|
||||
}
|
||||
} else if path.hasSuffix(".app") || path.hasSuffix(".app/") {
|
||||
self = .app(path)
|
||||
} else {
|
||||
throw Console.Error("Expected input path to end in .xip or .app")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let input: Input
|
||||
let output: URL
|
||||
let outputPath: String
|
||||
let arch: Arch
|
||||
|
||||
func buildSDK() async throws {
|
||||
@discardableResult
|
||||
func buildSDK() async throws -> String {
|
||||
// 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,
|
||||
@@ -138,7 +116,6 @@ struct SDKBuilder {
|
||||
},
|
||||
"swiftCompiler": {
|
||||
"extraCLIOptions": [
|
||||
"-Xfrontend", "-enable-cross-import-overlays",
|
||||
"-use-ld=lld"
|
||||
]
|
||||
}
|
||||
@@ -167,6 +144,8 @@ 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 {
|
||||
@@ -180,6 +159,14 @@ 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/\
|
||||
@@ -191,36 +178,24 @@ struct SDKBuilder {
|
||||
case .known(let known): known
|
||||
case .unknown: nil
|
||||
}
|
||||
|
||||
defer { print() }
|
||||
try await Subprocess.run(
|
||||
.name("tar"),
|
||||
arguments: ["xzf", "-"],
|
||||
workingDirectory: FilePath(toolsetDir),
|
||||
input: .inputWriter,
|
||||
output: .discarded,
|
||||
error: .discarded,
|
||||
) { execution in
|
||||
var totalWritten: Int64 = 0
|
||||
let writer = pipe.fileHandleForWriting
|
||||
var written: Int64 = 0
|
||||
do {
|
||||
defer { try? writer.close() }
|
||||
for try await chunk in body {
|
||||
var remaining = chunk
|
||||
while !remaining.isEmpty {
|
||||
let written = try await execution.standardInputWriter.write(Array(remaining))
|
||||
remaining = remaining.dropFirst(written)
|
||||
totalWritten += Int64(written)
|
||||
|
||||
guard let length else { continue }
|
||||
let progress = Int(Double(totalWritten) / Double(length) * 100)
|
||||
try writer.write(contentsOf: chunk)
|
||||
written += Int64(chunk.count)
|
||||
if let length {
|
||||
let progress = Int(Double(written) / Double(length) * 100)
|
||||
print("\r[Downloading toolset] \(progress)%", terminator: "")
|
||||
fflush(stdoutSafe)
|
||||
}
|
||||
}
|
||||
try await execution.standardInputWriter.finish()
|
||||
}
|
||||
.checkSuccess()
|
||||
print()
|
||||
try await tarExit
|
||||
}
|
||||
|
||||
// swiftlint:disable:next cyclomatic_complexity function_body_length
|
||||
private func installDeveloper(in output: URL) async throws -> URL {
|
||||
let dev = output.appendingPathComponent("Developer")
|
||||
|
||||
@@ -239,19 +214,7 @@ struct SDKBuilder {
|
||||
try await extractXIP(inputPath: inputPath, outDir: devStage.path)
|
||||
}.value
|
||||
try Task.checkCancellation()
|
||||
let contents = try FileManager.default.contentsOfDirectory(
|
||||
at: devStage,
|
||||
includingPropertiesForKeys: nil
|
||||
)
|
||||
let apps = contents.filter { $0.pathExtension == "app" }
|
||||
switch apps.count {
|
||||
case 0:
|
||||
throw Console.Error("Unrecognized xip layout (Xcode.app not found)")
|
||||
case 1:
|
||||
appDir = apps[0]
|
||||
default:
|
||||
throw Console.Error("Unrecognized xip layout (multiple apps found)")
|
||||
}
|
||||
appDir = devStage.appendingPathComponent("Xcode.app")
|
||||
cleanupStageDir = devStage
|
||||
case .app(let appPath):
|
||||
wanted = nil
|
||||
@@ -350,10 +313,6 @@ struct SDKBuilder {
|
||||
)
|
||||
}
|
||||
|
||||
try FileManager.default.removeItem(
|
||||
at: dev.appending(path: "Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/clang/include")
|
||||
)
|
||||
|
||||
return dev
|
||||
}
|
||||
|
||||
@@ -371,7 +330,7 @@ struct SDKBuilder {
|
||||
guard FileManager.default.changeCurrentDirectoryPath(outDir) else {
|
||||
throw Console.Error("Could not change directory to '\(outDir)'")
|
||||
}
|
||||
defer { _ = FileManager.default.changeCurrentDirectoryPath(oldDirectory) }
|
||||
defer { FileManager.default.changeCurrentDirectoryPath(oldDirectory) }
|
||||
|
||||
let inputStream = DataReader.data(readingFrom: fd.rawValue)
|
||||
|
||||
|
||||
@@ -4,8 +4,6 @@ import Version
|
||||
import ArgumentParser
|
||||
import Dependencies
|
||||
import PackLib
|
||||
import XUtils
|
||||
import Subprocess
|
||||
|
||||
struct SDKCommand: AsyncParsableCommand {
|
||||
static let configuration = CommandConfiguration(
|
||||
@@ -48,10 +46,9 @@ struct DevSDKBuildCommand: AsyncParsableCommand {
|
||||
func run() async throws {
|
||||
let builderArch = try arch.sdkBuilderArch
|
||||
let input = try SDKBuilder.Input(path: path)
|
||||
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`.")
|
||||
let builder = SDKBuilder(input: input, outputPath: outputDir, arch: builderArch)
|
||||
let sdkPath = try await builder.buildSDK()
|
||||
print("Built SDK at \(sdkPath)")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -85,8 +82,8 @@ struct DevSDKInstallCommand: AsyncParsableCommand {
|
||||
)
|
||||
|
||||
@Argument(
|
||||
help: "Path to Xcode.xip, Xcode.app, or darwin.xtoolsdk",
|
||||
completion: .file(extensions: ["xip", "app", "xtoolsdk"])
|
||||
help: "Path to Xcode.xip or Xcode.app",
|
||||
completion: .file(extensions: ["xip", "app"])
|
||||
)
|
||||
var path: String
|
||||
|
||||
@@ -134,7 +131,7 @@ struct DarwinSDK {
|
||||
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) {
|
||||
} else if bundle.lastPathComponent == "darwin.artifactbundle" {
|
||||
self.version = "unknown"
|
||||
} else {
|
||||
return nil
|
||||
@@ -150,49 +147,33 @@ struct DarwinSDK {
|
||||
let url = URL(fileURLWithPath: path)
|
||||
guard DarwinSDK(bundle: url) != nil else { throw Console.Error("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)
|
||||
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 outputString: String
|
||||
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 {
|
||||
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 {
|
||||
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")
|
||||
@@ -220,19 +201,21 @@ struct DarwinSDK {
|
||||
private enum SwiftVersion {}
|
||||
extension SwiftVersion {
|
||||
static func current() async throws -> Version {
|
||||
let outputString: String?
|
||||
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()
|
||||
do {
|
||||
outputString = try await Subprocess.run(
|
||||
.name("swift"),
|
||||
arguments: ["--version"],
|
||||
output: .string(limit: .max)
|
||||
)
|
||||
.checkSuccess()
|
||||
.standardOutput
|
||||
} catch {
|
||||
try await swift.runUntilExit()
|
||||
} catch is Process.Failure {
|
||||
throw Console.Error("Failed to obtain Swift version")
|
||||
}
|
||||
var output = outputString?[...] ?? ""
|
||||
let outputData = try await outputTask
|
||||
var output = String(decoding: outputData ?? Data(), as: UTF8.self)[...]
|
||||
if output.hasPrefix("Apple ") {
|
||||
output = output.dropFirst("Apple ".count)
|
||||
}
|
||||
@@ -258,28 +241,19 @@ 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()
|
||||
}
|
||||
|
||||
try await DarwinSDK.install(from: sdkPath.path)
|
||||
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)
|
||||
|
||||
// don't destroy tempDir before this point
|
||||
withExtendedLifetime(tempDir) {}
|
||||
|
||||
@@ -42,11 +42,11 @@ struct SetupOperation {
|
||||
case nil:
|
||||
let path = try await Console.prompt("""
|
||||
Now generating the Darwin SDK.
|
||||
|
||||
|
||||
Please download Xcode from http://developer.apple.com/download/all/?q=Xcode
|
||||
and enter the path to the downloaded Xcode.xip.
|
||||
|
||||
Path to Xcode.xip: \("" /* pacify swiftlint trailing_whitespace */)
|
||||
|
||||
Path to Xcode.xip:
|
||||
""")
|
||||
|
||||
let expanded = (path as NSString).expandingTildeInPath
|
||||
|
||||
@@ -8,7 +8,7 @@ struct UninstallCommand: AsyncParsableCommand {
|
||||
commandName: "uninstall",
|
||||
abstract: "Uninstall an installed app"
|
||||
)
|
||||
|
||||
|
||||
@OptionGroup var connectionOptions: ConnectionOptions
|
||||
|
||||
@Argument(
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
}
|
||||
@@ -45,11 +43,7 @@ private struct XToolCommand: AsyncParsableCommand {
|
||||
)
|
||||
}
|
||||
|
||||
#if compiler(<6.2)
|
||||
private typealias SendableMetatype = Any
|
||||
#endif
|
||||
|
||||
extension ParsableCommand where Self: SendableMetatype {
|
||||
extension ParsableCommand {
|
||||
fileprivate static func cancellableMain(_ arguments: [String]? = nil) async {
|
||||
let (canStart, cont) = AsyncStream.makeStream(of: Never.self)
|
||||
let task = Task {
|
||||
@@ -66,10 +60,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)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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))
|
||||
}
|
||||
@@ -1,57 +0,0 @@
|
||||
#if canImport(Subprocess)
|
||||
import Subprocess
|
||||
import Foundation
|
||||
|
||||
extension ExecutionResult {
|
||||
@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
|
||||
@@ -1,53 +0,0 @@
|
||||
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)
|
||||
}
|
||||
}
|
||||
@@ -1,184 +0,0 @@
|
||||
import Foundation
|
||||
|
||||
package struct TemporaryDirectory: ~Copyable {
|
||||
private static let debugTmp = ProcessInfo.processInfo.environment["XTL_DEBUG_TMP"] != nil
|
||||
|
||||
private var shouldDelete: Bool
|
||||
private let base: URL
|
||||
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: "_")
|
||||
.replacingOccurrences(of: "/", with: "_")
|
||||
.prefix(32)
|
||||
self.base = try TemporaryDirectoryRoot.shared.url
|
||||
// ensures uniqueness
|
||||
.appendingPathComponent("dir-\(basename)-\(UUID().uuidString)")
|
||||
self.url = base.appendingPathComponent(name, isDirectory: true)
|
||||
self.shouldDelete = true
|
||||
} catch {
|
||||
// non-copyable types can't be partially initialized so we need a stub value
|
||||
self.base = URL(fileURLWithPath: "")
|
||||
self.url = base
|
||||
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: base)
|
||||
}
|
||||
|
||||
package consuming func persist(at location: URL) throws {
|
||||
try FileManager.default.moveItem(at: url, to: location)
|
||||
_delete()
|
||||
// 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
|
||||
}
|
||||
|
||||
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 {
|
||||
// create a lockfile + tmpdir. while we hold the lock, other instaces of
|
||||
// xtool will not delete the directory during their prune step.
|
||||
|
||||
try FileManager.default.createDirectory(at: url, withIntermediateDirectories: true)
|
||||
|
||||
let pid = ProcessInfo.processInfo.processIdentifier
|
||||
|
||||
for i in 0..<10 {
|
||||
let random = "pid-\(pid)-\(i == 0 ? "0" : UUID().uuidString)"
|
||||
let lockFile = url.appending(path: "\(random).lock")
|
||||
#if os(macOS)
|
||||
let fd = try FileDescriptor.open(
|
||||
FilePath(lockFile.path),
|
||||
.writeOnly,
|
||||
options: [.create, .exclusiveLock],
|
||||
permissions: [.ownerReadWrite, .groupRead, .otherRead],
|
||||
)
|
||||
#else
|
||||
let fd = try FileDescriptor.open(
|
||||
FilePath(lockFile.path),
|
||||
.writeOnly,
|
||||
options: [.create],
|
||||
permissions: [.ownerReadWrite, .groupRead, .otherRead],
|
||||
)
|
||||
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
|
||||
}
|
||||
#endif
|
||||
// leak the file descriptor so that the lock is held until the process exits
|
||||
return url.appending(path: random)
|
||||
}
|
||||
throw Errors.tmpdirClaimFailed(url)
|
||||
}
|
||||
|
||||
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
|
||||
if basename.hasPrefix("tmp-") {
|
||||
// legacy tmpdir, remove it
|
||||
try? FileManager.default.removeItem(at: lock)
|
||||
continue
|
||||
}
|
||||
guard basename.hasPrefix("pid-") && basename.hasSuffix(".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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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 in '\(url.path)': \(error)"
|
||||
case let .tmpdirClaimFailed(url):
|
||||
"Could not claim temporary directory in '\(url.path)'"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -7,7 +7,7 @@ import Dependencies
|
||||
@main
|
||||
enum XToolMain {
|
||||
static func main() async throws {
|
||||
prepareDependencies { _ in
|
||||
prepareDependencies { dependencies in
|
||||
#warning("Improve persistence mechanism")
|
||||
// for Windows, we could use dpapi.h or wincred.h.
|
||||
// for Linux, maybe use libsecret?
|
||||
|
||||
@@ -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
|
||||
@@ -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,18 @@
|
||||
import Foundation
|
||||
import SignerSupport
|
||||
|
||||
let addMockSigner: () = {
|
||||
add_signer(
|
||||
"MockSigner",
|
||||
{ _, _, _, _, _, _, _, _, _, exception in
|
||||
// swiftlint:disable:previous opening_brace
|
||||
exception.initialize(to: strdup("Mock signer not implemented"))
|
||||
return 1
|
||||
},
|
||||
{ _, _, exception in
|
||||
// swiftlint:disable:previous opening_brace
|
||||
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
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
+67
-73
@@ -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-eventstream (1.3.2)
|
||||
aws-partitions (1.1102.0)
|
||||
aws-sdk-core (3.223.0)
|
||||
aws-eventstream (~> 1, >= 1.3.0)
|
||||
aws-partitions (~> 1, >= 1.992.0)
|
||||
aws-sigv4 (~> 1.9)
|
||||
base64
|
||||
bigdecimal
|
||||
jmespath (~> 1, >= 1.6.1)
|
||||
logger
|
||||
aws-sdk-kms (1.125.0)
|
||||
aws-sdk-core (~> 3, >= 3.247.0)
|
||||
aws-sdk-kms (1.100.0)
|
||||
aws-sdk-core (~> 3, >= 3.216.0)
|
||||
aws-sigv4 (~> 1.5)
|
||||
aws-sdk-s3 (1.222.0)
|
||||
aws-sdk-core (~> 3, >= 3.247.0)
|
||||
aws-sdk-s3 (1.185.0)
|
||||
aws-sdk-core (~> 3, >= 3.216.0)
|
||||
aws-sdk-kms (~> 1)
|
||||
aws-sigv4 (~> 1.5)
|
||||
aws-sigv4 (1.12.1)
|
||||
aws-sigv4 (1.11.0)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
babosa (1.0.4)
|
||||
base64 (0.3.0)
|
||||
benchmark (0.5.0)
|
||||
bigdecimal (4.1.2)
|
||||
base64 (0.2.0)
|
||||
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-em_synchrony (1.0.0)
|
||||
faraday-excon (1.1.0)
|
||||
faraday-httpclient (1.0.1)
|
||||
faraday-multipart (1.2.0)
|
||||
faraday-multipart (1.1.0)
|
||||
multipart-post (~> 2.0)
|
||||
faraday-net_http (1.0.2)
|
||||
faraday-net_http_persistent (1.2.0)
|
||||
faraday-patron (1.0.0)
|
||||
faraday-rack (1.0.0)
|
||||
faraday-retry (1.0.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.227.2)
|
||||
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.11.3)
|
||||
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)
|
||||
naturally (2.2.1)
|
||||
nkf (0.2.0)
|
||||
optparse (0.8.1)
|
||||
optparse (0.6.0)
|
||||
os (1.1.4)
|
||||
ostruct (0.6.3)
|
||||
ostruct (0.6.1)
|
||||
plist (3.7.2)
|
||||
public_suffix (7.0.5)
|
||||
rake (13.4.2)
|
||||
public_suffix (6.0.2)
|
||||
rake (13.2.1)
|
||||
representable (3.2.0)
|
||||
declarative (< 0.1.0)
|
||||
trailblazer-option (>= 0.1.1, < 0.2.0)
|
||||
uber (< 0.2.0)
|
||||
retriable (3.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
|
||||
@@ -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()
|
||||
}
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@ targets:
|
||||
XToolMac:
|
||||
type: application
|
||||
platform: macOS
|
||||
deploymentTarget: "13.0"
|
||||
deploymentTarget: "12.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.3" }
|
||||
environment = { SWIFT_VERSION = "6.1" }
|
||||
ignore = "git -C .. diff --quiet $CACHED_COMMIT_REF $COMMIT_REF -- Documentation netlify.toml"
|
||||
|
||||
[[redirects]]
|
||||
|
||||
Reference in New Issue
Block a user