Compare commits

...

23 Commits

68 changed files with 8831 additions and 479 deletions
+12 -5
View File
@@ -1,5 +1,11 @@
on:
- push
push:
branches:
- main
pull_request:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs:
build-linux:
strategy:
@@ -16,17 +22,18 @@ jobs:
uses: actions/checkout@v4
- name: Build
run: |
docker compose run --build --rm xtool swift build --product xtool
docker compose run --build --rm xtool bash -c \
"swift build --product xtool && .build/debug/xtool --help"
build-macos:
runs-on: macos-15
runs-on: macos-26
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Build
run: |
swift build --product xtool
swift build --product xtool && .build/debug/xtool --help
build-ios:
runs-on: macos-15
runs-on: macos-26
steps:
- name: Checkout
uses: actions/checkout@v4
+1 -1
View File
@@ -32,7 +32,7 @@ jobs:
Linux/packages/xtool-${{ matrix.host.arch }}.AppImage
Linux/packages/xtool-${{ matrix.host.arch }}.AppImage.zsync
build-mac:
runs-on: macos-15
runs-on: macos-26
permissions:
contents: write
steps:
+19
View File
@@ -0,0 +1,19 @@
on:
push:
branches:
- main
pull_request:
paths:
- '.github/workflows/swiftlint.yml'
- '.swiftlint.yml'
- '**/*.swift'
jobs:
swiftlint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- 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
+1
View File
@@ -12,3 +12,4 @@ DerivedData/
.docc-build
/openapi
/.tmp
+73
View File
@@ -0,0 +1,73 @@
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
View File
@@ -0,0 +1 @@
/launch.json
+6
View File
@@ -0,0 +1,6 @@
{
"recommendations": [
"swiftlang.swift-vscode",
"vknabel.vscode-swiftlint",
]
}
+3
View File
@@ -0,0 +1,3 @@
{
"swiftlint.path": "./.tmp/swiftlint/swiftlint",
}
+1 -1
View File
@@ -1,7 +1,7 @@
# Note: We use 22.04 since AppImage recommends building on the
# oldest configuration that you support
FROM swift:6.1-jammy AS build-base
FROM swift:6.2-jammy AS build-base
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+143
View File
@@ -0,0 +1,143 @@
# 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!
@@ -16,14 +16,14 @@ Once you install WSL, you'll also need to set up USB passthrough. See Microsoft'
### Swift
Install the Swift 6.1 toolchain for your Linux distribution from <https://swift.org/install/linux>.
Install the Swift 6.2 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.1 (swift-6.1-RELEASE)
# Swift version 6.2 (swift-6.2-RELEASE)
```
### usbmuxd
@@ -62,7 +62,7 @@ sudo apt-get install usbmuxd
### Xcode.xip
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.
Download **Xcode 26** from <https://download.developer.apple.com/Developer_Tools/Xcode_26.0.1/Xcode_26.0.1_Apple_silicon.xip>. Note the path where `Xcode_26.0.1_Apple_silicon.xip` is saved.
> Note:
>
+1
View File
@@ -31,3 +31,4 @@ xtool is a cross-platform (Linux/WSL/macOS) tool that replicates Xcode functiona
### Common tasks
- <doc:Control>
- <doc:Appex>
+21 -1
View File
@@ -126,6 +126,23 @@ 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
@@ -149,4 +166,7 @@ openapi/openapi.json: openapi/base.json Sources/DeveloperAPI/patch.js
openapi/base.json:
@mkdir -p openapi
curl -fsSL "$(SPEC_URL)" | bsdtar -xOf- > openapi/base.json
# 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
+113 -77
View File
@@ -1,13 +1,13 @@
{
"originHash" : "d08ba8535e09303ac5be5621b8aea1a2409ebcb2ab566d661a63ec8ab5825189",
"originHash" : "516b5e980db8502fa572d65f5259860fbc63321c9baf2198154bc77168a041cc",
"pins" : [
{
"identity" : "aexml",
"kind" : "remoteSourceControl",
"location" : "https://github.com/tadija/AEXML.git",
"state" : {
"revision" : "38f7d00b23ecd891e1ee656fa6aeebd6ba04ecc3",
"version" : "4.6.1"
"revision" : "db806756c989760b35108146381535aec231092b",
"version" : "4.7.0"
}
},
{
@@ -15,8 +15,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/swift-server/async-http-client.git",
"state" : {
"revision" : "333f51104b75d1a5b94cb3b99e4c58a3b442c9f7",
"version" : "1.25.2"
"revision" : "8430dd49d4e2b417f472141805c9691ec2923cb8",
"version" : "1.29.0"
}
},
{
@@ -24,8 +24,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/attaswift/BigInt",
"state" : {
"revision" : "114343a705df4725dfe7ab8a2a326b8883cfd79c",
"version" : "5.5.1"
"revision" : "e07e00fa1fd435143a2dcf8b7eec9a7710b2fdfe",
"version" : "5.7.0"
}
},
{
@@ -51,8 +51,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/mattpolzin/OpenAPIKit",
"state" : {
"revision" : "da7d3a5ddff0dd8e5e9fdb5585d186d645bcc21b",
"version" : "3.5.0"
"revision" : "c1dcd65ccbcc1f3e132293ff2338c72c49a9026d",
"version" : "3.8.0"
}
},
{
@@ -69,8 +69,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/onevcat/Rainbow.git",
"state" : {
"revision" : "0c627a4f8a39ef37eadec1ceec02e4a7f55561ac",
"version" : "4.1.0"
"revision" : "16da5c62dd737258c6df2e8c430f8a3202f655a7",
"version" : "4.2.0"
}
},
{
@@ -96,8 +96,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-argument-parser",
"state" : {
"revision" : "41982a3656a71c768319979febd796c6fd111d5c",
"version" : "1.5.0"
"revision" : "cdd0ef3755280949551dc26dee5de9ddeda89f54",
"version" : "1.6.2"
}
},
{
@@ -105,8 +105,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-asn1.git",
"state" : {
"revision" : "a54383ada6cecde007d374f58f864e29370ba5c3",
"version" : "1.3.2"
"revision" : "f70225981241859eb4aa1a18a75531d26637c8cc",
"version" : "1.4.0"
}
},
{
"identity" : "swift-async-algorithms",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-async-algorithms.git",
"state" : {
"revision" : "042e1c4d9d19748c9c228f8d4ebc97bb1e339b0b",
"version" : "1.0.4"
}
},
{
@@ -114,8 +123,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-atomics.git",
"state" : {
"revision" : "cd142fd2f64be2100422d658e7411e39489da985",
"version" : "1.2.0"
"revision" : "b601256eab081c0f92f059e12818ac1d4f178ff7",
"version" : "1.3.0"
}
},
{
@@ -123,8 +132,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-certificates",
"state" : {
"revision" : "999fd70c7803da89f3904d635a6815a2a7cd7585",
"version" : "1.10.0"
"revision" : "4b092f15164144c24554e0a75e080a960c5190a6",
"version" : "1.14.0"
}
},
{
@@ -139,10 +148,10 @@
{
"identity" : "swift-collections",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-collections.git",
"location" : "https://github.com/apple/swift-collections",
"state" : {
"revision" : "671108c96644956dddcd89dd59c203dcdb36cec7",
"version" : "1.1.4"
"revision" : "7b847a3b7008b2dc2f47ca3110d8c782fb2e5c7e",
"version" : "1.3.0"
}
},
{
@@ -150,8 +159,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-concurrency-extras",
"state" : {
"revision" : "82a4ae7170d98d8538ec77238b7eb8e7199ef2e8",
"version" : "1.3.1"
"revision" : "5a3825302b1a0d744183200915a47b508c828e6f",
"version" : "1.3.2"
}
},
{
@@ -159,8 +168,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-crypto",
"state" : {
"revision" : "e8d6eba1fef23ae5b359c46b03f7d94be2f41fed",
"version" : "3.12.3"
"revision" : "95ba0316a9b733e92bb6b071255ff46263bbe7dc",
"version" : "3.15.1"
}
},
{
@@ -168,17 +177,26 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-dependencies",
"state" : {
"revision" : "4c90d6b2b9bf0911af87b103bb40f41771891596",
"version" : "1.9.2"
"revision" : "a10f9feeb214bc72b5337b6ef6d5a029360db4cc",
"version" : "1.10.0"
}
},
{
"identity" : "swift-distributed-tracing",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-distributed-tracing.git",
"state" : {
"revision" : "baa932c1336f7894145cbaafcd34ce2dd0b77c97",
"version" : "1.3.1"
}
},
{
"identity" : "swift-docc-plugin",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-docc-plugin",
"location" : "https://github.com/swiftlang/swift-docc-plugin",
"state" : {
"revision" : "85e4bb4e1cd62cec64a4b8e769dcefdf0c5b9d64",
"version" : "1.4.3"
"revision" : "3e4f133a77e644a5812911a0513aeb7288b07d06",
"version" : "1.4.5"
}
},
{
@@ -195,8 +213,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-http-structured-headers.git",
"state" : {
"revision" : "f280fc7676b9940ff2c6598642751ea333c6544f",
"version" : "1.2.2"
"revision" : "1625f271afb04375bf48737a5572613248d0e7a0",
"version" : "1.4.0"
}
},
{
@@ -213,8 +231,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-log.git",
"state" : {
"revision" : "3d8596ed08bd13520157f0355e35caed215ffbfa",
"version" : "1.6.3"
"revision" : "ce592ae52f982c847a4efc0dd881cc9eb32d29f2",
"version" : "1.6.4"
}
},
{
@@ -222,8 +240,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio",
"state" : {
"revision" : "0f54d58bb5db9e064f332e8524150de379d1e51c",
"version" : "2.82.1"
"revision" : "a18bddb0acf7a40d982b2f128ce73ce4ee31f352",
"version" : "2.86.2"
}
},
{
@@ -231,8 +249,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-extras.git",
"state" : {
"revision" : "f1f6f772198bee35d99dd145f1513d8581a54f2c",
"version" : "1.26.0"
"revision" : "a55c3dd3a81d035af8a20ce5718889c0dcab073d",
"version" : "1.29.0"
}
},
{
@@ -240,8 +258,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-http2.git",
"state" : {
"revision" : "4281466512f63d1bd530e33f4aa6993ee7864be0",
"version" : "1.36.0"
"revision" : "5e9e99ec96c53bc2c18ddd10c1e25a3cd97c55e5",
"version" : "1.38.0"
}
},
{
@@ -249,8 +267,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-ssl.git",
"state" : {
"revision" : "6df102a39c8da5fdc2eae29a0f63546d660866fc",
"version" : "2.30.0"
"revision" : "b2b043a8810ab6d51b3ff4df17f057d87ef1ec7c",
"version" : "2.34.1"
}
},
{
@@ -258,8 +276,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-transport-services.git",
"state" : {
"revision" : "cd1e89816d345d2523b11c55654570acd5cd4c56",
"version" : "1.24.0"
"revision" : "df6c28355051c72c884574a6c858bc54f7311ff9",
"version" : "1.25.2"
}
},
{
@@ -267,8 +285,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-numerics.git",
"state" : {
"revision" : "e0ec0f5f3af6f3e4d5e7a19d2af26b481acb6ba8",
"version" : "1.0.3"
"revision" : "0c0290ff6b24942dadb83a929ffaaa1481df04a2",
"version" : "1.1.1"
}
},
{
@@ -285,8 +303,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-openapi-generator",
"state" : {
"revision" : "02cab48b66b4b412013827c2938adaf0eb67dc8d",
"version" : "1.7.2"
"revision" : "d74223cc5595a8165181c4d9579243c932e5cd07",
"version" : "1.10.3"
}
},
{
@@ -294,8 +312,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-openapi-runtime",
"state" : {
"revision" : "8f33cc5dfe81169fb167da73584b9c72c3e8bc23",
"version" : "1.8.2"
"revision" : "7722cf8eac05c1f1b5b05895b04cfcc29576d9be",
"version" : "1.8.3"
}
},
{
@@ -303,8 +321,26 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-openapi-urlsession",
"state" : {
"revision" : "6fac6f7c428d5feea2639b5f5c8b06ddfb79434b",
"version" : "1.1.0"
"revision" : "279aa6b77be6aa842a4bf3c45fa79fa15edf3e07",
"version" : "1.2.0"
}
},
{
"identity" : "swift-service-context",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-service-context.git",
"state" : {
"revision" : "1983448fefc717a2bc2ebde5490fe99873c5b8a6",
"version" : "1.2.1"
}
},
{
"identity" : "swift-service-lifecycle",
"kind" : "remoteSourceControl",
"location" : "https://github.com/swift-server/swift-service-lifecycle.git",
"state" : {
"revision" : "0fcc4c9c2d58dd98504c06f7308c86de775396ff",
"version" : "2.9.0"
}
},
{
@@ -312,8 +348,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/swiftlang/swift-syntax",
"state" : {
"revision" : "f99ae8aa18f0cf0d53481901f88a0991dc3bd4a2",
"version" : "601.0.1"
"revision" : "4799286537280063c85a32f09884cfbca301b1a1",
"version" : "602.0.0"
}
},
{
@@ -321,8 +357,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-system",
"state" : {
"revision" : "a34201439c74b53f0fd71ef11741af7e7caf01e1",
"version" : "1.4.2"
"revision" : "61e4ca4b81b9e09e2ec863b00c340eb13497dac6",
"version" : "1.5.0"
}
},
{
@@ -339,8 +375,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/xtool-org/SwiftyMobileDevice",
"state" : {
"revision" : "5ee5f680d065519dd6ac56c96435a7db0d599ade",
"version" : "1.4.0"
"revision" : "280d0dc8153469944491aee2f19af29e9c7a77f0",
"version" : "1.5.0"
}
},
{
@@ -348,8 +384,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/saagarjha/unxip",
"state" : {
"revision" : "d6f0009109f7502f8f5b3f23dcd5b43cf5b29b32",
"version" : "3.1.0"
"revision" : "03c32d6b4e7d8a9fb58747e5f8b83397da8bf5ba",
"version" : "3.2.0"
}
},
{
@@ -357,8 +393,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/mxcl/Version",
"state" : {
"revision" : "303a0f916772545e1e8667d3104f83be708a723c",
"version" : "2.1.0"
"revision" : "67ce582bb9de70e1eb2ee41fd71aad3b5f86d97b",
"version" : "2.2.0"
}
},
{
@@ -366,8 +402,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/vapor/websocket-kit.git",
"state" : {
"revision" : "014ccd52891b8c098d7e1033d5e72ed76fef7a86",
"version" : "2.16.0"
"revision" : "8666c92dbbb3c8eefc8008c9c8dcf50bfd302167",
"version" : "2.16.1"
}
},
{
@@ -375,8 +411,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/yonaskolb/XcodeGen",
"state" : {
"revision" : "7193eb447a6f60061f069e07bc1efd32d73c0e19",
"version" : "2.43.0"
"revision" : "21ac9944b0ab546a07422dbed86f33dd2ebd76f8",
"version" : "2.44.1"
}
},
{
@@ -384,8 +420,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/tuist/XcodeProj.git",
"state" : {
"revision" : "dc3b87a4e69f9cd06c6cb16199f5d0472e57ef6b",
"version" : "8.24.3"
"revision" : "b1caa062d4aaab3e3d2bed5fe0ac5f8ce9bf84f4",
"version" : "8.27.7"
}
},
{
@@ -393,8 +429,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
"state" : {
"revision" : "39de59b2d47f7ef3ca88a039dff3084688fe27f4",
"version" : "1.5.2"
"revision" : "4c27acf5394b645b70d8ba19dc249c0472d5f618",
"version" : "1.7.0"
}
},
{
@@ -402,8 +438,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/xtool-org/xtool-core",
"state" : {
"revision" : "63c644eef014f7faff53daaebe8bad37c31fbbe5",
"version" : "1.3.0"
"revision" : "d412ac768d1e73d16ad7ccc6805f12fc701709f6",
"version" : "1.4.0"
}
},
{
@@ -411,8 +447,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/jpsim/Yams",
"state" : {
"revision" : "b4b8042411dc7bbb696300a34a4bf3ba1b7ad19b",
"version" : "5.3.1"
"revision" : "3d6871d5b4a5cd519adf233fbb576e0a2af71c17",
"version" : "5.4.0"
}
},
{
@@ -420,8 +456,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/xtool-org/zsign",
"state" : {
"revision" : "7c669ed2423c53076d511b875a914f01ba7de062",
"version" : "1.5.2"
"revision" : "fb10d47dd24bb84886532497bac149232e67f07a",
"version" : "1.6.0"
}
}
],
+12 -7
View File
@@ -22,8 +22,8 @@ let cSettings: [CSetting] = [
let package = Package(
name: "xtool",
platforms: [
.iOS(.v15),
.macOS(.v12),
.iOS(.v16),
.macOS(.v13),
],
products: [
.library(
@@ -40,9 +40,9 @@ let package = Package(
),
],
dependencies: [
.package(url: "https://github.com/xtool-org/xtool-core", .upToNextMinor(from: "1.3.0")),
.package(url: "https://github.com/xtool-org/SwiftyMobileDevice", .upToNextMinor(from: "1.4.0")),
.package(url: "https://github.com/xtool-org/zsign", .upToNextMinor(from: "1.5.2")),
.package(url: "https://github.com/xtool-org/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.6.0")),
.package(url: "https://github.com/apple/swift-system", from: "1.4.0"),
.package(url: "https://github.com/apple/swift-http-types", from: "1.3.1"),
@@ -53,7 +53,8 @@ let package = Package(
.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/apple/swift-docc-plugin", from: "1.0.0"),
.package(url: "https://github.com/swiftlang/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"),
@@ -65,7 +66,7 @@ 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.1.0"),
.package(url: "https://github.com/saagarjha/unxip", from: "3.2.0"),
// TODO: just depend on tuist/XcodeProj instead
.package(url: "https://github.com/yonaskolb/XcodeGen", from: "2.43.0"),
@@ -90,11 +91,14 @@ let package = Package(
],
exclude: ["openapi-generator-config.yaml", "patch.js"]
),
// common utilities shared across xtool targets
.target(name: "XUtils"),
.target(
name: "XKit",
dependencies: [
"DeveloperAPI",
"CXKit",
"XUtils",
.byName(name: "XADI", condition: .when(platforms: [.linux])),
.product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
.product(name: "Dependencies", package: "swift-dependencies"),
@@ -165,6 +169,7 @@ let package = Package(
.target(
name: "PackLib",
dependencies: [
"XUtils",
.product(name: "Yams", package: "Yams"),
.product(name: "XcodeGenKit", package: "XcodeGen", condition: .when(platforms: [.macOS])),
]
+8
View File
@@ -18,6 +18,8 @@ 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;
}
@@ -41,6 +43,12 @@ 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
-56
View File
@@ -1,56 +0,0 @@
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))
}
+19
View File
@@ -1,5 +1,6 @@
import Foundation
import Yams
import XUtils
public struct PackSchemaBase: Codable, Sendable {
public enum Version: Int, Codable, Sendable {
@@ -18,9 +19,22 @@ public struct PackSchemaBase: Codable, Sendable {
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)
@@ -60,6 +74,7 @@ public struct PackSchema: Sendable {
}
}
// swiftlint:disable:next force_try
public static let `default` = try! PackSchema(validating: .init(
version: .v1,
orgID: "com.example"
@@ -70,4 +85,8 @@ 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]
}
}
+142 -74
View File
@@ -1,4 +1,5 @@
import Foundation
import XUtils
public struct Packer: Sendable {
public let buildSettings: BuildSettings
@@ -20,34 +21,44 @@ public struct Packer: Sendable {
// swift-tools-version: 6.0
import PackageDescription
let package = Package(
name: "\(plan.product)-Builder",
name: "\(plan.app.product)-Builder",
platforms: [
.iOS("\(plan.deploymentTarget)"),
.iOS("\(plan.app.deploymentTarget)"),
],
dependencies: [
.package(name: "RootPackage", path: "../.."),
],
targets: [
.executableTarget(
name: "\(plan.product)-App",
dependencies: [
.product(name: "\(plan.product)", package: "RootPackage"),
]
),
\(
plan.allProducts.map {
"""
.executableTarget(
name: "\($0.targetName)",
dependencies: [
.product(name: "\($0.product)", package: "RootPackage"),
],
linkerSettings: \($0.linkerSettings)
)
"""
}
.joined(separator: ",\n")
)
]
)\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 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.)
@@ -55,7 +66,6 @@ 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",
]
)
builder.standardOutput = FileHandle.standardError
@@ -65,15 +75,49 @@ public struct Packer: Sendable {
public func pack() async throws -> URL {
try await build()
let output = try TemporaryDirectory(name: "\(plan.product).app")
let output = try TemporaryDirectory(name: "\(plan.app.product).app")
let outputURL = output.url
let binDir = URL(
fileURLWithPath: ".build/\(buildSettings.triple)/\(buildSettings.configuration.rawValue)",
isDirectory: true
)
let outputURL = output.url
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
)
}
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)
@@ -91,69 +135,93 @@ public struct Packer: Sendable {
try Task.checkCancellation()
}
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)
// Ensure output directory is available
try? FileManager.default.createDirectory(at: outputURL, withIntermediateDirectories: true)
for command in product.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)
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 let iconPath = plan.iconPath {
group.addTask {
try await packFileToRoot(srcName: iconPath)
}
}
group.addTask {
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 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)
}
}
}
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
let dest = URL(fileURLWithPath: "xtool")
.appendingPathComponent(output.url.lastPathComponent)
try? FileManager.default.removeItem(at: dest)
try output.persist(at: dest)
return dest
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",
]),
]
"""
}
}
}
+202 -59
View File
@@ -1,4 +1,5 @@
import Foundation
import XUtils
public struct Planner: Sendable {
public var buildSettings: BuildSettings
@@ -18,14 +19,12 @@ public struct Planner: Sendable {
return decoder
}()
public func createPlan() async throws -> Plan {
// TODO: cache plan using (Package.swift+Package.resolved) as the key?
// anything older than this requires bundling the stdlib which
// is doable but probably not worth the effort
private static let minSupportedIOSVersion = "13.0"
let dependencyData = try await _dumpAction(
arguments: ["show-dependencies", "--format", "json"],
path: buildSettings.packagePath
)
let dependencyRoot = try Self.decoder.decode(PackageDependency.self, from: dependencyData)
private func buildGraph() async throws -> PackageGraph {
let dependencyRoot = try await dumpDependencies()
let packages = try await withThrowingTaskGroup(
of: (PackageDependency, PackageDump).self,
@@ -64,18 +63,74 @@ public struct Planner: Sendable {
}
let rootPackage = packages[dependencyRoot.identity]!
let deploymentTarget = rootPackage.platforms?.first { $0.name == "ios" }?.version ?? "13.0"
let libraries = rootPackage.products?.filter { $0.type == .autoLibrary } ?? []
return PackageGraph(
root: rootPackage,
packages: packages,
packagesByProductName: packagesByProductName
)
}
let library = try selectLibrary(
from: libraries,
matching: schema.base.product
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
)
var resources: [Resource] = []
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
)
var resources: [Plan.Resource] = []
var visited: Set<String> = []
var targets = library.targets.map { (rootPackage, $0) }
var targets = library.targets.map { (graph.root, $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)'")
@@ -91,15 +146,7 @@ public struct Planner: Sendable {
targets.append((targetPackage, targetName))
}
for productName in (target.productDependencies ?? []) {
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)'")
}
let (package, product) = try graph.product(name: productName)
if product.type == .dynamicLibrary {
resources.append(.library(name: productName))
}
@@ -107,37 +154,44 @@ public struct Planner: Sendable {
}
}
if let rootResources = schema.base.resources {
if let rootResources {
resources += rootResources.map { .root(source: $0) }
}
let bundleID = schema.idSpecifier.formBundleID(product: library.name)
let bundleID = idSpecifier.formBundleID(product: library.name)
let deploymentTarget = graph.root.platforms?.first { $0.name == "ios" }?.version
?? Self.minSupportedIOSVersion
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)",
"CFBundleName": library.name,
"CFBundleExecutable": library.name,
"CFBundleDisplayName": library.name,
"CFBundlePackageType": type.fourCharCode,
]
if let plist = self.schema.base.infoPath {
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 {
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] {
@@ -147,21 +201,45 @@ public struct Planner: Sendable {
}
}
return Plan(
return Plan.Product(
type: type,
product: library.name,
deploymentTarget: deploymentTarget,
bundleID: bundleID,
infoPlist: infoPlist,
resources: resources,
iconPath: self.schema.base.iconPath,
entitlementsPath: self.schema.base.entitlementsPath
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)
)
}
private func dumpPackage(at path: String) async throws -> PackageDump {
let data = try await _dumpAction(arguments: ["describe", "--type", "json"], path: path)
let data = try await _dumpAction(arguments: ["-q", "describe", "--type", "json"], path: path)
try Task.checkCancellation()
return try Self.decoder.decode(PackageDump.self, from: data)
// 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)
}
private func _dumpAction(arguments: [String], path: String) async throws -> Data {
@@ -212,20 +290,66 @@ public struct Planner: Sendable {
}
public struct Plan: Sendable {
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 app: Product
public var extensions: [Product]
public enum Resource: Codable, Sendable {
case bundle(package: String, target: String)
case binaryTarget(name: String)
case library(name: String)
case root(source: 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!"
}
}
}
}
private struct PackageDependency: Decodable {
@@ -301,3 +425,22 @@ 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)
}
}
+74 -61
View File
@@ -13,68 +13,93 @@ 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.deploymentTarget) else {
throw StringError("Could not parse deployment target '\(plan.deploymentTarget)'")
guard let deploymentTarget = Version(tolerant: plan.app.deploymentTarget) else {
throw StringError("Could not parse deployment target '\(plan.app.deploymentTarget)'")
}
var buildSettings: [String: Any] = [
"PRODUCT_BUNDLE_IDENTIFIER": plan.bundleID,
"TARGETED_DEVICE_FAMILY": families.map { "\($0)" }.joined(separator: ","),
]
let emptyText = Data("""
// leave this file empty
""".utf8)
if let entitlementsPath = plan.entitlementsPath {
buildSettings["CODE_SIGN_ENTITLEMENTS"] = fromProjectToRoot + Path(entitlementsPath)
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: Any] = [
"PRODUCT_BUNDLE_IDENTIFIER": product.bundleID,
"TARGETED_DEVICE_FAMILY": families.map { "\($0)" }.joined(separator: ","),
]
if product.type == .appExtension {
buildSettings["APPLICATION_EXTENSION_API_ONLY"] = true
}
if let entitlementsPath = product.entitlementsPath {
buildSettings["CODE_SIGN_ENTITLEMENTS"] = fromProjectToRoot + Path(entitlementsPath)
}
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: [:]
)
)
}
let project = Project(
name: plan.product,
targets: [
Target(
name: targetName,
type: .application,
platform: .iOS,
deploymentTarget: deploymentTarget,
settings: Settings(buildSettings: buildSettings),
sources: [
TargetSource(path: (fromProjectToRoot + emptyFile).string),
],
dependencies: [
Dependency(
type: .package(products: [plan.product]),
reference: "RootPackage"
),
],
info: Plist(
path: (fromProjectToRoot + infoPath).string,
attributes: [:]
)
)
],
name: plan.app.targetName,
targets: targets,
packages: [
"RootPackage": .local(
path: fromProjectToRoot.string,
@@ -91,8 +116,8 @@ public struct XcodePacker {
// TODO: Handle plan.iconPath
let generator = ProjectGenerator(project: project)
let xcodeproj = projectDir + "\(plan.product).xcodeproj"
let xcworkspace = xtoolDir + "\(plan.product).xcworkspace"
let xcodeproj = projectDir + "\(plan.app.product).xcodeproj"
let xcworkspace = xtoolDir + "\(plan.app.product).xcworkspace"
do {
let current = Path.current
Path.current = xcodeproj.parent()
@@ -105,18 +130,6 @@ 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))
}
@@ -235,8 +235,10 @@ public struct DeveloperServicesAddAppOperation: DeveloperServicesOperation {
/// Registers the app + its extensions, returning the profile and entitlements of each
public func perform() async throws -> [URL: ProvisioningInfo] {
var apps: [URL] = [root]
let plugins = root.appendingPathComponent("PlugIns")
if plugins.dirExists {
for pluginsDir in ["PlugIns", "Extensions"] {
let plugins = root.appendingPathComponent(pluginsDir)
guard plugins.dirExists else { continue }
apps += plugins.implicitContents.filter { $0.pathExtension.lowercased() == "appex" }
}
@@ -23,6 +23,16 @@ public struct DeveloperServicesCapability: Sendable, Hashable {
self.isFree = isFree
self.settings = settings
}
public init(
rawName: String,
isFree: Bool,
settings: [Components.Schemas.CapabilitySetting]? = nil
) {
self.capabilityType = .init(value2: rawName)
self.isFree = isFree
self.settings = settings
}
}
protocol EntitlementWithCapability: Entitlement {
@@ -15,13 +15,14 @@ public struct ASCKey: Sendable {
actor ASCJWTGenerator {
// the duration for which we generate JWTs.
// ASC allows a maximum of 20 minutes.
private static let ttl: TimeInterval = 60 * 20
// ASC allows a maximum of 20 minutes. We use
// 15 minutes to account for clock drift.
private static let ttl: TimeInterval = 60 * 15
// 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
private static let tolerance: TimeInterval = 60 * 2
private static let encoder: JSONEncoder = {
let encoder = JSONEncoder()
@@ -13,6 +13,7 @@ extension DeveloperAPIClient {
) {
@Dependency(\.httpClient) var httpClient
self.init(
// swiftlint:disable:next force_try
serverURL: try! Servers.Server1.url(),
configuration: .init(
dateTranscoder: .iso8601WithFractionalSeconds
@@ -174,7 +174,7 @@ public struct ADIDataProvider: AnisetteDataProvider {
.acceptLanguage: "en_US",
.init(AnisetteData.localUserIDKey)!: self.localUserID,
]
request.headerFields[.init("X-MMe-Country")!] = Locale.current.regionCode
request.headerFields[.init("X-MMe-Country")!] = Locale.current.region?.identifier
request.headerFields[.init(DeviceInfo.clientInfoKey)!] = try await clientInfo()
request.headerFields[.init(DeviceInfo.deviceIDKey)!] = self.localUserUID.uuidString
@@ -225,7 +225,11 @@ 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,7 +54,8 @@ 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.languageCode, let region = locale.regionCode {
let localeIdentifier = if let language = locale.language.languageCode?.identifier,
let region = locale.region?.identifier {
"\(language)_\(region)"
} else {
"en_US"
@@ -56,13 +56,14 @@ extension DeviceInfo {
private static func fetchHardwareModel() -> String? {
var modelSize = 0
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
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
}
return String(bytesNoCopy: rawString, length: modelSize - 1, encoding: .utf8, freeWhenDone: true)
}
public static func current() -> DeviceInfo? {
@@ -91,7 +92,7 @@ extension DeviceInfo {
romAddress: "94f6a300e9a0",
mlbSerialNumber: "C02520301W0GF2D1U",
serialNumber: "C02PQKRJG8WP",
modelID: "MacBookPro11,5"
modelID: "Mac16,1"
)
}
}
@@ -17,8 +17,8 @@ public struct DeviceInfo: Codable, Sendable {
public static let xcodeVersion = "14.2 (14C18)"
public struct ClientInfo: Codable {
public static let macOSVersion = "10.14.6"
public static let macOSBuild = "18G103"
public static let macOSVersion = "14.3.1"
public static let macOSBuild = "23D60"
public static let authKitVersion = "1"
public static let akdVersion = "1.0"
@@ -153,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(separator: "").utf8)
Data(hashedPassword.map { String(format: "%02hhx", $0) }.joined().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.regionCode
request.headerFields[.init("X-MMe-Country")!] = Locale.current.region?.identifier
let (_, body) = try await httpClient.makeRequest(request)
@@ -15,7 +15,7 @@ struct GrandSlamLoginData: Decodable {
let cookie: Data
var identityToken: String {
"\(adsid):\(idmsToken)".data(using: .utf8)!.base64EncodedString()
Data("\(adsid):\(idmsToken)".utf8).base64EncodedString()
}
private enum CodingKeys: String, CodingKey {
@@ -46,4 +46,3 @@ struct GrandSlamValidateSMSRequest: GrandSlamTwoFactorRequest {
])
}
}
@@ -24,10 +24,11 @@ extension HTTPClientDependencyKey: DependencyKey {
let appleRootCA = try! NIOSSLCertificate(bytes: Array(appleRootPEM.utf8), format: .pem)
var tlsConfiguration: TLSConfiguration = .makeClientConfiguration()
tlsConfiguration.additionalTrustRoots = [.certificates([appleRootCA])]
let config = HTTPClient.Configuration(
var config = HTTPClient.Configuration(
tlsConfiguration: tlsConfiguration,
decompression: .enabled(limit: .none)
)
config.timeout.connect = .seconds(60)
return HTTPClient(configuration: config)
}()
}
+5 -1
View File
@@ -139,7 +139,11 @@ public actor Connection {
}
private actor WeakPool<Key: Hashable, Value: AnyObject & Sendable, Failure: Error> {
#if compiler(<6.2)
private typealias SendableMetatype = Any
#endif
private actor WeakPool<Key: Hashable & SendableMetatype, 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: Sendable {
public actor HeartbeatHandler {
private struct Error: Swift.Error {}
private struct ReceivedPacket: Decodable {
+1 -1
View File
@@ -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,6 +2,7 @@ import Foundation
import SwiftyMobileDevice
import ConcurrencyExtras
import Dependencies
import XUtils
extension LockdownClient {
static let installerLabel = "xtool"
@@ -54,9 +55,6 @@ public actor IntegratedInstaller {
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)
@@ -206,12 +204,9 @@ public actor IntegratedInstaller {
public func install(app: URL) async throws -> String {
try await self.updateStage(to: "Unpacking app", initialProgress: nil)
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) }
let _tempDir = try TemporaryDirectory(name: "staging")
let tempDir = _tempDir.url
defer { withExtendedLifetime(_tempDir) {} }
switch app.pathExtension {
case "ipa":
@@ -235,13 +230,11 @@ public actor IntegratedInstaller {
try await self.updateProgress(to: 1)
let payload = self.tempDir.appendingPathComponent("Payload")
let payload = tempDir.appendingPathComponent("Payload")
guard let appDir = payload.implicitContents.first(where: { $0.pathExtension == "app" })
else { throw Error.appExtractionFailed }
try await updateStage(to: "Logging in")
try await self.updateStage(to: "Preparing device")
try await updateStage(to: "Preparing device")
// TODO: Maybe use `Connection` here instead of creating the lockdown
// client manually?
@@ -33,7 +33,6 @@ 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 }
@@ -41,7 +40,6 @@ 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 }
@@ -49,7 +47,6 @@ 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 }
@@ -66,10 +63,6 @@ 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 }
@@ -85,7 +78,6 @@ 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 }
@@ -93,7 +85,6 @@ 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 }
@@ -109,7 +100,6 @@ 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
@@ -117,7 +107,6 @@ 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"
@@ -126,7 +115,6 @@ 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 }
@@ -134,7 +122,6 @@ 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 }
@@ -142,7 +129,6 @@ 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 }
@@ -150,7 +136,6 @@ 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 }
@@ -158,7 +143,6 @@ 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 }
@@ -166,7 +150,6 @@ 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 }
@@ -174,7 +157,6 @@ 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 }
@@ -182,7 +164,6 @@ 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 }
+3 -1
View File
@@ -130,7 +130,6 @@ public actor Signer {
privBase, lengthOverride ?? priv.count,
entsArray, entsArray.count,
{
// swiftlint:disable:previous opening_brace
(Unmanaged<AnyObject>
.fromOpaque($0)
.takeUnretainedValue()
@@ -153,6 +152,9 @@ public actor Signer {
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,
+2 -4
View File
@@ -138,11 +138,9 @@ public struct KeychainStorage: KeyValueStorage {
private func makeQuery(forKey key: String, _ parameters: [CFString: Any]) -> CFDictionary {
var query: [CFString: Any] = [
kSecClass: kSecClassGenericPassword,
kSecAttrAccount: key
kSecAttrAccount: key,
kSecUseDataProtectionKeychain: true,
]
if #available(macOS 10.15, *) {
query[kSecUseDataProtectionKeychain] = true
}
query[kSecAttrService] = service
query.merge(parameters) { _, b in b }
return query as CFDictionary
+1 -1
View File
@@ -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()
}
+1 -1
View File
@@ -21,7 +21,7 @@ struct AuthOperation {
var password: String?
var logoutFromExisting: Bool
var mode: AuthMode? = nil
var mode: AuthMode?
var quiet = false
func run() async throws {
@@ -20,6 +20,7 @@ struct DSCertificatesListCommand: AsyncParsableCommand {
abstract: "List certificates"
)
// swiftlint:disable:next cyclomatic_complexity
func run() async throws {
let client = DeveloperAPIClient(auth: try AuthToken.saved().authData())
@@ -22,6 +22,7 @@ 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())
+19 -12
View File
@@ -3,6 +3,7 @@ import ArgumentParser
import PackLib
import XKit
import Dependencies
import XUtils
struct PackOperation {
struct BuildOptions: ParsableArguments {
@@ -64,15 +65,26 @@ struct PackOperation {
)
let bundle = try await packer.pack()
if let entitlementsPath = plan.entitlementsPath {
let data = try await Data(reading: URL(fileURLWithPath: entitlementsPath))
let decoder = PropertyListDecoder()
let entitlements = try decoder.decode(Entitlements.self, from: data)
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("Pseudo-signing...")
try await Signer.first().sign(
app: bundle,
identity: .adhoc,
entitlementMapping: [bundle: entitlements],
entitlementMapping: mapping,
progress: { _ in }
)
}
@@ -93,7 +105,6 @@ struct DevXcodeCommand: AsyncParsableCommand {
}
}
struct DevBuildCommand: AsyncParsableCommand {
static let configuration = CommandConfiguration(
commandName: "build",
@@ -126,12 +137,8 @@ struct DevBuildCommand: AsyncParsableCommand {
if ipa {
@Dependency(\.zipCompressor) var compressor
finalURL = url.deletingPathExtension().appendingPathExtension("ipa")
let tmpDir = try TemporaryDirectory(name: "sh.xtool.tmp")
let payloadDir = tmpDir.url.appendingPathComponent("Payload", isDirectory: true)
try FileManager.default.createDirectory(
at: payloadDir,
withIntermediateDirectories: true
)
let tmpDir = try TemporaryDirectory(name: "Payload")
let payloadDir = tmpDir.url
try FileManager.default.moveItem(at: url, to: payloadDir.appendingPathComponent(url.lastPathComponent))
let ipaURL = try await compressor.compress(directory: payloadDir) { progress in
if let progress {
+1 -1
View File
@@ -8,7 +8,7 @@ struct LaunchCommand: AsyncParsableCommand {
commandName: "launch",
abstract: "Launch an installed app"
)
@OptionGroup var connectionOptions: ConnectionOptions
@Argument(
+4 -3
View File
@@ -21,6 +21,7 @@ struct NewCommand: AsyncParsableCommand {
)
) var skipSetup = false
// swiftlint:disable:next function_body_length
func run() async throws {
if !skipSetup {
// perform any remaining setup steps first
@@ -114,7 +115,7 @@ struct NewCommand: AsyncParsableCommand {
.swiftpm/configuration/registries.json
.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
.netrc
/xtool
"""
),
@@ -134,7 +135,7 @@ struct NewCommand: AsyncParsableCommand {
"Sources/\(moduleName)/\(moduleName)App.swift",
"""
import SwiftUI
@main
struct \(moduleName)App: App {
var body: some Scene {
@@ -150,7 +151,7 @@ struct NewCommand: AsyncParsableCommand {
"Sources/\(moduleName)/ContentView.swift",
"""
import SwiftUI
struct ContentView: View {
var body: some View {
VStack {
+42 -5
View File
@@ -16,12 +16,35 @@ struct SDKBuilder {
case app(String)
init(path: String) throws {
if path.hasSuffix(".xip") {
self = .xip(path)
} else if path.hasSuffix(".app") || path.hasSuffix(".app/") {
var isDir: ObjCBool = false
guard FileManager.default.fileExists(atPath: path, isDirectory: &isDir) else {
throw Console.Error("Could not read file or directory at path '\(path)'")
}
let url = URL(fileURLWithPath: path)
if isDir.boolValue {
self = .app(path)
let devDir = url.appendingPathComponent("Contents/Developer")
guard devDir.dirExists else {
throw Console.Error("""
The provided directory at '\(path)' does not appear to be a version of Xcode: \
could not read '\(devDir.path)'.
""")
}
} else {
throw Console.Error("Expected input path to end in .xip or .app")
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.
""")
}
}
}
}
@@ -116,6 +139,7 @@ struct SDKBuilder {
},
"swiftCompiler": {
"extraCLIOptions": [
"-Xfrontend", "-enable-cross-import-overlays",
"-use-ld=lld"
]
}
@@ -196,6 +220,7 @@ struct SDKBuilder {
try await tarExit
}
// swiftlint:disable:next cyclomatic_complexity
private func installDeveloper(in output: URL) async throws -> URL {
let dev = output.appendingPathComponent("Developer")
@@ -214,7 +239,19 @@ struct SDKBuilder {
try await extractXIP(inputPath: inputPath, outDir: devStage.path)
}.value
try Task.checkCancellation()
appDir = devStage.appendingPathComponent("Xcode.app")
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)")
}
cleanupStageDir = devStage
case .app(let appPath):
wanted = nil
+2
View File
@@ -4,6 +4,7 @@ import Version
import ArgumentParser
import Dependencies
import PackLib
import XUtils
struct SDKCommand: AsyncParsableCommand {
static let configuration = CommandConfiguration(
@@ -172,6 +173,7 @@ struct DarwinSDK {
// 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)
+3 -3
View File
@@ -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:
Path to Xcode.xip: \("" /* pacify swiftlint trailing_whitespace */)
""")
let expanded = (path as NSString).expandingTildeInPath
+1 -1
View File
@@ -8,7 +8,7 @@ struct UninstallCommand: AsyncParsableCommand {
commandName: "uninstall",
abstract: "Uninstall an installed app"
)
@OptionGroup var connectionOptions: ConnectionOptions
@Argument(
+11 -1
View File
@@ -1,9 +1,11 @@
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)
}
}
@@ -43,7 +45,11 @@ private struct XToolCommand: AsyncParsableCommand {
)
}
extension ParsableCommand {
#if compiler(<6.2)
private typealias SendableMetatype = Any
#endif
extension ParsableCommand where Self: SendableMetatype {
fileprivate static func cancellableMain(_ arguments: [String]? = nil) async {
let (canStart, cont) = AsyncStream.makeStream(of: Never.self)
let task = Task {
@@ -60,6 +66,10 @@ extension ParsableCommand {
print("Cancelled.")
self.exit()
} catch {
if ProcessInfo.processInfo.environment["XTL_DEBUG_ERRORS"] != nil {
print("ERROR DETAILS:")
print(String(reflecting: error))
}
self.exit(withError: error)
}
}
+25
View File
@@ -0,0 +1,25 @@
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))
}
+97
View File
@@ -0,0 +1,97 @@
import Foundation
package struct TemporaryDirectory: ~Copyable {
private static let debugTmp = ProcessInfo.processInfo.environment["XTL_DEBUG_TMP"] != nil
private var shouldDelete: Bool
package let url: URL
/// Prepares a fresh tmpdir root.
///
/// Optional, but try calling this at launch to clean up old resources.
package static func prepare() {
_ = TemporaryDirectoryRoot.shared
}
/// Creates a temporary directory where `lastPathComponent` is exactly `name`.
///
/// The directory is deleted on deinit or (if the object never deinits) on next launch.
/// To save the contents, move them elsewhere with ``persist(at:)``.
package init(name: String) throws {
do {
let basename = name.replacingOccurrences(of: ".", with: "_")
self.url = try TemporaryDirectoryRoot.shared.url
// ensures uniqueness
.appendingPathComponent("tmp-\(basename)-\(UUID().uuidString)")
.appendingPathComponent(name, isDirectory: true)
self.shouldDelete = true
} catch {
// non-copyable types can't be partially initialized so we need a stub value
self.url = URL(fileURLWithPath: "")
self.shouldDelete = false
throw error
}
try FileManager.default.createDirectory(at: url, withIntermediateDirectories: true)
if Self.debugTmp {
stderrPrint("Created TemporaryDirectory: \(url.path)")
}
}
private func _delete() {
guard !Self.debugTmp else { return }
try? FileManager.default.removeItem(at: url)
}
package consuming func persist(at location: URL) throws {
try FileManager.default.moveItem(at: url, to: location)
// we do this after moving, so that if the move fails we clean up
shouldDelete = false
}
deinit {
if shouldDelete { _delete() }
}
}
private struct TemporaryDirectoryRoot {
static let shared = TemporaryDirectoryRoot()
private let _url: Result<URL, Errors>
var url: URL {
get throws(Errors) {
try _url.get()
}
}
private init() {
let base: URL
let env = ProcessInfo.processInfo.environment
if let tmpdir = env["XTL_TMPDIR"] ?? env["TMPDIR"] {
base = URL(fileURLWithPath: tmpdir)
} else {
base = FileManager.default.temporaryDirectory
}
let url = base.appendingPathComponent("sh.xtool")
try? FileManager.default.removeItem(at: url)
do {
try FileManager.default.createDirectory(at: url, withIntermediateDirectories: true)
} catch {
self._url = .failure(Errors.tmpdirCreationFailed(url, error))
return
}
self._url = .success(url)
}
enum Errors: Error, CustomStringConvertible {
case tmpdirCreationFailed(URL, Error)
var description: String {
switch self {
case let .tmpdirCreationFailed(url, error):
"Could not create temporary directory at '\(url.path)': \(error)"
}
}
}
}
+1 -1
View File
@@ -7,7 +7,7 @@ import Dependencies
@main
enum XToolMain {
static func main() async throws {
prepareDependencies { dependencies in
prepareDependencies { _ in
#warning("Improve persistence mechanism")
// for Windows, we could use dpapi.h or wincred.h.
// for Linux, maybe use libsecret?
@@ -5,12 +5,10 @@ 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
}
+5 -1
View File
@@ -1,4 +1,8 @@
/XToolMac.xcodeproj
/XToolMac.xcodeproj/*
!/XToolMac.xcodeproj/project.xcworkspace
/XToolMac.xcodeproj/project.xcworkspace/*
!/XToolMac.xcodeproj/project.xcworkspace/xcshareddata
Private*.xcconfig
/fastlane/README.md
+23 -21
View File
@@ -10,26 +10,28 @@ GEM
public_suffix (>= 2.0.2, < 7.0)
artifactory (3.0.17)
atomos (0.1.3)
aws-eventstream (1.3.2)
aws-partitions (1.1102.0)
aws-sdk-core (3.223.0)
aws-eventstream (1.4.0)
aws-partitions (1.1172.0)
aws-sdk-core (3.233.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.100.0)
aws-sdk-core (~> 3, >= 3.216.0)
aws-sdk-kms (1.113.0)
aws-sdk-core (~> 3, >= 3.231.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.185.0)
aws-sdk-core (~> 3, >= 3.216.0)
aws-sdk-s3 (1.199.1)
aws-sdk-core (~> 3, >= 3.231.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.11.0)
aws-sigv4 (1.12.1)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
base64 (0.2.0)
base64 (0.3.0)
bigdecimal (3.3.1)
claide (1.1.0)
colored (1.2)
colored2 (3.1.2)
@@ -58,10 +60,10 @@ GEM
faraday (>= 0.8.0)
http-cookie (~> 1.0.0)
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-em_synchrony (1.0.1)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-multipart (1.1.0)
faraday-multipart (1.1.1)
multipart-post (~> 2.0)
faraday-net_http (1.0.2)
faraday-net_http_persistent (1.2.0)
@@ -71,7 +73,7 @@ GEM
faraday_middleware (1.2.1)
faraday (~> 1.0)
fastimage (2.4.0)
fastlane (2.227.2)
fastlane (2.228.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
@@ -161,38 +163,38 @@ GEM
httpclient (2.9.0)
mutex_m
jmespath (1.6.2)
json (2.11.3)
jwt (2.10.1)
json (2.15.1)
jwt (2.10.2)
base64
logger (1.7.0)
mini_magick (4.13.2)
mini_mime (1.1.5)
multi_json (1.15.0)
multi_json (1.17.0)
multipart-post (2.4.1)
mutex_m (0.3.0)
nanaimo (0.4.0)
naturally (2.2.1)
naturally (2.3.0)
nkf (0.2.0)
optparse (0.6.0)
os (1.1.4)
ostruct (0.6.1)
ostruct (0.6.3)
plist (3.7.2)
public_suffix (6.0.2)
rake (13.2.1)
rake (13.3.0)
representable (3.2.0)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rexml (3.4.1)
rexml (3.4.4)
rouge (3.28.0)
ruby2_keywords (0.0.5)
rubyzip (2.4.1)
security (0.1.5)
signet (0.20.0)
signet (0.21.0)
addressable (~> 2.8)
faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 3.0)
jwt (>= 1.5, < 4.0)
multi_json (~> 1.10)
simctl (1.6.10)
CFPropertyList
@@ -0,0 +1 @@
../../../../Package.resolved
+1 -11
View File
@@ -5,7 +5,7 @@ struct XToolMacUI: App {
WindowGroup {
ContentView()
}
.disableWindowResizingIfPossible()
.windowResizability(.contentSize)
}
}
@@ -64,16 +64,6 @@ private struct StepView<Content: View>: View {
}
}
extension Scene {
fileprivate func disableWindowResizingIfPossible() -> some Scene {
if #available(macOS 13, *) {
return self.windowResizability(.contentSize)
} else {
return self
}
}
}
#Preview {
ContentView()
}
+2
View File
@@ -1,3 +1,5 @@
require_relative "spaceship_patch"
default_platform(:mac)
ENV["FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT"] = "120"
+16
View File
@@ -0,0 +1,16 @@
require "spaceship"
# the ASC API has started (June 2025) throwing a fit when it
# sees DEVELOPER_ID_APPLICATION_G2 in the certificate types filter.
# so we patch Spaceship to filter locally instead of via the API.
# c.f. https://github.com/fastlane/fastlane/pull/29588
class << Spaceship::ConnectAPI::Certificate
alias_method :all_orig, :all
def all(**args)
types = args[:filter]&.delete(:certificateType)&.split(",")
certs = all_orig(**args)
types ? certs.select { |cert| types.include?(cert.certificate_type) } : certs
end
end
+1 -1
View File
@@ -11,7 +11,7 @@ targets:
XToolMac:
type: application
platform: macOS
deploymentTarget: "12.0"
deploymentTarget: "13.0"
sources:
- path: XToolMac
- path: Resources/xtool
+1 -1
View File
@@ -5,7 +5,7 @@
base = "Documentation/"
publish = "xtool.docc/.docc-build"
command = "./build.sh"
environment = { SWIFT_VERSION = "6.1" }
environment = { SWIFT_VERSION = "6.2" }
ignore = "git -C .. diff --quiet $CACHED_COMMIT_REF $COMMIT_REF -- Documentation netlify.toml"
[[redirects]]