mirror of
https://github.com/xtool-org/xtool.git
synced 2026-11-21 18:55:56 +03:00
Compare commits
17 Commits
@@ -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:
|
||||
|
||||
@@ -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
|
||||
@@ -12,3 +12,4 @@ DerivedData/
|
||||
.docc-build
|
||||
|
||||
/openapi
|
||||
/.tmp
|
||||
|
||||
@@ -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
|
||||
@@ -0,0 +1 @@
|
||||
/launch.json
|
||||
Vendored
+6
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"recommendations": [
|
||||
"swiftlang.swift-vscode",
|
||||
"vknabel.vscode-swiftlint",
|
||||
]
|
||||
}
|
||||
Vendored
+3
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"swiftlint.path": "./.tmp/swiftlint/swiftlint",
|
||||
}
|
||||
@@ -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!
|
||||
@@ -31,3 +31,4 @@ xtool is a cross-platform (Linux/WSL/macOS) tool that replicates Xcode functiona
|
||||
### Common tasks
|
||||
|
||||
- <doc:Control>
|
||||
- <doc:Appex>
|
||||
|
||||
@@ -126,7 +126,29 @@ docs:
|
||||
docs-preview:
|
||||
./Documentation/build.sh preview
|
||||
|
||||
SPEC_URL = https://developer.apple.com/sample-code/app-store-connect/app-store-connect-openapi-specification.zip
|
||||
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_STRING := $(shell cat Sources/DeveloperAPI/spec-version.txt)
|
||||
SPEC_COMMIT = $(word 1,$(SPEC_STRING))
|
||||
SPEC_VERSION = $(word 2,$(SPEC_STRING))
|
||||
SPEC_URL_BASE = https://raw.githubusercontent.com/EvanBacon/App-Store-Connect-OpenAPI-Spec
|
||||
SPEC_URL = $(SPEC_URL_BASE)/$(SPEC_COMMIT)/specs/$(SPEC_VERSION).json
|
||||
SPEC_BASE = openapi/base-$(SPEC_VERSION).json
|
||||
|
||||
.PHONY: api
|
||||
# Regenerate the OpenAPI client code
|
||||
@@ -142,11 +164,23 @@ api: openapi/openapi.json
|
||||
.PHONY: update-api
|
||||
# Update OpenAPI spec and regenerate the client code
|
||||
update-api:
|
||||
@+$(MAKE) -B api
|
||||
@+$(MAKE) update-api-version
|
||||
@+$(MAKE) api
|
||||
|
||||
openapi/openapi.json: openapi/base.json Sources/DeveloperAPI/patch.js
|
||||
node Sources/DeveloperAPI/patch.js < openapi/base.json > openapi/openapi.json
|
||||
.PHONY: update-api-version
|
||||
# Just update the OpenAPI spec version
|
||||
update-api-version:
|
||||
latest_commit=$$(curl -fsSL \
|
||||
'https://api.github.com/repos/EvanBacon/App-Store-Connect-OpenAPI-Spec/commits?per_page=1' \
|
||||
| jq -r '.[0].sha'); \
|
||||
echo "$$latest_commit" > Sources/DeveloperAPI/spec-version.txt; \
|
||||
curl -fsSL "$(SPEC_URL_BASE)/$$latest_commit/specs/latest.json" \
|
||||
| jq -r '.info.version' >> Sources/DeveloperAPI/spec-version.txt
|
||||
|
||||
openapi/base.json:
|
||||
openapi/openapi.json: $(SPEC_BASE) Sources/DeveloperAPI/patch.js
|
||||
node Sources/DeveloperAPI/patch.js < $(SPEC_BASE) > openapi/openapi.json
|
||||
|
||||
$(SPEC_BASE):
|
||||
@mkdir -p openapi
|
||||
curl -fsSL "$(SPEC_URL)" | bsdtar -xOf- > openapi/base.json
|
||||
@rm -f openapi/base*.json
|
||||
curl -fsSL "$(SPEC_URL)" -o "$@"
|
||||
|
||||
+9
-9
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"originHash" : "d08ba8535e09303ac5be5621b8aea1a2409ebcb2ab566d661a63ec8ab5825189",
|
||||
"originHash" : "30ba8b3b894def5b779d979643d77deb698479066658be3b18dad2fb6a193579",
|
||||
"pins" : [
|
||||
{
|
||||
"identity" : "aexml",
|
||||
@@ -339,8 +339,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 +348,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/saagarjha/unxip",
|
||||
"state" : {
|
||||
"revision" : "d6f0009109f7502f8f5b3f23dcd5b43cf5b29b32",
|
||||
"version" : "3.1.0"
|
||||
"revision" : "03c32d6b4e7d8a9fb58747e5f8b83397da8bf5ba",
|
||||
"version" : "3.2.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -402,8 +402,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/xtool-org/xtool-core",
|
||||
"state" : {
|
||||
"revision" : "63c644eef014f7faff53daaebe8bad37c31fbbe5",
|
||||
"version" : "1.3.0"
|
||||
"revision" : "d412ac768d1e73d16ad7ccc6805f12fc701709f6",
|
||||
"version" : "1.4.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -420,8 +420,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/xtool-org/zsign",
|
||||
"state" : {
|
||||
"revision" : "7c669ed2423c53076d511b875a914f01ba7de062",
|
||||
"version" : "1.5.2"
|
||||
"revision" : "fb10d47dd24bb84886532497bac149232e67f07a",
|
||||
"version" : "1.6.0"
|
||||
}
|
||||
}
|
||||
],
|
||||
|
||||
+5
-5
@@ -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"),
|
||||
@@ -65,7 +65,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"),
|
||||
@@ -88,7 +88,7 @@ let package = Package(
|
||||
dependencies: [
|
||||
.product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"),
|
||||
],
|
||||
exclude: ["openapi-generator-config.yaml", "patch.js"]
|
||||
exclude: ["openapi-generator-config.yaml", "patch.js", "spec-version.txt"]
|
||||
),
|
||||
.target(
|
||||
name: "XKit",
|
||||
|
||||
@@ -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
@@ -0,0 +1,2 @@
|
||||
a210f7e8a6591416fbf6c2d718783ba27d9e050a
|
||||
4.0.0
|
||||
@@ -18,9 +18,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 +73,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 +84,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]
|
||||
}
|
||||
}
|
||||
|
||||
+137
-74
@@ -20,34 +20,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 +65,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 +74,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 +134,89 @@ 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)
|
||||
let bytes = try FileHandle(forReadingFrom: src).read(upToCount: magic.count)
|
||||
// if the magic matches one of these it's a static archive; don't embed it.
|
||||
// https://github.com/apple/llvm-project/blob/e716ff14c46490d2da6b240806c04e2beef01f40/llvm/include/llvm/Object/Archive.h#L33
|
||||
// swiftlint:disable:previous line_length
|
||||
if bytes != magic && bytes != thinMagic {
|
||||
try await packFile(srcName: "\(name).framework", dstName: "Frameworks/\(name).framework", sign: true)
|
||||
}
|
||||
}
|
||||
}
|
||||
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
|
||||
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",
|
||||
]),
|
||||
]
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+201
-59
@@ -18,14 +18,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 +62,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 +145,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 +153,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 +200,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-\(UUID().uuidString)")
|
||||
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 +289,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 +424,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)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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" }
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
}()
|
||||
}
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -239,9 +239,7 @@ public actor IntegratedInstaller {
|
||||
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?
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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? = 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())
|
||||
|
||||
|
||||
@@ -64,15 +64,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 +104,6 @@ struct DevXcodeCommand: AsyncParsableCommand {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
struct DevBuildCommand: AsyncParsableCommand {
|
||||
static let configuration = CommandConfiguration(
|
||||
commandName: "build",
|
||||
|
||||
@@ -8,7 +8,7 @@ struct LaunchCommand: AsyncParsableCommand {
|
||||
commandName: "launch",
|
||||
abstract: "Launch an installed app"
|
||||
)
|
||||
|
||||
|
||||
@OptionGroup var connectionOptions: ConnectionOptions
|
||||
|
||||
@Argument(
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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.
|
||||
""")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -196,6 +219,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 +238,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
|
||||
|
||||
@@ -172,6 +172,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)
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -8,7 +8,7 @@ struct UninstallCommand: AsyncParsableCommand {
|
||||
commandName: "uninstall",
|
||||
abstract: "Uninstall an installed app"
|
||||
)
|
||||
|
||||
|
||||
@OptionGroup var connectionOptions: ConnectionOptions
|
||||
|
||||
@Argument(
|
||||
|
||||
@@ -43,7 +43,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 {
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
+16
-16
@@ -10,26 +10,26 @@ 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.1118.0)
|
||||
aws-sdk-core (3.226.0)
|
||||
aws-eventstream (~> 1, >= 1.3.0)
|
||||
aws-partitions (~> 1, >= 1.992.0)
|
||||
aws-sigv4 (~> 1.9)
|
||||
base64
|
||||
jmespath (~> 1, >= 1.6.1)
|
||||
logger
|
||||
aws-sdk-kms (1.100.0)
|
||||
aws-sdk-core (~> 3, >= 3.216.0)
|
||||
aws-sdk-kms (1.105.0)
|
||||
aws-sdk-core (~> 3, >= 3.225.0)
|
||||
aws-sigv4 (~> 1.5)
|
||||
aws-sdk-s3 (1.185.0)
|
||||
aws-sdk-core (~> 3, >= 3.216.0)
|
||||
aws-sdk-s3 (1.190.0)
|
||||
aws-sdk-core (~> 3, >= 3.225.0)
|
||||
aws-sdk-kms (~> 1)
|
||||
aws-sigv4 (~> 1.5)
|
||||
aws-sigv4 (1.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)
|
||||
claide (1.1.0)
|
||||
colored (1.2)
|
||||
colored2 (3.1.2)
|
||||
@@ -58,10 +58,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 +71,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,7 +161,7 @@ GEM
|
||||
httpclient (2.9.0)
|
||||
mutex_m
|
||||
jmespath (1.6.2)
|
||||
json (2.11.3)
|
||||
json (2.12.2)
|
||||
jwt (2.10.1)
|
||||
base64
|
||||
logger (1.7.0)
|
||||
@@ -171,14 +171,14 @@ GEM
|
||||
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.2)
|
||||
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)
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
require_relative "spaceship_patch"
|
||||
|
||||
default_platform(:mac)
|
||||
|
||||
ENV["FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT"] = "120"
|
||||
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user