mirror of
https://github.com/xtool-org/xtool.git
synced 2026-11-21 10:45:53 +03:00
Compare commits
42 Commits
@@ -6,4 +6,4 @@ runs:
|
||||
- name: Set up Xcode
|
||||
shell: bash
|
||||
run: |
|
||||
sudo xcode-select -s /Applications/Xcode_26.4.app
|
||||
sudo xcode-select -s /Applications/Xcode_27.1.0.app
|
||||
|
||||
@@ -27,7 +27,7 @@ jobs:
|
||||
docker compose run --build -e XTL_CI=1 xtool bash -c \
|
||||
"swift build --product xtool && .build/debug/xtool --help && swift test"
|
||||
build-macos:
|
||||
runs-on: macos-26
|
||||
runs-on: xcode-27
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6
|
||||
@@ -39,7 +39,7 @@ jobs:
|
||||
run: |
|
||||
swift test
|
||||
build-ios:
|
||||
runs-on: macos-26
|
||||
runs-on: xcode-27
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
pull_request:
|
||||
concurrency:
|
||||
group: integration-${{ github.workflow }}-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
jobs:
|
||||
integration-test-linux:
|
||||
# https://github.com/xtool-org/mac-actions-runner
|
||||
runs-on: ubuntu-on-macos
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6
|
||||
- name: Run integration tests
|
||||
run: |
|
||||
./integration-tests/run.sh
|
||||
@@ -36,7 +36,7 @@ jobs:
|
||||
Linux/packages/xtool-${{ matrix.host.arch }}.AppImage
|
||||
Linux/packages/xtool-${{ matrix.host.arch }}.AppImage.zsync
|
||||
build-mac:
|
||||
runs-on: macos-26
|
||||
runs-on: xcode-27
|
||||
permissions:
|
||||
contents: write
|
||||
steps:
|
||||
@@ -57,6 +57,7 @@ jobs:
|
||||
DEVELOPMENT_TEAM: ${{ secrets.DEVELOPMENT_TEAM }}
|
||||
XTOOL_VERSION: ${{ github.ref_name }}
|
||||
run: |
|
||||
brew install -y xcodegen
|
||||
cd macOS
|
||||
bundle exec fastlane package
|
||||
- name: Upload artifacts
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"swiftPM": {
|
||||
"buildSystem": "swiftbuild",
|
||||
"scratchPath": ".build/index-build"
|
||||
},
|
||||
"backgroundIndexing": true
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
swiftlint_version: 0.59.1
|
||||
swiftlint_version: 0.65.1
|
||||
disabled_rules:
|
||||
- trailing_comma
|
||||
- nesting
|
||||
|
||||
+12
-2
@@ -1,7 +1,9 @@
|
||||
# Note: We use 22.04 since AppImage recommends building on the
|
||||
# oldest configuration that you support
|
||||
|
||||
FROM swift:6.3-jammy AS build-base
|
||||
ARG SWIFT_VERSION=6.4.1
|
||||
|
||||
FROM swift:${SWIFT_VERSION}-jammy AS build-base
|
||||
|
||||
RUN apt-get update \
|
||||
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
|
||||
@@ -84,6 +86,14 @@ ENV USBMUXD_SOCKET_ADDRESS=host.docker.internal:27015
|
||||
|
||||
CMD [ "/bin/bash" ]
|
||||
|
||||
FROM dev AS dev-test
|
||||
|
||||
ENV XTL_TEST_ENV=1
|
||||
|
||||
COPY --from=bats/bats:latest /opt/bats /opt/bats
|
||||
COPY --from=bats/bats:latest /usr/lib/bats /usr/lib/bats
|
||||
RUN ln -s /opt/bats/bin/bats /usr/local/bin/bats
|
||||
|
||||
FROM build-xtool-base AS build-xtool
|
||||
|
||||
ARG XTL_CI
|
||||
@@ -94,7 +104,7 @@ RUN swift package resolve
|
||||
ADD . /xtool
|
||||
RUN ./Linux/build.sh
|
||||
|
||||
FROM swift:6.3 AS xtool
|
||||
FROM swift:${SWIFT_VERSION} AS xtool
|
||||
|
||||
COPY --from=build-xtool /xtool/Linux/packages/xtool-*.AppImage /xtool/xtool.AppImage
|
||||
RUN (cd /xtool && ./xtool.AppImage --appimage-extract) \
|
||||
|
||||
@@ -3,7 +3,7 @@ Creating package: Hello
|
||||
Creating Package.swift
|
||||
Creating xtool.yml
|
||||
Creating .gitignore
|
||||
Creating .sourcekit-lsp/config.json
|
||||
Creating .bsp/xtool.json
|
||||
Creating Sources/Hello/HelloApp.swift
|
||||
Creating Sources/Hello/ContentView.swift
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ Creating package: Hello
|
||||
Creating Package.swift
|
||||
Creating xtool.yml
|
||||
Creating .gitignore
|
||||
Creating .sourcekit-lsp/config.json
|
||||
Creating .bsp/xtool.json
|
||||
Creating Sources/Hello/HelloApp.swift
|
||||
Creating Sources/Hello/ContentView.swift
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ Creating package: Hello
|
||||
Creating Package.swift
|
||||
Creating xtool.yml
|
||||
Creating .gitignore
|
||||
Creating .sourcekit-lsp/config.json
|
||||
Creating .bsp/xtool.json
|
||||
Creating Sources/Hello/HelloApp.swift
|
||||
Creating Sources/Hello/ContentView.swift
|
||||
|
||||
@@ -12,7 +12,7 @@ Finished generating project Hello.
|
||||
Developer$
|
||||
Hello$
|
||||
-rw-rw-r-- 1 user user 187 .gitignore
|
||||
drwxrwxr-x 2 user user 4096 .sourcekit-lsp
|
||||
drwxrwxr-x 2 user user 4096 .bsp
|
||||
-rw-rw-r-- 1 user user 463 Package.swift
|
||||
drwxrwxr-x 3 user user 4096 Sources
|
||||
-rw-rw-r-- 1 user user 39 xtool.yml
|
||||
|
||||
@@ -3,7 +3,7 @@ Creating package: Hello
|
||||
Creating Package.swift
|
||||
Creating xtool.yml
|
||||
Creating .gitignore
|
||||
Creating .sourcekit-lsp/config.json
|
||||
Creating .bsp/xtool.json
|
||||
Creating Sources/Hello/HelloApp.swift
|
||||
Creating Sources/Hello/ContentView.swift
|
||||
|
||||
@@ -12,7 +12,7 @@ Finished generating project Hello.
|
||||
Developer$ cd Hello
|
||||
Hello$ ls -la
|
||||
-rw-rw-r-- 1 user user 187 .gitignore
|
||||
drwxrwxr-x 2 user user 4096 .sourcekit-lsp
|
||||
drwxrwxr-x 2 user user 4096 .bsp
|
||||
-rw-rw-r-- 1 user user 463 Package.swift
|
||||
drwxrwxr-x 3 user user 4096 Sources
|
||||
-rw-rw-r-- 1 user user 39 xtool.yml
|
||||
|
||||
@@ -3,7 +3,7 @@ Creating package: Hello
|
||||
Creating Package.swift
|
||||
Creating xtool.yml
|
||||
Creating .gitignore
|
||||
Creating .sourcekit-lsp/config.json
|
||||
Creating .bsp/xtool.json
|
||||
Creating Sources/Hello/HelloApp.swift
|
||||
Creating Sources/Hello/ContentView.swift
|
||||
|
||||
@@ -12,7 +12,7 @@ Finished generating project Hello.
|
||||
Developer$ cd Hello
|
||||
Hello$ ls -la
|
||||
-rw-rw-r-- 1 user user 187 .gitignore
|
||||
drwxrwxr-x 2 user user 4096 .sourcekit-lsp
|
||||
drwxrwxr-x 2 user user 4096 .bsp
|
||||
-rw-rw-r-- 1 user user 463 Package.swift
|
||||
drwxrwxr-x 3 user user 4096 Sources
|
||||
-rw-rw-r-- 1 user user 39 xtool.yml
|
||||
|
||||
@@ -3,7 +3,7 @@ Creating package: Hello
|
||||
Creating Package.swift
|
||||
Creating xtool.yml
|
||||
Creating .gitignore
|
||||
Creating .sourcekit-lsp/config.json
|
||||
Creating .bsp/xtool.json
|
||||
Creating Sources/Hello/HelloApp.swift
|
||||
Creating Sources/Hello/ContentView.swift
|
||||
|
||||
@@ -12,7 +12,7 @@ Finished generating project Hello.
|
||||
Developer$ cd Hello
|
||||
Hello$ ls -la
|
||||
-rw-rw-r-- 1 user user 187 .gitignore
|
||||
drwxrwxr-x 2 user user 4096 .sourcekit-lsp
|
||||
drwxrwxr-x 2 user user 4096 .bsp
|
||||
-rw-rw-r-- 1 user user 463 Package.swift
|
||||
drwxrwxr-x 3 user user 4096 Sources
|
||||
-rw-rw-r-- 1 user user 39 xtool.yml
|
||||
|
||||
@@ -3,7 +3,7 @@ Creating package: Hello
|
||||
Creating Package.swift
|
||||
Creating xtool.yml
|
||||
Creating .gitignore
|
||||
Creating .sourcekit-lsp/config.json
|
||||
Creating .bsp/xtool.json
|
||||
Creating Sources/Hello/HelloApp.swift
|
||||
Creating Sources/Hello/ContentView.swift
|
||||
|
||||
@@ -12,7 +12,7 @@ Finished generating project Hello.
|
||||
Developer$ cd Hello
|
||||
Hello$ ls -la
|
||||
-rw-rw-r-- 1 user user 187 .gitignore
|
||||
drwxrwxr-x 2 user user 4096 .sourcekit-lsp
|
||||
drwxrwxr-x 2 user user 4096 .bsp
|
||||
-rw-rw-r-- 1 user user 463 Package.swift
|
||||
drwxrwxr-x 3 user user 4096 Sources
|
||||
-rw-rw-r-- 1 user user 39 xtool.yml
|
||||
|
||||
@@ -3,7 +3,7 @@ Creating package: Hello
|
||||
Creating Package.swift
|
||||
Creating xtool.yml
|
||||
Creating .gitignore
|
||||
Creating .sourcekit-lsp/config.json
|
||||
Creating .bsp/xtool.json
|
||||
Creating Sources/Hello/HelloApp.swift
|
||||
Creating Sources/Hello/ContentView.swift
|
||||
|
||||
@@ -12,7 +12,7 @@ Finished generating project Hello.
|
||||
Developer$ cd Hello
|
||||
Hello$ ls -la
|
||||
-rw-rw-r-- 1 user user 187 .gitignore
|
||||
drwxrwxr-x 2 user user 4096 .sourcekit-lsp
|
||||
drwxrwxr-x 2 user user 4096 .bsp
|
||||
-rw-rw-r-- 1 user user 463 Package.swift
|
||||
drwxrwxr-x 3 user user 4096 Sources
|
||||
-rw-rw-r-- 1 user user 39 xtool.yml
|
||||
@@ -21,5 +21,9 @@ Hello$ cat xtool.yml
|
||||
version: 1
|
||||
bundleID: com.example.Hello
|
||||
|
||||
Hello$ cat .sourcekit-lsp/config.json
|
||||
{ "swiftPM": { "swiftSDK": "arm64-apple-ios" } }
|
||||
Hello$ cat .bsp/xtool.json
|
||||
{
|
||||
"name": "xtool",
|
||||
...
|
||||
"argv": ["/usr/bin/env", "xtool", "dev", "build-server"]
|
||||
}
|
||||
|
||||
@@ -30,9 +30,9 @@
|
||||
}
|
||||
|
||||
@Step {
|
||||
Read `.sourcekit-lsp/config.json`.
|
||||
Read `.bsp/xtool.json`.
|
||||
|
||||
This file tells SourceKit to build for the `arm64-apple-ios` system defined in `darwin.artifactbundle`. This is the [Swift SDK](https://github.com/swiftlang/swift-evolution/blob/main/proposals/0387-cross-compilation-destinations.md) that we built during the setup process. It contains the necessary modules for building iOS apps, such as UIKit and SwiftUI, as well as tools for building and manipulating iOS binaries. Under the hood, xtool also calls `swift build` with `--swift-sdk arm64-apple-ios` for the same reason.
|
||||
This file tells your IDE to ask xtool for build information (via the Build Server Protocol). It enables features like syntax highlighting and documentation lookup.
|
||||
|
||||
@Code(name: "Terminal", file: "template-4b.sh", previousFile: "template-4a.sh") {}
|
||||
}
|
||||
|
||||
@@ -22,14 +22,14 @@ Once you install WSL, you'll also need to set up USB passthrough. See Microsoft'
|
||||
|
||||
### Swift
|
||||
|
||||
Install the Swift 6.3 toolchain for your Linux distribution from <https://swift.org/install/linux>.
|
||||
Install the Swift 6.4 toolchain for your Linux distribution from <https://swift.org/install/linux>.
|
||||
|
||||
After following the steps there, confirm that Swift is installed correctly:
|
||||
|
||||
```bash
|
||||
swift --version
|
||||
# should say something like:
|
||||
# Swift version 6.3 (swift-6.3-RELEASE)
|
||||
# Swift version 6.4 (swift-6.4-RELEASE)
|
||||
```
|
||||
|
||||
### usbmuxd
|
||||
@@ -68,7 +68,7 @@ sudo apt-get install usbmuxd
|
||||
|
||||
### Xcode.xip
|
||||
|
||||
Download **Xcode 26** from <https://developer.apple.com/download/all/?q=Xcode>. Note the path where `Xcode.xip` is saved.
|
||||
Download **Xcode 27.1** from <https://developer.apple.com/download/all/?q=Xcode>. Note the path where `Xcode.xip` is saved.
|
||||
|
||||
> Note:
|
||||
>
|
||||
@@ -131,7 +131,7 @@ Choice (0-1): 0
|
||||
Path to Xcode.xip:
|
||||
```
|
||||
|
||||
Enter the path (for example `~/Downloads/Xcode_16.3.xip`) and hit enter. xtool will extract the Xcode XIP to generate and install an iOS Swift SDK for you.
|
||||
Enter the path (for example `~/Downloads/Xcode_27.1.xip`) and hit enter. xtool will extract the Xcode XIP to generate and install an iOS Swift SDK for you.
|
||||
|
||||
Confirm that it worked:
|
||||
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
.DS_Store
|
||||
.build
|
||||
.swiftpm
|
||||
*/xtool
|
||||
*/.bsp
|
||||
/out
|
||||
@@ -0,0 +1,29 @@
|
||||
// swift-tools-version: 6.0
|
||||
|
||||
import PackageDescription
|
||||
|
||||
let package = Package(
|
||||
name: "DemoDynamic",
|
||||
platforms: [
|
||||
.iOS(.v17),
|
||||
.macOS(.v14),
|
||||
],
|
||||
products: [
|
||||
.library(
|
||||
name: "DemoDynamic",
|
||||
targets: ["DemoDynamic"]
|
||||
),
|
||||
],
|
||||
dependencies: [
|
||||
.package(path: "../ExampleSupport"),
|
||||
],
|
||||
targets: [
|
||||
.target(
|
||||
name: "DemoDynamic",
|
||||
dependencies: [
|
||||
"ExampleSupport",
|
||||
.product(name: "ExampleDynamicLibrary", package: "ExampleSupport"),
|
||||
]
|
||||
),
|
||||
]
|
||||
)
|
||||
@@ -0,0 +1,12 @@
|
||||
import ExampleDynamicLibrary
|
||||
import ExampleSupport
|
||||
import SwiftUI
|
||||
|
||||
@main struct DemoApp: ExampleApp {
|
||||
init() {
|
||||
let message = exampleDynamicLibraryFunction()
|
||||
guard message == "Hello from the dynamic library\n" else {
|
||||
fatalError("Unexpected message from dynamic library: \(message)")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
version: 1
|
||||
bundleID: sh.xtool.examples.DemoDynamic
|
||||
@@ -0,0 +1,33 @@
|
||||
// swift-tools-version: 6.0
|
||||
|
||||
import PackageDescription
|
||||
|
||||
let package = Package(
|
||||
name: "DemoExtensions",
|
||||
platforms: [
|
||||
.iOS(.v17),
|
||||
.macOS(.v14),
|
||||
],
|
||||
products: [
|
||||
.library(
|
||||
name: "DemoExtensions",
|
||||
targets: ["DemoExtensions"]
|
||||
),
|
||||
.library(
|
||||
name: "DemoExtensionsWidget",
|
||||
targets: ["DemoExtensionsWidget"]
|
||||
),
|
||||
],
|
||||
dependencies: [
|
||||
.package(path: "../ExampleSupport"),
|
||||
],
|
||||
targets: [
|
||||
.target(
|
||||
name: "DemoExtensions",
|
||||
dependencies: [
|
||||
"ExampleSupport",
|
||||
]
|
||||
),
|
||||
.target(name: "DemoExtensionsWidget"),
|
||||
]
|
||||
)
|
||||
@@ -0,0 +1,4 @@
|
||||
import SwiftUI
|
||||
import ExampleSupport
|
||||
|
||||
@main struct DemoApp: ExampleApp {}
|
||||
@@ -0,0 +1,51 @@
|
||||
import WidgetKit
|
||||
import SwiftUI
|
||||
|
||||
@main struct Bundle: WidgetBundle {
|
||||
var body: some Widget {
|
||||
DemoWidget()
|
||||
}
|
||||
}
|
||||
|
||||
struct DemoWidget: Widget {
|
||||
var body: some WidgetConfiguration {
|
||||
StaticConfiguration(
|
||||
kind: "DemoWidget",
|
||||
provider: Provider()
|
||||
) { entry in
|
||||
VStack {
|
||||
Text(entry.date, style: .date)
|
||||
}
|
||||
.containerBackground(.fill.tertiary, for: .widget)
|
||||
}
|
||||
.configurationDisplayName("DemoWidget")
|
||||
.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)
|
||||
))
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
<?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>
|
||||
@@ -0,0 +1,6 @@
|
||||
version: 1
|
||||
bundleID: sh.xtool.examples.DemoExtensions
|
||||
product: DemoExtensions
|
||||
extensions:
|
||||
- product: DemoExtensionsWidget
|
||||
infoPath: Support/DemoExtensionsWidget-Info.plist
|
||||
@@ -0,0 +1,31 @@
|
||||
// swift-tools-version: 6.0
|
||||
|
||||
import PackageDescription
|
||||
|
||||
let package = Package(
|
||||
name: "DemoResources",
|
||||
platforms: [
|
||||
.iOS(.v17),
|
||||
.macOS(.v14),
|
||||
],
|
||||
products: [
|
||||
.library(
|
||||
name: "DemoResources",
|
||||
targets: ["DemoResources"]
|
||||
),
|
||||
],
|
||||
dependencies: [
|
||||
.package(path: "../ExampleSupport"),
|
||||
],
|
||||
targets: [
|
||||
.target(
|
||||
name: "DemoResources",
|
||||
dependencies: [
|
||||
"ExampleSupport",
|
||||
],
|
||||
resources: [
|
||||
.process("bundled.txt"),
|
||||
]
|
||||
),
|
||||
]
|
||||
)
|
||||
@@ -0,0 +1 @@
|
||||
Top level resource
|
||||
@@ -0,0 +1,34 @@
|
||||
import ExampleSupport
|
||||
import SwiftUI
|
||||
|
||||
@main struct DemoApp: App {
|
||||
var body: some Scene {
|
||||
WindowGroup {
|
||||
Text("Hello, world!")
|
||||
.task {
|
||||
guard let bundled = #bundle.url(forResource: "bundled", withExtension: "txt")
|
||||
else { fatalError("Missing bundled.txt resource") }
|
||||
assertContents(of: bundled, equal: "Bundled resource\n")
|
||||
|
||||
guard let top = Bundle.main.url(forResource: "top", withExtension: "txt")
|
||||
else { fatalError("Missing top.txt resource") }
|
||||
assertContents(of: top, equal: "Top level resource\n")
|
||||
|
||||
Example.pass()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func assertContents(of url: URL, equal value: String) {
|
||||
let name = url.lastPathComponent
|
||||
let contents: String
|
||||
do {
|
||||
contents = try String(contentsOf: url, encoding: .utf8)
|
||||
} catch {
|
||||
fatalError("Failed to read \(name): \(error)")
|
||||
}
|
||||
guard contents == value else {
|
||||
fatalError("\(name) had unexpected contents: \(contents)")
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
Bundled resource
|
||||
@@ -0,0 +1,4 @@
|
||||
version: 1
|
||||
bundleID: sh.xtool.examples.DemoResources
|
||||
resources:
|
||||
- Resources/top.txt
|
||||
@@ -0,0 +1,28 @@
|
||||
// swift-tools-version: 6.0
|
||||
|
||||
import PackageDescription
|
||||
|
||||
let package = Package(
|
||||
name: "DemoSimple",
|
||||
platforms: [
|
||||
.iOS(.v17),
|
||||
.macOS(.v14),
|
||||
],
|
||||
products: [
|
||||
.library(
|
||||
name: "DemoSimple",
|
||||
targets: ["DemoSimple"]
|
||||
),
|
||||
],
|
||||
dependencies: [
|
||||
.package(path: "../ExampleSupport"),
|
||||
],
|
||||
targets: [
|
||||
.target(
|
||||
name: "DemoSimple",
|
||||
dependencies: [
|
||||
"ExampleSupport",
|
||||
]
|
||||
),
|
||||
]
|
||||
)
|
||||
@@ -0,0 +1,26 @@
|
||||
import ExampleSupport
|
||||
import SwiftUI
|
||||
|
||||
@main struct DemoApp: App {
|
||||
public var body: some Scene {
|
||||
WindowGroup {
|
||||
ContentView()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private struct ContentView: View {
|
||||
@State var counter = 0
|
||||
|
||||
var body: some View {
|
||||
VStack {
|
||||
Button("Counter = \(counter)") {
|
||||
counter += 1
|
||||
}
|
||||
}
|
||||
.padding()
|
||||
.task {
|
||||
Example.pass()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
version: 1
|
||||
bundleID: sh.xtool.examples.DemoSimple
|
||||
@@ -0,0 +1,132 @@
|
||||
{
|
||||
"originHash" : "4a80ae2e9e4c4e1e4e29c32e93dc624202a42a942e44d358035684ec5e0746f7",
|
||||
"pins" : [
|
||||
{
|
||||
"identity" : "combine-schedulers",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/combine-schedulers",
|
||||
"state" : {
|
||||
"revision" : "114354e8c1667a2edc4993700fb9fa4f90157b56",
|
||||
"version" : "1.2.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-case-paths",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-case-paths",
|
||||
"state" : {
|
||||
"revision" : "cb4cba6a8a46a86db0d37dbe09935ead6b24c91a",
|
||||
"version" : "1.10.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-clocks",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-clocks",
|
||||
"state" : {
|
||||
"revision" : "82440fa0a8b1c381a6d1e8e0fc7bbba53ec63204",
|
||||
"version" : "1.1.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-collections",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-collections",
|
||||
"state" : {
|
||||
"revision" : "98ef3c98609a1e31b7e157b5b619579001a789d6",
|
||||
"version" : "1.7.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-composable-architecture",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-composable-architecture.git",
|
||||
"state" : {
|
||||
"revision" : "377da4061db10d26337a71bb279c506bb951f50f",
|
||||
"version" : "1.26.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-concurrency-extras",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-concurrency-extras",
|
||||
"state" : {
|
||||
"revision" : "5fa253428866f2360c3754e88537f700ed2656b5",
|
||||
"version" : "1.4.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-custom-dump",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-custom-dump",
|
||||
"state" : {
|
||||
"revision" : "4fb9e7cbb4b8f5a7354005db39447f570d6b3e19",
|
||||
"version" : "1.7.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-dependencies",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-dependencies",
|
||||
"state" : {
|
||||
"revision" : "b476cc5761057d8d857de063fe7ac8daecf5c06b",
|
||||
"version" : "1.17.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-identified-collections",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-identified-collections",
|
||||
"state" : {
|
||||
"revision" : "322d9ffeeba85c9f7c4984b39422ec7cc3c56597",
|
||||
"version" : "1.1.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-issue-reporting",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-issue-reporting",
|
||||
"state" : {
|
||||
"revision" : "75b000cea2ca6d7527a57e1b9cc0bdf21a9abe9f",
|
||||
"version" : "2.1.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-navigation",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-navigation",
|
||||
"state" : {
|
||||
"revision" : "7e95e5e9ff0a64f6ad8bca59083f8d6ba381b6ff",
|
||||
"version" : "2.11.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-perception",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-perception",
|
||||
"state" : {
|
||||
"revision" : "597afd46249f4a71885b95d26b26cc5b893daf32",
|
||||
"version" : "2.0.12"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-sharing",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-sharing",
|
||||
"state" : {
|
||||
"revision" : "3552faf8a6c18ce896ec5a72bd8c34755f0f03e0",
|
||||
"version" : "2.10.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-syntax",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/swiftlang/swift-syntax",
|
||||
"state" : {
|
||||
"revision" : "050f1a346fbbac0ca2cfb15a95274f7bd1cf0ccf",
|
||||
"version" : "604.0.0"
|
||||
}
|
||||
}
|
||||
],
|
||||
"version" : 3
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
// swift-tools-version: 6.0
|
||||
|
||||
import PackageDescription
|
||||
|
||||
let package = Package(
|
||||
name: "DemoTCA",
|
||||
platforms: [
|
||||
.iOS(.v17),
|
||||
.macOS(.v14),
|
||||
],
|
||||
products: [
|
||||
.library(
|
||||
name: "DemoTCA",
|
||||
targets: ["DemoTCA"]
|
||||
),
|
||||
],
|
||||
dependencies: [
|
||||
.package(path: "../ExampleSupport"),
|
||||
.package(url: "https://github.com/pointfreeco/swift-composable-architecture.git", from: "1.0.0"),
|
||||
],
|
||||
targets: [
|
||||
.target(
|
||||
name: "DemoTCA",
|
||||
dependencies: [
|
||||
"ExampleSupport",
|
||||
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
|
||||
],
|
||||
),
|
||||
]
|
||||
)
|
||||
@@ -0,0 +1,24 @@
|
||||
import SwiftUI
|
||||
import ComposableArchitecture
|
||||
import ExampleSupport
|
||||
|
||||
struct ContentView: View {
|
||||
let store: StoreOf<CounterFeature>
|
||||
|
||||
var body: some View {
|
||||
VStack {
|
||||
Image(systemName: "globe")
|
||||
.imageScale(.large)
|
||||
.foregroundStyle(.tint)
|
||||
Text("Count: \(store.count)")
|
||||
}
|
||||
.padding()
|
||||
.onAppear {
|
||||
store.send(.appear)
|
||||
}
|
||||
.onChange(of: store.count) { _, count in
|
||||
guard count == 1 else { return }
|
||||
Example.pass()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
import ComposableArchitecture
|
||||
|
||||
@Reducer
|
||||
struct CounterFeature {
|
||||
@ObservableState
|
||||
struct State {
|
||||
var count = 0
|
||||
}
|
||||
|
||||
enum Action {
|
||||
case appear
|
||||
case timerElapsed
|
||||
}
|
||||
|
||||
@Dependency(\.continuousClock) var continuousClock
|
||||
|
||||
var body: some Reducer<State, Action> {
|
||||
Reduce { state, action in
|
||||
switch action {
|
||||
case .appear:
|
||||
return .run { [continuousClock] send in
|
||||
try await continuousClock.sleep(for: .seconds(1))
|
||||
await send(.timerElapsed)
|
||||
}
|
||||
case .timerElapsed:
|
||||
state.count += 1
|
||||
return .none
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
import SwiftUI
|
||||
import ComposableArchitecture
|
||||
|
||||
@main
|
||||
struct DemoTCAApp: App {
|
||||
private let store = Store(initialState: CounterFeature.State()) {
|
||||
CounterFeature()
|
||||
}
|
||||
|
||||
var body: some Scene {
|
||||
WindowGroup {
|
||||
ContentView(store: store)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
version: 1
|
||||
bundleID: sh.xtool.examples.DemoTCA
|
||||
@@ -0,0 +1,31 @@
|
||||
// swift-tools-version: 6.4
|
||||
|
||||
import PackageDescription
|
||||
|
||||
let package = Package(
|
||||
name: "ExampleSupport",
|
||||
platforms: [
|
||||
.iOS(.v17),
|
||||
.macOS(.v14),
|
||||
],
|
||||
products: [
|
||||
.library(
|
||||
name: "ExampleSupport",
|
||||
targets: ["ExampleSupport"]
|
||||
),
|
||||
.library(
|
||||
name: "ExampleDynamicLibrary",
|
||||
type: .dynamic,
|
||||
targets: ["ExampleDynamicLibrary"]
|
||||
),
|
||||
],
|
||||
targets: [
|
||||
.target(name: "ExampleSupport"),
|
||||
.target(
|
||||
name: "ExampleDynamicLibrary",
|
||||
resources: [
|
||||
.process("response.txt"),
|
||||
]
|
||||
),
|
||||
]
|
||||
)
|
||||
@@ -0,0 +1,9 @@
|
||||
import Foundation
|
||||
|
||||
public func exampleDynamicLibraryFunction() -> String {
|
||||
guard let bundled = #bundle.url(forResource: "response", withExtension: "txt")
|
||||
else { fatalError("Missing bundled.txt resource") }
|
||||
// swiftlint:disable:next force_try
|
||||
let contents = try! String(contentsOf: bundled, encoding: .utf8)
|
||||
return "Hello \(contents)"
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
from the dynamic library
|
||||
@@ -0,0 +1,25 @@
|
||||
import SwiftUI
|
||||
|
||||
public protocol ExampleApp: App {}
|
||||
extension ExampleApp {
|
||||
public var body: some Scene {
|
||||
WindowGroup {
|
||||
ContentView()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private struct ContentView: View {
|
||||
var body: some View {
|
||||
VStack {
|
||||
Image(systemName: "globe")
|
||||
.imageScale(.large)
|
||||
.foregroundStyle(.tint)
|
||||
Text("Hello, world!")
|
||||
}
|
||||
.padding()
|
||||
.task {
|
||||
Example.pass()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
import Foundation
|
||||
|
||||
public enum Example {}
|
||||
extension Example {
|
||||
public static func pass() {
|
||||
Task {
|
||||
try? await Task.sleep(for: .seconds(1))
|
||||
print("xtool test succeeded")
|
||||
exit(0)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
# Examples
|
||||
|
||||
These primarily exist as fixtures for integration tests, but also double as snippets of sample code.
|
||||
|
||||
Each demo is designed to make some assertions shortly after launching, and then exit. On success, stdout will include the message "xtool test succeeded".
|
||||
|
||||
## Testing
|
||||
|
||||
```
|
||||
./Examples/test.sh [--build | --run] [DemoName]
|
||||
```
|
||||
|
||||
- Omit `--build`/`--run` to build _and_ run
|
||||
- Omit the demo name to loop through all demos
|
||||
Executable
+118
@@ -0,0 +1,118 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -euo pipefail
|
||||
shopt -s nullglob
|
||||
|
||||
usage() {
|
||||
echo "Usage: $0 [--build | --run] [DemoName]"
|
||||
}
|
||||
|
||||
mode=both
|
||||
case "${1:-}" in
|
||||
--build) mode=build; shift ;;
|
||||
--run) mode=run; shift ;;
|
||||
-h|--help) usage; exit 0 ;;
|
||||
esac
|
||||
|
||||
if [[ $# -gt 1 || (${1:-} != "" && (${1:-} != Demo* || ${1:-} == */*)) ]]; then
|
||||
usage >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
cd "$(dirname "$0")"
|
||||
examples_dir="$PWD"
|
||||
out_dir="$examples_dir/out"
|
||||
|
||||
if [[ -n "${1:-}" ]]; then
|
||||
demos=("$1")
|
||||
elif [[ "$mode" == run ]]; then
|
||||
demos=()
|
||||
for app in "$out_dir"/*.app; do
|
||||
name="${app##*/}"
|
||||
demos+=("${name%.app}")
|
||||
done
|
||||
else
|
||||
demos=()
|
||||
for demo in "$examples_dir"/Demo*/; do
|
||||
[[ -f "$demo/Package.swift" ]] || continue
|
||||
demo="${demo%/}"
|
||||
demos+=("${demo##*/}")
|
||||
done
|
||||
fi
|
||||
|
||||
if [[ ${#demos[@]} -eq 0 ]]; then
|
||||
echo "No demos found. Run $0 --build first if using --run." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
logs_dir="$(mktemp -d)"
|
||||
trap 'rm -rf "$logs_dir"' EXIT
|
||||
trap 'exit 130' INT
|
||||
trap 'exit 143' TERM
|
||||
|
||||
build_demo() {
|
||||
local demo="$1"
|
||||
echo "Building $demo..."
|
||||
mkdir -p "$out_dir" || return 1
|
||||
# Do not leave an older successful build available after a failed rebuild.
|
||||
rm -rf "$out_dir/$demo.app" || return 1
|
||||
(cd "$examples_dir/$demo" && xtool dev build --triple arm64-apple-ios-simulator) || return 1
|
||||
cp -R "$examples_dir/$demo/xtool/$demo.app" "$out_dir/$demo.app"
|
||||
}
|
||||
|
||||
run_demo() (
|
||||
demo="$1"
|
||||
app="$out_dir/$demo.app"
|
||||
log="$logs_dir/$demo-run.log"
|
||||
if [[ ! -d "$app" ]]; then
|
||||
echo "Missing $app. Run $0 --build $demo first." >&2
|
||||
exit 1
|
||||
fi
|
||||
bundle_id=$(/usr/libexec/PlistBuddy -c 'Print :CFBundleIdentifier' "$app/Info.plist") || exit 1
|
||||
echo "Running $demo..."
|
||||
xcrun simctl install booted "$app" || exit 1
|
||||
xcrun simctl launch --terminate-running-process --console booted "$bundle_id" >"$log" 2>&1 &
|
||||
launch_pid=$!
|
||||
# A demo should exit shortly after launch. Bound failures that hang instead.
|
||||
(
|
||||
sleep_pid=""
|
||||
trap '[[ -z "$sleep_pid" ]] || kill "$sleep_pid" 2>/dev/null || true' EXIT
|
||||
sleep 60 &
|
||||
sleep_pid=$!
|
||||
wait "$sleep_pid"
|
||||
sleep_pid=""
|
||||
touch "$log.timeout"
|
||||
kill -TERM "$launch_pid" 2>/dev/null || exit 0
|
||||
sleep 5 &
|
||||
sleep_pid=$!
|
||||
wait "$sleep_pid"
|
||||
sleep_pid=""
|
||||
kill -KILL "$launch_pid" 2>/dev/null || true
|
||||
) >/dev/null 2>&1 &
|
||||
timeout_pid=$!
|
||||
trap 'kill "$timeout_pid" "$launch_pid" 2>/dev/null || true' EXIT
|
||||
status=0
|
||||
wait "$launch_pid" || status=$?
|
||||
kill "$timeout_pid" 2>/dev/null || true
|
||||
wait "$timeout_pid" 2>/dev/null || true
|
||||
cat "$log"
|
||||
if [[ -f "$log.timeout" ]]; then
|
||||
echo "$demo did not terminate within 60 seconds." >&2
|
||||
exit 1
|
||||
fi
|
||||
[[ "$status" -eq 0 ]] && grep -Fxq 'xtool test succeeded' "$log"
|
||||
)
|
||||
|
||||
status=0
|
||||
for demo in "${demos[@]}"; do
|
||||
if [[ "$mode" != run ]] && ! build_demo "$demo"; then
|
||||
echo "Build failed: $demo" >&2
|
||||
status=1
|
||||
continue
|
||||
fi
|
||||
if [[ "$mode" != build ]] && ! run_demo "$demo"; then
|
||||
echo "Test failed: $demo" >&2
|
||||
status=1
|
||||
fi
|
||||
done
|
||||
exit "$status"
|
||||
+2
-2
@@ -13,7 +13,7 @@ fi
|
||||
rm -rf staging/tmp
|
||||
mkdir -p staging/tmp staging/linuxdeploy
|
||||
|
||||
swift build --package-path .. -c release --product xtool --static-swift-stdlib
|
||||
swift build --package-path .. -c release --product xtool
|
||||
bin="$(swift build --package-path .. -c release --show-bin-path)"
|
||||
strip "${bin}/xtool"
|
||||
|
||||
@@ -38,7 +38,7 @@ if [[ ! -f staging/linuxdeploy/linuxdeploy.AppImage ]]; then
|
||||
fi
|
||||
|
||||
mkdir -p staging/tmp/AppDir/usr/bin
|
||||
find "${bin}"/ -name '*.resources' -print0 | xargs -0 -I {} cp -a {} "${PWD}/staging/tmp/AppDir/usr/bin/"
|
||||
find "${bin}"/ -name '*.resources' -or -name '*.bundle' -print0 | xargs -0 -I {} cp -a {} "${PWD}/staging/tmp/AppDir/usr/bin/"
|
||||
|
||||
export LINUXDEPLOY_OUTPUT_VERSION="${XTOOL_VERSION:-unversioned}"
|
||||
export LDAI_OUTPUT="staging/tmp/xtool-${curr_arch}.AppImage"
|
||||
|
||||
@@ -132,7 +132,8 @@ docs-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
|
||||
SWIFTLINT_ARCH = $(subst aarch64,arm64,$(subst x86_64,amd64,$(shell uname -m)))
|
||||
SWIFTLINT_URL = https://github.com/realm/SwiftLint/releases/download/$(SWIFTLINT_VERSION)/$(if $(IS_MAC),portable_swiftlint,swiftlint_linux_$(SWIFTLINT_ARCH)).zip
|
||||
|
||||
.PHONY: lint
|
||||
lint: $(SWIFTLINT_BIN)
|
||||
|
||||
+97
-133
@@ -1,13 +1,13 @@
|
||||
{
|
||||
"originHash" : "90ad8f84cef9a5c63d7cc80c20c4a7e332fd63bead7d72ee1d94da8b1a0a2186",
|
||||
"originHash" : "df62267a8ffd060087e903a9d112d24562a959d43a0819a6511367da533c5594",
|
||||
"pins" : [
|
||||
{
|
||||
"identity" : "aexml",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/tadija/AEXML.git",
|
||||
"state" : {
|
||||
"revision" : "db806756c989760b35108146381535aec231092b",
|
||||
"version" : "4.7.0"
|
||||
"revision" : "dd9206de0717d658daec6a064992894fdab8ae17",
|
||||
"version" : "4.7.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -15,8 +15,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/swift-server/async-http-client.git",
|
||||
"state" : {
|
||||
"revision" : "3a5b74a58782c3b4c1f0bc75e9b67b10c2494e8f",
|
||||
"version" : "1.33.1"
|
||||
"revision" : "4c005f955e83f888d5616e579717a36d2dfc6301",
|
||||
"version" : "1.36.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -24,8 +24,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/attaswift/BigInt",
|
||||
"state" : {
|
||||
"revision" : "e07e00fa1fd435143a2dcf8b7eec9a7710b2fdfe",
|
||||
"version" : "5.7.0"
|
||||
"revision" : "63feef7820abb1a8fb08587d7da56bb0b7db8751",
|
||||
"version" : "6.0.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -33,17 +33,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/combine-schedulers",
|
||||
"state" : {
|
||||
"revision" : "dcccb979a2183b8df3334237e3dc1ae2b4116a86",
|
||||
"version" : "1.2.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "jsonutilities",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/yonaskolb/JSONUtilities.git",
|
||||
"state" : {
|
||||
"revision" : "128d2ffc22467f69569ef8ff971683e2393191a0",
|
||||
"version" : "4.2.0"
|
||||
"revision" : "114354e8c1667a2edc4993700fb9fa4f90157b56",
|
||||
"version" : "1.2.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -51,8 +42,17 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/mattpolzin/OpenAPIKit",
|
||||
"state" : {
|
||||
"revision" : "57b6318128e3f901c93f4fbf98d1c1464ec168d3",
|
||||
"version" : "6.2.0"
|
||||
"revision" : "5b72eb9a6b23b1fec439d9a0bf38f115400421f9",
|
||||
"version" : "6.4.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "opencombine",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/OpenCombine/OpenCombine.git",
|
||||
"state" : {
|
||||
"revision" : "8576f0d579b27020beccbccc3ea6844f3ddfc2c2",
|
||||
"version" : "0.14.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -64,15 +64,6 @@
|
||||
"version" : "1.0.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "rainbow",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/onevcat/Rainbow.git",
|
||||
"state" : {
|
||||
"revision" : "cdf146ae671b2624917648b61c908d1244b98ca1",
|
||||
"version" : "4.2.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "spectre",
|
||||
"kind" : "remoteSourceControl",
|
||||
@@ -94,10 +85,10 @@
|
||||
{
|
||||
"identity" : "swift-argument-parser",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-argument-parser",
|
||||
"location" : "https://github.com/apple/swift-argument-parser.git",
|
||||
"state" : {
|
||||
"revision" : "626b5b7b2f45e1b0b1c6f4a309296d1d21d7311b",
|
||||
"version" : "1.7.1"
|
||||
"revision" : "6a52f3251125d74daf04fcbd5e6f08a75d074382",
|
||||
"version" : "1.8.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -105,8 +96,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-asn1.git",
|
||||
"state" : {
|
||||
"revision" : "eb50cbd14606a9161cbc5d452f18797c90ef0bab",
|
||||
"version" : "1.7.0"
|
||||
"revision" : "3b6410f7dee09eb33cdd26260c5fd47fda19b0e2",
|
||||
"version" : "1.7.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -114,8 +105,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-async-algorithms.git",
|
||||
"state" : {
|
||||
"revision" : "9d349bcc328ac3c31ce40e746b5882742a0d1272",
|
||||
"version" : "1.1.3"
|
||||
"revision" : "13713a4ffdee8abd929f92568ee9462a46ae26e0",
|
||||
"version" : "1.1.7"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -123,8 +114,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-atomics.git",
|
||||
"state" : {
|
||||
"revision" : "b601256eab081c0f92f059e12818ac1d4f178ff7",
|
||||
"version" : "1.3.0"
|
||||
"revision" : "0442cb5a3f98ab802acb777929fdb446bda11a34",
|
||||
"version" : "1.3.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -132,8 +123,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-certificates",
|
||||
"state" : {
|
||||
"revision" : "bde8ca32a096825dfce37467137c903418c1893d",
|
||||
"version" : "1.19.1"
|
||||
"revision" : "ff86b924ead66f853b8baf91f3c41926a8f36177",
|
||||
"version" : "1.21.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -141,8 +132,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-clocks",
|
||||
"state" : {
|
||||
"revision" : "cc46202b53476d64e824e0b6612da09d84ffde8e",
|
||||
"version" : "1.0.6"
|
||||
"revision" : "82440fa0a8b1c381a6d1e8e0fc7bbba53ec63204",
|
||||
"version" : "1.1.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -150,8 +141,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-collections",
|
||||
"state" : {
|
||||
"revision" : "fea17c02d767f46b23070fdfdacc28a03a39232a",
|
||||
"version" : "1.5.1"
|
||||
"revision" : "35a1edcb8ebd2bfe251d587f0b69e62af28f508c",
|
||||
"version" : "1.7.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -159,8 +150,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-concurrency-extras",
|
||||
"state" : {
|
||||
"revision" : "5a3825302b1a0d744183200915a47b508c828e6f",
|
||||
"version" : "1.3.2"
|
||||
"revision" : "8a4260f7373493435bd21194585c95b72bfdd401",
|
||||
"version" : "1.4.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -168,8 +159,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-configuration.git",
|
||||
"state" : {
|
||||
"revision" : "be76c4ad929eb6c4bcaf3351799f2adf9e6848a9",
|
||||
"version" : "1.2.0"
|
||||
"revision" : "8bae88f79dbddec793390c5bf3e2abb4ac2ece42",
|
||||
"version" : "1.2.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -177,8 +168,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-crypto",
|
||||
"state" : {
|
||||
"revision" : "1b6b2e274e85105bfa155183145a1dcfd63331f1",
|
||||
"version" : "4.5.0"
|
||||
"revision" : "c2cbadd7263439d8015189668f96ff5b5be565ce",
|
||||
"version" : "5.0.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -186,8 +177,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-dependencies",
|
||||
"state" : {
|
||||
"revision" : "706feb7858a7f6c242879d137b8ee30926aa5b26",
|
||||
"version" : "1.12.0"
|
||||
"revision" : "b476cc5761057d8d857de063fe7ac8daecf5c06b",
|
||||
"version" : "1.17.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -195,8 +186,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-distributed-tracing.git",
|
||||
"state" : {
|
||||
"revision" : "dc4030184203ffafbb2ec614352487235d747fe0",
|
||||
"version" : "1.4.1"
|
||||
"revision" : "297b5b9c82a5631e3199ce3ec0993a3cfb0fbb84",
|
||||
"version" : "1.7.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -231,8 +222,17 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-http-types",
|
||||
"state" : {
|
||||
"revision" : "45eb0224913ea070ec4fba17291b9e7ecf4749ca",
|
||||
"version" : "1.5.1"
|
||||
"revision" : "bff4b6903cdc99dda49649dd52f46c11cfd3ed50",
|
||||
"version" : "1.8.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-issue-reporting",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-issue-reporting",
|
||||
"state" : {
|
||||
"revision" : "b23bb4493c439d3e05152bc167014235ba3d47fc",
|
||||
"version" : "2.1.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -240,8 +240,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-log.git",
|
||||
"state" : {
|
||||
"revision" : "5073617dac96330a486245e4c0179cb0a6fd2256",
|
||||
"version" : "1.12.0"
|
||||
"revision" : "4038b6a4f74a1426f47eb1dd5b4bb5628a15d597",
|
||||
"version" : "1.16.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -249,8 +249,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-nio",
|
||||
"state" : {
|
||||
"revision" : "f71c8d2a5e74a2c6d11a0fbe324774b5d6084237",
|
||||
"version" : "2.99.0"
|
||||
"revision" : "6db9d9abd92ad7399b8a564cafbb87d3507245fa",
|
||||
"version" : "2.104.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -258,8 +258,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-nio-extras.git",
|
||||
"state" : {
|
||||
"revision" : "5a48717e29f62cb8326d6d42e46b562ca93847a6",
|
||||
"version" : "1.34.0"
|
||||
"revision" : "41449336c8ecfadac6b4b5be75f9c3c306e61ced",
|
||||
"version" : "1.35.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -267,8 +267,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-nio-http2.git",
|
||||
"state" : {
|
||||
"revision" : "81cc18264f92cd307ff98430f89372711d4f6fe9",
|
||||
"version" : "1.43.0"
|
||||
"revision" : "0f3e54e29c944c2e835ad52159da7d9e1c94ac69",
|
||||
"version" : "1.46.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -276,8 +276,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-nio-ssl.git",
|
||||
"state" : {
|
||||
"revision" : "3f337058ccd7243c4cac7911477d8ad4c598d4da",
|
||||
"version" : "2.37.0"
|
||||
"revision" : "322f3c2a4a21df31c84ca416bf65ee5e9059e440",
|
||||
"version" : "2.37.5"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -312,8 +312,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-openapi-generator",
|
||||
"state" : {
|
||||
"revision" : "5dd0da1c7da7bac8f0c458a02a76f69031137a80",
|
||||
"version" : "1.12.1"
|
||||
"revision" : "164dfbcf1f78e2ddc719ab9d85c50d1157fa8d7d",
|
||||
"version" : "1.14.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -321,8 +321,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-openapi-runtime",
|
||||
"state" : {
|
||||
"revision" : "f039fa6d6338aab5164f3d1be16281524c9a8f89",
|
||||
"version" : "1.11.0"
|
||||
"revision" : "ad7a252e215870ea2de9cf8605ff9336b004183a",
|
||||
"version" : "1.13.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -330,8 +330,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-openapi-urlsession",
|
||||
"state" : {
|
||||
"revision" : "576a65b4ffb8c12ddad4950dc21eea2ef071bec2",
|
||||
"version" : "1.3.0"
|
||||
"revision" : "c97e0f0187d95542b4a254f5bb4dc67f43bf73c9",
|
||||
"version" : "1.4.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -339,8 +339,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-service-context.git",
|
||||
"state" : {
|
||||
"revision" : "d0997351b0c7779017f88e7a93bc30a1878d7f29",
|
||||
"version" : "1.3.0"
|
||||
"revision" : "853ba3d9ce78851b9cc20108e8bd4f13f7fa546c",
|
||||
"version" : "1.5.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -348,8 +348,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/swift-server/swift-service-lifecycle",
|
||||
"state" : {
|
||||
"revision" : "9829955b385e5bb88128b73f1b8389e9b9c3191a",
|
||||
"version" : "2.11.0"
|
||||
"revision" : "a18ee16b8039866fd919bdb4e8e906882d4ecc75",
|
||||
"version" : "2.13.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -357,8 +357,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/swiftlang/swift-subprocess",
|
||||
"state" : {
|
||||
"revision" : "11633673a41f509f8945f23c96c7acd4adafd679",
|
||||
"version" : "0.5.0"
|
||||
"revision" : "dbe21bd7dfd4ffef8c32588918542a8abfa1b54c",
|
||||
"version" : "1.0.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -366,26 +366,17 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/swiftlang/swift-syntax",
|
||||
"state" : {
|
||||
"revision" : "9de99a78f099e59caf2b2beec65a4c45d54b2081",
|
||||
"version" : "603.0.1"
|
||||
"revision" : "050f1a346fbbac0ca2cfb15a95274f7bd1cf0ccf",
|
||||
"version" : "604.0.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-system",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-system",
|
||||
"location" : "https://github.com/apple/swift-system.git",
|
||||
"state" : {
|
||||
"revision" : "7c6ad0fc39d0763e0b699210e4124afd5041c5df",
|
||||
"version" : "1.6.4"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swiftcli",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/jakeheis/SwiftCLI.git",
|
||||
"state" : {
|
||||
"revision" : "2e949055d9797c1a6bddcda0e58dada16cc8e970",
|
||||
"version" : "6.0.3"
|
||||
"revision" : "869129b7bf4ecc57b97d0193ad29690ca2134750",
|
||||
"version" : "1.8.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -393,8 +384,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/xtool-org/SwiftyMobileDevice",
|
||||
"state" : {
|
||||
"revision" : "280d0dc8153469944491aee2f19af29e9c7a77f0",
|
||||
"version" : "1.5.0"
|
||||
"revision" : "1f6e4cc614a31953bda5d1092a747cfdea90916f",
|
||||
"version" : "1.7.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -406,15 +397,6 @@
|
||||
"version" : "3.3.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "version",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/mxcl/Version",
|
||||
"state" : {
|
||||
"revision" : "3043fcd2a50375db76d89ff206a612471833d1c2",
|
||||
"version" : "2.2.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "websocket-kit",
|
||||
"kind" : "remoteSourceControl",
|
||||
@@ -425,21 +407,12 @@
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "xadi",
|
||||
"identity" : "xcode-project-format",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/xtool-org/xadi",
|
||||
"location" : "https://github.com/apple/xcode-project-format.git",
|
||||
"state" : {
|
||||
"revision" : "831f8ddfc72f7a48d0c2c03ac9c864eee1f8f6b3",
|
||||
"version" : "0.4.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "xcodegen",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/yonaskolb/XcodeGen",
|
||||
"state" : {
|
||||
"revision" : "8d3d3476a69ae3e5d68e1adccc701c410c05eb36",
|
||||
"version" : "2.45.4"
|
||||
"revision" : "c132630aabf40f6d6c3f7bb004595d2e5a28ea42",
|
||||
"version" : "0.1.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -447,17 +420,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/tuist/XcodeProj.git",
|
||||
"state" : {
|
||||
"revision" : "01bb77000bc8c23a09ea2058f4954612f03cb705",
|
||||
"version" : "9.10.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "xctest-dynamic-overlay",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
|
||||
"state" : {
|
||||
"revision" : "dfd70507def84cb5fb821278448a262c6ff2bbad",
|
||||
"version" : "1.9.0"
|
||||
"revision" : "b505c06bb190b9306b29d5d96e3284e139af3cc8",
|
||||
"version" : "9.17.6"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -465,8 +429,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/xtool-org/xtool-core",
|
||||
"state" : {
|
||||
"revision" : "d412ac768d1e73d16ad7ccc6805f12fc701709f6",
|
||||
"version" : "1.4.0"
|
||||
"revision" : "154d7213c12e3f21d50793f50ec7bfb89cfd3918",
|
||||
"version" : "1.5.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -474,8 +438,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/jpsim/Yams",
|
||||
"state" : {
|
||||
"revision" : "3d6871d5b4a5cd519adf233fbb576e0a2af71c17",
|
||||
"version" : "5.4.0"
|
||||
"revision" : "a27b21e0c81c5bf42049b897a62aaf387e80f279",
|
||||
"version" : "6.2.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -483,8 +447,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/xtool-org/zsign",
|
||||
"state" : {
|
||||
"revision" : "6c4a9f52dd8bf374aa938ef9c17d5f261f2c333a",
|
||||
"version" : "1.7.0"
|
||||
"revision" : "f6158be9e62a5ce2a53d72b1a6d880880da956c8",
|
||||
"version" : "1.9.0"
|
||||
}
|
||||
}
|
||||
],
|
||||
|
||||
+30
-17
@@ -30,8 +30,8 @@ let swiftSettings: [SwiftSetting] = {
|
||||
let package = Package(
|
||||
name: "xtool",
|
||||
platforms: [
|
||||
.iOS(.v16),
|
||||
.macOS(.v13),
|
||||
.iOS(.v17),
|
||||
.macOS(.v14),
|
||||
],
|
||||
products: [
|
||||
.library(
|
||||
@@ -48,23 +48,24 @@ let package = Package(
|
||||
),
|
||||
],
|
||||
dependencies: [
|
||||
.package(url: "https://github.com/xtool-org/xtool-core", .upToNextMinor(from: "1.4.0")),
|
||||
.package(url: "https://github.com/xtool-org/SwiftyMobileDevice", .upToNextMinor(from: "1.5.0")),
|
||||
.package(url: "https://github.com/xtool-org/zsign", .upToNextMinor(from: "1.7.0")),
|
||||
.package(url: "https://github.com/xtool-org/xadi", .upToNextMinor(from: "0.4.0")),
|
||||
.package(url: "https://github.com/xtool-org/xtool-core", .upToNextMinor(from: "1.5.1")),
|
||||
.package(url: "https://github.com/xtool-org/SwiftyMobileDevice", .upToNextMinor(from: "1.7.0")),
|
||||
.package(url: "https://github.com/xtool-org/zsign", .upToNextMinor(from: "1.9.0")),
|
||||
|
||||
.package(url: "https://github.com/apple/swift-system", from: "1.4.0"),
|
||||
.package(url: "https://github.com/apple/swift-http-types", from: "1.3.1"),
|
||||
.package(url: "https://github.com/apple/swift-certificates", from: "1.0.0"),
|
||||
.package(url: "https://github.com/apple/swift-crypto", from: "4.5.0"),
|
||||
.package(url: "https://github.com/apple/swift-crypto", from: "5.0.0"),
|
||||
.package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"),
|
||||
.package(url: "https://github.com/apple/swift-openapi-generator", from: "1.6.0"),
|
||||
.package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.0.0"),
|
||||
.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-collections", from: "1.7.1"),
|
||||
.package(url: "https://github.com/apple/xcode-project-format.git", .upToNextMinor(from: "0.1.0")),
|
||||
|
||||
.package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.0.0"),
|
||||
.package(url: "https://github.com/swiftlang/swift-subprocess", .upToNextMinor(from: "0.5.0")),
|
||||
.package(url: "https://github.com/swiftlang/swift-subprocess", 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"),
|
||||
@@ -72,14 +73,16 @@ let package = Package(
|
||||
|
||||
.package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.3.0"),
|
||||
.package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.6.2"),
|
||||
// we don't use this but need the explicit dependency to keep the lockfile stable.
|
||||
// TODO: remove once https://github.com/pointfreeco/combine-schedulers/issues/120 is fixed
|
||||
.package(url: "https://github.com/OpenCombine/OpenCombine.git", from: "0.14.0"),
|
||||
|
||||
.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/attaswift/BigInt", from: "6.0.0"),
|
||||
.package(url: "https://github.com/jpsim/Yams", from: "6.0.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.45.4"),
|
||||
// NB: this should only be imported from XcodeProjects
|
||||
.package(url: "https://github.com/tuist/XcodeProj.git", from: "9.17.5"),
|
||||
],
|
||||
targets: [
|
||||
.target(
|
||||
@@ -120,7 +123,6 @@ let package = Package(
|
||||
"DeveloperAPI",
|
||||
"CXKit",
|
||||
"XUtils",
|
||||
.product(name: "XADI", package: "xadi", condition: .when(platforms: [.linux])),
|
||||
.product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
|
||||
.product(name: "Dependencies", package: "swift-dependencies"),
|
||||
.product(name: "SwiftyMobileDevice", package: "SwiftyMobileDevice"),
|
||||
@@ -129,7 +131,7 @@ let package = Package(
|
||||
.product(name: "ProtoCodable", package: "xtool-core"),
|
||||
.product(name: "Superutils", package: "xtool-core"),
|
||||
.product(name: "Crypto", package: "swift-crypto"),
|
||||
.product(name: "_CryptoExtras", package: "swift-crypto"),
|
||||
.product(name: "CryptoExtras", package: "swift-crypto"),
|
||||
.product(name: "X509", package: "swift-certificates"),
|
||||
.product(name: "BigInt", package: "BigInt"),
|
||||
.product(name: "HTTPTypes", package: "swift-http-types"),
|
||||
@@ -159,6 +161,9 @@ let package = Package(
|
||||
dependencies: [
|
||||
"XKit",
|
||||
"XToolSupport",
|
||||
"PackLib",
|
||||
.product(name: "Crypto", package: "swift-crypto"),
|
||||
.product(name: "X509", package: "swift-certificates"),
|
||||
],
|
||||
swiftSettings: swiftSettings,
|
||||
),
|
||||
@@ -171,18 +176,26 @@ let package = Package(
|
||||
.product(name: "ArgumentParser", package: "swift-argument-parser"),
|
||||
.product(name: "SystemPackage", package: "swift-system"),
|
||||
.product(name: "NIOPosix", package: "swift-nio"),
|
||||
.product(name: "Version", package: "Version"),
|
||||
.product(name: "libunxip", package: "unxip"),
|
||||
],
|
||||
cSettings: cSettings,
|
||||
swiftSettings: swiftSettings,
|
||||
),
|
||||
.target(
|
||||
name: "XcodeProjects",
|
||||
dependencies: [
|
||||
.product(name: "XcodeProj", package: "XcodeProj"),
|
||||
.product(name: "XcodeProjectFormat", package: "xcode-project-format"),
|
||||
],
|
||||
),
|
||||
.target(
|
||||
name: "PackLib",
|
||||
dependencies: [
|
||||
"XUtils",
|
||||
"XcodeProjects",
|
||||
.product(name: "Superutils", package: "xtool-core"),
|
||||
.product(name: "Yams", package: "Yams"),
|
||||
.product(name: "XcodeGenKit", package: "XcodeGen", condition: .when(platforms: [.macOS])),
|
||||
.product(name: "XcodeProjectFormat", package: "xcode-project-format"),
|
||||
],
|
||||
swiftSettings: swiftSettings,
|
||||
),
|
||||
|
||||
@@ -1,37 +1,75 @@
|
||||
import Foundation
|
||||
import Subprocess
|
||||
import XUtils
|
||||
import Superutils
|
||||
|
||||
public struct BuildSettings: Sendable {
|
||||
private static let customBinDir =
|
||||
// this is the same option used by SwiftPM itself for dev builds
|
||||
ProcessInfo.processInfo.environment["SWIFTPM_CUSTOM_BIN_DIR"].map { FilePath($0) }
|
||||
|
||||
private static let envURL = URL(fileURLWithPath: "/usr/bin/env")
|
||||
|
||||
public let packagePath: String
|
||||
public var packagePath: String
|
||||
public let configuration: BuildConfiguration
|
||||
public let triple: String
|
||||
public let sdkOptions: [String]
|
||||
public let options: [String]
|
||||
public let buildSystem: BuildSystem
|
||||
public let customOptions: [String]
|
||||
|
||||
public var sdkOptions: [String]
|
||||
public var sdkEnvironment: [Environment.Key: String?]
|
||||
|
||||
private var configOptions: [String] {
|
||||
return [
|
||||
"--configuration", configuration.rawValue,
|
||||
"--build-system", buildSystem.pmName,
|
||||
"--package-path", packagePath,
|
||||
]
|
||||
}
|
||||
|
||||
private var resolvedBaseOptions: [String] {
|
||||
configOptions + sdkOptions + customOptions
|
||||
}
|
||||
|
||||
public init(
|
||||
configuration: BuildConfiguration,
|
||||
triple: String,
|
||||
buildSystem: BuildSystem? = nil,
|
||||
packagePath: String = ".",
|
||||
options: [String] = []
|
||||
) async throws {
|
||||
self.packagePath = packagePath
|
||||
self.configuration = configuration
|
||||
self.options = options
|
||||
self.customOptions = options
|
||||
self.triple = triple
|
||||
self.buildSystem = if let buildSystem { buildSystem } else { try await .default() }
|
||||
|
||||
// on macOS we don't explicitly install a Swift SDK but
|
||||
// SwiftPM vends "implicit" Darwin SDKs as of Swift 6.1,
|
||||
// i.e. we can pass `--swift-sdk arm64-apple-ios` and it
|
||||
// just works. See:
|
||||
// https://github.com/swiftlang/swift-package-manager/pull/6828
|
||||
self.sdkOptions = ["--swift-sdk", triple]
|
||||
self.sdkEnvironment = [
|
||||
// xcrun passes an SDKROOT that messes with our sdk configuration
|
||||
"SDKROOT": nil,
|
||||
]
|
||||
|
||||
switch self.buildSystem {
|
||||
case .swiftPM:
|
||||
// on macOS we don't explicitly install a Swift SDK but
|
||||
// SwiftPM vends "implicit" Darwin SDKs as of Swift 6.1,
|
||||
// i.e. we can pass `--swift-sdk arm64-apple-ios` and it
|
||||
// just works. See:
|
||||
// https://github.com/swiftlang/swift-package-manager/pull/6828
|
||||
self.sdkOptions = ["--swift-sdk", triple]
|
||||
case .swiftBuild:
|
||||
self.sdkOptions = ["--triple", triple]
|
||||
#if !os(macOS)
|
||||
let darwinSDK = try DarwinSDK.current()
|
||||
.orThrow(StringError("No Darwin SDK configured. Please run `xtool setup`."))
|
||||
self.sdkOptions += [
|
||||
"--toolset", "\(darwinSDK.bundle.path)/toolset-swb.json",
|
||||
]
|
||||
self.sdkEnvironment.merge([
|
||||
"XCODE_EXTRA_PLATFORM_FOLDERS": "\(darwinSDK.bundle.path)/Developer/Platforms",
|
||||
// SWB looks for dsymutil in the PATH. Other stuff (lld, libtool) is handled by toolset-swb.json.
|
||||
"PATH": "\(darwinSDK.bundle.path)/toolset/bin:\(ProcessInfo.processInfo.environment["PATH"] ?? "")",
|
||||
]) { $1 }
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
#if os(macOS)
|
||||
@@ -41,18 +79,43 @@ public struct BuildSettings: Sendable {
|
||||
arguments: .init(arguments),
|
||||
output: .string(limit: .max)
|
||||
).checkSuccess()
|
||||
return result.standardOutput?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
|
||||
return result.standardOutput.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
}
|
||||
|
||||
private static let swiftURL = Task {
|
||||
private static let _swiftURL = Task {
|
||||
try await FilePath(xcrun(["-f", "swift"]))
|
||||
}
|
||||
|
||||
public static func swiftURL() async throws -> FilePath {
|
||||
try await _swiftURL.value
|
||||
}
|
||||
|
||||
private static let _swiftcURL = Task {
|
||||
try await FilePath(xcrun(["-f", "swiftc"]))
|
||||
}
|
||||
|
||||
public static func swiftcURL() async throws -> FilePath {
|
||||
try await _swiftcURL.value
|
||||
}
|
||||
#else
|
||||
public static func swiftURL() async throws -> FilePath {
|
||||
try await FilePath(ToolRegistry.locate("swift")).orThrow(StringError("Got bad path for swift executable"))
|
||||
}
|
||||
|
||||
public static func swiftcURL() async throws -> FilePath {
|
||||
try await FilePath(ToolRegistry.locate("swiftc")).orThrow(StringError("Got bad path for swiftc executable"))
|
||||
}
|
||||
#endif
|
||||
|
||||
public func withPackagePath(_ path: String) -> Self {
|
||||
var copy = self
|
||||
copy.packagePath = path
|
||||
return copy
|
||||
}
|
||||
|
||||
public func swiftPMInvocation(
|
||||
forTool tool: String,
|
||||
arguments: [String],
|
||||
packagePathOverride: String? = nil
|
||||
) async throws -> Subprocess.Configuration {
|
||||
let executable: Executable
|
||||
let baseArguments: [String]
|
||||
@@ -65,35 +128,71 @@ public struct BuildSettings: Sendable {
|
||||
// to add SDKROOT=.../MacOSX.sdk to our invocations. We avoid this by
|
||||
// 1) invoking the real swift executable (located with `xcrun -f`) and
|
||||
// 2) explicitly removing SDKROOT from the env, as it may be inherited
|
||||
// through the `swift run pack` invocation.
|
||||
executable = .path(try await Self.swiftURL.value)
|
||||
// through a parent process (e.g. `swift run xtool`).
|
||||
executable = .path(try await Self.swiftURL())
|
||||
#else
|
||||
executable = .name("swift")
|
||||
#endif
|
||||
baseArguments = [tool]
|
||||
}
|
||||
|
||||
let extraArguments: [String] = [
|
||||
"--package-path", packagePathOverride ?? packagePath,
|
||||
"--configuration", configuration.rawValue,
|
||||
]
|
||||
|
||||
var rawEnv = ProcessInfo.processInfo.environment
|
||||
rawEnv.removeValue(forKey: "SDKROOT")
|
||||
let env = Dictionary(uniqueKeysWithValues: rawEnv.map {
|
||||
(Environment.Key(rawValue: $0)!, $1)
|
||||
})
|
||||
|
||||
return Configuration(
|
||||
executable,
|
||||
arguments: .init(baseArguments + extraArguments + sdkOptions + options + arguments),
|
||||
environment: .custom(env),
|
||||
executable: executable,
|
||||
arguments: .init(baseArguments + resolvedBaseOptions + arguments),
|
||||
environment: .inherit.updating(sdkEnvironment),
|
||||
platformOptions: .withGracefulShutDown,
|
||||
)
|
||||
}
|
||||
|
||||
// loosely based on
|
||||
// https://github.com/swiftlang/sourcekit-lsp/blob/c55899a/Sources/BuildServerIntegration/ExternalBuildServerAdapter.swift#L92
|
||||
private var baseBuildServerArguments: [String] {
|
||||
return [
|
||||
"experimental-build-server",
|
||||
"--disable-automatic-resolution",
|
||||
"--scratch-path", ".build/index-build",
|
||||
// this requires Swift 6.4 but we need 6.4 on Linux anyway, for the platform toolset fixes
|
||||
"--experimental-skip-acquiring-lock",
|
||||
]
|
||||
}
|
||||
|
||||
public var buildServerArguments: [String] {
|
||||
["package"] + baseBuildServerArguments + resolvedBaseOptions
|
||||
}
|
||||
|
||||
public func buildServerInvocation() async throws -> Subprocess.Configuration {
|
||||
try await swiftPMInvocation(forTool: "package", arguments: baseBuildServerArguments)
|
||||
}
|
||||
}
|
||||
|
||||
public enum BuildConfiguration: String, CaseIterable, Sendable {
|
||||
case debug
|
||||
case release
|
||||
|
||||
var swiftBuildValue: String {
|
||||
switch self {
|
||||
case .debug: "Debug"
|
||||
case .release: "Release"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public enum BuildSystem: Sendable {
|
||||
case swiftPM
|
||||
case swiftBuild
|
||||
|
||||
public static func `default`() async throws -> Self {
|
||||
if try await SwiftVersion.current.supportsSwiftBuild {
|
||||
return .swiftBuild
|
||||
} else {
|
||||
return .swiftPM
|
||||
}
|
||||
}
|
||||
|
||||
var pmName: String {
|
||||
switch self {
|
||||
case .swiftPM: "native"
|
||||
case .swiftBuild: "swiftbuild"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,88 +1,129 @@
|
||||
import Foundation
|
||||
import XUtils
|
||||
import Subprocess
|
||||
import Superutils
|
||||
|
||||
public struct DarwinSDK {
|
||||
package struct TemporaryBundle: ~Copyable {
|
||||
package let url: URL
|
||||
|
||||
fileprivate init(url: URL) {
|
||||
self.url = url
|
||||
}
|
||||
|
||||
package consuming func install() async throws {
|
||||
guard DarwinSDK(bundle: url) != nil else {
|
||||
throw StringError("Invalid Darwin SDK at '\(url.path)'")
|
||||
}
|
||||
|
||||
try await DarwinSDK.addHostClangResourceDir(to: url)
|
||||
|
||||
let destination = url.deletingLastPathComponent()
|
||||
.appendingPathComponent("darwin.artifactbundle", isDirectory: true)
|
||||
try FileManager.default.moveItem(at: url, to: destination)
|
||||
}
|
||||
|
||||
deinit {
|
||||
try? FileManager.default.removeItem(at: url)
|
||||
}
|
||||
}
|
||||
|
||||
public enum Flavor {
|
||||
// can't be updated in place
|
||||
case slim
|
||||
// can be updated in place, includes a whole copy of Xcode.app
|
||||
case normal
|
||||
// from before the slim/normal split existed (version "develop")
|
||||
case legacy
|
||||
}
|
||||
|
||||
public let bundle: URL
|
||||
public let version: String
|
||||
public let flavor: Flavor
|
||||
|
||||
static func swiftPMDirectory(
|
||||
environment: [String: String] = ProcessInfo.processInfo.environment,
|
||||
homeDirectory: URL = FileManager.default.homeDirectoryForCurrentUser
|
||||
) throws -> URL {
|
||||
if let configurationDirectory = environment["XDG_CONFIG_HOME"] {
|
||||
guard (configurationDirectory as NSString).isAbsolutePath else {
|
||||
throw StringError("XDG_CONFIG_HOME must be an absolute path: '\(configurationDirectory)'")
|
||||
}
|
||||
return URL(fileURLWithPath: configurationDirectory, isDirectory: true)
|
||||
.appendingPathComponent("swiftpm", isDirectory: true)
|
||||
} else {
|
||||
return homeDirectory.appendingPathComponent(".swiftpm", isDirectory: true)
|
||||
}
|
||||
}
|
||||
|
||||
private static func swiftSDKsDirectory(
|
||||
environment: [String: String] = ProcessInfo.processInfo.environment,
|
||||
homeDirectory: URL = FileManager.default.homeDirectoryForCurrentUser
|
||||
) throws -> URL {
|
||||
try swiftPMDirectory(environment: environment, homeDirectory: homeDirectory)
|
||||
.appendingPathComponent("swift-sdks", isDirectory: true)
|
||||
}
|
||||
|
||||
public init?(bundle: URL) {
|
||||
self.bundle = bundle
|
||||
if let version = try? Data(contentsOf: bundle.appendingPathComponent("darwin-sdk-version.txt")) {
|
||||
self.version = String(decoding: version, as: UTF8.self)
|
||||
.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
} else if ["darwin.xtoolsdk", "darwin.artifactbundle"].contains(bundle.lastPathComponent) {
|
||||
self.version = "unknown"
|
||||
} else if ["darwin.xtoolsdk", "darwin.artifactbundle", "darwin.artifactbundle.tmp"].contains(bundle.lastPathComponent) {
|
||||
self.version = "develop"
|
||||
} else {
|
||||
return nil
|
||||
}
|
||||
|
||||
if version == "develop" {
|
||||
self.flavor = .legacy
|
||||
} else if bundle.appendingPathComponent("Xcode.app").dirExists {
|
||||
self.flavor = .normal
|
||||
} else {
|
||||
self.flavor = .slim
|
||||
}
|
||||
}
|
||||
|
||||
public static func install(from path: String) async throws {
|
||||
// we can't just move into ~/.swiftpm/swift-sdks because the swiftpm directory
|
||||
// location depends on factors like $XDG_CONFIG_HOME. Rather than replicating
|
||||
// SwiftPM's logic, which may change, it's more reliable to directly invoke
|
||||
// `swift sdk install`. See: https://github.com/xtool-org/xtool/pull/40
|
||||
|
||||
let url = URL(fileURLWithPath: path)
|
||||
guard DarwinSDK(bundle: url) != nil else { throw StringError("Invalid Darwin SDK at '\(path)'")}
|
||||
|
||||
try await addHostClangResourceDir(to: url)
|
||||
|
||||
try await Subprocess.run(
|
||||
.name("swift"),
|
||||
arguments: ["sdk", "install", url.path],
|
||||
output: .discarded
|
||||
)
|
||||
.checkSuccess()
|
||||
package static func prepareTemporaryBundle(
|
||||
environment: [String: String] = ProcessInfo.processInfo.environment,
|
||||
homeDirectory: URL = FileManager.default.homeDirectoryForCurrentUser
|
||||
) throws -> TemporaryBundle {
|
||||
let sdksDirectory = try swiftSDKsDirectory(environment: environment, homeDirectory: homeDirectory)
|
||||
try FileManager.default.createDirectory(at: sdksDirectory, withIntermediateDirectories: true)
|
||||
let bundle = sdksDirectory.appendingPathComponent("darwin.artifactbundle.tmp", isDirectory: true)
|
||||
if FileManager.default.fileExists(atPath: bundle.path) {
|
||||
try FileManager.default.removeItem(at: bundle)
|
||||
}
|
||||
return TemporaryBundle(url: bundle)
|
||||
}
|
||||
|
||||
private static func addHostClangResourceDir(to sdk: URL) async throws {
|
||||
let clangURL = try await ToolRegistry.locate("clang")
|
||||
struct SwiftTargetInfo: Decodable {
|
||||
struct Paths: Decodable {
|
||||
let runtimeResourcePath: String
|
||||
}
|
||||
let paths: Paths
|
||||
}
|
||||
|
||||
let process = try await Subprocess.run(
|
||||
.path(FilePath(clangURL.path)),
|
||||
arguments: ["-print-resource-dir"],
|
||||
output: .string(limit: .max)
|
||||
.path(try await BuildSettings.swiftcURL()),
|
||||
arguments: ["-print-target-info"],
|
||||
output: .data(limit: .max)
|
||||
).checkSuccess()
|
||||
let output = process.standardOutput ?? ""
|
||||
let hostClangResources = URL(filePath: output.trimmingCharacters(in: .whitespacesAndNewlines))
|
||||
let targetInfo = try JSONDecoder().decode(
|
||||
SwiftTargetInfo.self,
|
||||
from: process.standardOutput
|
||||
)
|
||||
let hostClangResources = URL(filePath: targetInfo.paths.runtimeResourcePath).appending(path: "clang")
|
||||
let hostInclude = hostClangResources.appending(path: "include")
|
||||
let sdkInclude = sdk.appending(path: "Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/clang/include")
|
||||
try await FileManager.default.copyItem(at: hostInclude, to: sdkInclude, preserveOwner: false)
|
||||
}
|
||||
|
||||
public static func current() async throws -> DarwinSDK? {
|
||||
let outputString: String
|
||||
do {
|
||||
outputString = try await Subprocess.run(
|
||||
.name("swift"),
|
||||
arguments: ["sdk", "configure", "darwin", "arm64-apple-ios", "--show-configuration"],
|
||||
output: .string(limit: .max)
|
||||
)
|
||||
.checkSuccess()
|
||||
.standardOutput
|
||||
?? ""
|
||||
} catch SubprocessFailure.exited {
|
||||
return nil
|
||||
}
|
||||
|
||||
// should be something like
|
||||
// swiftResourcesPath: /home/user/.swiftpm/swift-sdks/darwin.artifactbundle/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift
|
||||
// swiftlint:disable:previous line_length
|
||||
let resourcesPathPrefix = "swiftResourcesPath: "
|
||||
|
||||
guard let resourcesPath = outputString
|
||||
.split(separator: "\n")
|
||||
.first(where: { $0.hasPrefix(resourcesPathPrefix) })?
|
||||
.dropFirst(resourcesPathPrefix.count)
|
||||
else { return nil }
|
||||
|
||||
var resourcesURL = URL(fileURLWithPath: String(resourcesPath))
|
||||
for _ in 0..<6 {
|
||||
resourcesURL = resourcesURL.deletingLastPathComponent()
|
||||
}
|
||||
|
||||
return DarwinSDK(bundle: resourcesURL)
|
||||
public static func current() throws -> DarwinSDK? {
|
||||
let bundle = try swiftSDKsDirectory().appendingPathComponent("darwin.artifactbundle", isDirectory: true)
|
||||
guard bundle.dirExists else { return nil }
|
||||
return DarwinSDK(bundle: bundle)
|
||||
}
|
||||
|
||||
public func remove() throws {
|
||||
|
||||
@@ -22,6 +22,9 @@ public struct PackSchemaBase: Codable, Sendable {
|
||||
|
||||
public var extensions: [Extension]?
|
||||
|
||||
/// Skip auto-creating the LSP support file if it's missing.
|
||||
public var skipLSP: Bool?
|
||||
|
||||
public struct Extension: Codable, Sendable {
|
||||
public var product: String
|
||||
public var bundleID: String?
|
||||
|
||||
@@ -55,23 +55,24 @@ public struct Packer: Sendable {
|
||||
try Data().write(to: sources.appendingPathComponent("stub.c", isDirectory: false))
|
||||
}
|
||||
|
||||
let buildConfig = try await buildSettings.swiftPMInvocation(
|
||||
forTool: "build",
|
||||
arguments: [
|
||||
"--package-path", packageDir.path,
|
||||
"--scratch-path", ".build",
|
||||
// resolving can cause SwiftPM to overwrite the root package deps
|
||||
// with just the deps needed for the builder package (which is to
|
||||
// say, any "dev dependencies" of the root package may be removed.)
|
||||
// fortunately we've already resolved the root package by this point
|
||||
// in order to dump the plan, so we can skip resolution here to skirt
|
||||
// the issue.
|
||||
"--disable-automatic-resolution",
|
||||
]
|
||||
)
|
||||
let buildConfig = try await buildSettings
|
||||
.withPackagePath(packageDir.path)
|
||||
.swiftPMInvocation(
|
||||
forTool: "build",
|
||||
arguments: [
|
||||
"--scratch-path", ".build",
|
||||
// resolving can cause SwiftPM to overwrite the root package deps
|
||||
// with just the deps needed for the builder package (which is to
|
||||
// say, any "dev dependencies" of the root package may be removed.)
|
||||
// fortunately we've already resolved the root package by this point
|
||||
// in order to dump the plan, so we can skip resolution here to skirt
|
||||
// the issue.
|
||||
"--disable-automatic-resolution",
|
||||
],
|
||||
)
|
||||
try await Subprocess.run(
|
||||
buildConfig,
|
||||
output: .currentStandardError,
|
||||
output: .currentStandardOutput,
|
||||
error: .currentStandardError,
|
||||
)
|
||||
.checkSuccess()
|
||||
@@ -84,8 +85,16 @@ public struct Packer: Sendable {
|
||||
|
||||
let outputURL = output.url
|
||||
|
||||
let binPath: String
|
||||
switch buildSettings.buildSystem {
|
||||
case .swiftPM:
|
||||
binPath = "\(buildSettings.triple)/\(buildSettings.configuration.rawValue)"
|
||||
case .swiftBuild:
|
||||
let platformName = buildSettings.triple.contains("simulator") ? "iphonesimulator" : "iphoneos"
|
||||
binPath = "out/Products/\(buildSettings.configuration.swiftBuildValue)-\(platformName)"
|
||||
}
|
||||
let binDir = URL(
|
||||
fileURLWithPath: ".build/\(buildSettings.triple)/\(buildSettings.configuration.rawValue)",
|
||||
fileURLWithPath: ".build/\(binPath)",
|
||||
isDirectory: true
|
||||
)
|
||||
|
||||
@@ -184,7 +193,7 @@ public struct Packer: Sendable {
|
||||
if product.type == .application {
|
||||
info["UIRequiredDeviceCapabilities"] = ["arm64"]
|
||||
info["LSRequiresIPhoneOS"] = true
|
||||
info["CFBundleSupportedPlatforms"] = ["iPhoneOS"]
|
||||
info["CFBundleSupportedPlatforms"] = Packer.cfBundleSupportedPlatforms(for: buildSettings.triple)
|
||||
}
|
||||
|
||||
if let iconPath = product.iconPath {
|
||||
@@ -201,6 +210,26 @@ public struct Packer: Sendable {
|
||||
try encodedPlist.write(to: infoPath)
|
||||
}
|
||||
}
|
||||
|
||||
static func cfBundleSupportedPlatforms(for triple: String) -> [String] {
|
||||
let components = triple.split(separator: "-").map(String.init)
|
||||
guard let appleIndex = components.firstIndex(of: "apple"),
|
||||
components.indices.contains(appleIndex + 1) else {
|
||||
return ["iPhoneOS"]
|
||||
}
|
||||
|
||||
let os = components[appleIndex + 1].prefix { !$0.isNumber }
|
||||
switch os {
|
||||
case "ios" where components.contains("simulator"):
|
||||
return ["iPhoneSimulator"]
|
||||
case "ios":
|
||||
return ["iPhoneOS"]
|
||||
case "macos", "macosx":
|
||||
return ["MacOSX"]
|
||||
default:
|
||||
return ["iPhoneOS"]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extension Plan.Product {
|
||||
|
||||
@@ -137,6 +137,10 @@ public struct Planner: Sendable {
|
||||
throw StringError("Could not find target '\(targetName)' in package '\(targetPackage.name)'")
|
||||
}
|
||||
guard visited.insert(targetName).inserted else { continue }
|
||||
// Macro targets are compiler plugins that run on the host, not code
|
||||
// linked into the iOS app. Skip them to avoid resolving their
|
||||
// host-only dependencies (e.g. SwiftSyntaxMacros).
|
||||
if target.type == "macro" { continue }
|
||||
if target.moduleType == "BinaryTarget" {
|
||||
resources.append(.binaryTarget(name: targetName))
|
||||
}
|
||||
@@ -244,10 +248,9 @@ public struct Planner: Sendable {
|
||||
}
|
||||
|
||||
private func _dumpAction(arguments: [String], path: String) async throws -> Data {
|
||||
let dumpConfig = try await buildSettings.swiftPMInvocation(
|
||||
let dumpConfig = try await buildSettings.withPackagePath(path).swiftPMInvocation(
|
||||
forTool: "package",
|
||||
arguments: arguments,
|
||||
packagePathOverride: path
|
||||
)
|
||||
return try await Subprocess.run(
|
||||
dumpConfig,
|
||||
@@ -409,6 +412,7 @@ private struct PackageDump: Decodable {
|
||||
struct Target: Decodable {
|
||||
let name: String
|
||||
let moduleType: String
|
||||
let type: String?
|
||||
let productDependencies: [String]?
|
||||
let targetDependencies: [String]?
|
||||
let resources: [Resource]?
|
||||
|
||||
@@ -0,0 +1,92 @@
|
||||
import Subprocess
|
||||
import XUtils
|
||||
|
||||
public struct SwiftVersion: Sendable, Comparable, Hashable {
|
||||
public var major: Int
|
||||
public var minor: Int
|
||||
public var patch: Int
|
||||
|
||||
public init(_ major: Int, _ minor: Int, _ patch: Int = 0) {
|
||||
self.major = major
|
||||
self.minor = minor
|
||||
self.patch = patch
|
||||
}
|
||||
|
||||
public static func < (lhs: Self, rhs: Self) -> Bool {
|
||||
lhs.tuple < rhs.tuple
|
||||
}
|
||||
|
||||
fileprivate var tuple: (Int, Int, Int) {
|
||||
(major, minor, patch)
|
||||
}
|
||||
}
|
||||
|
||||
extension SwiftVersion {
|
||||
public var supportsSwiftBuild: Bool {
|
||||
self >= SwiftVersion(6, 4)
|
||||
}
|
||||
}
|
||||
|
||||
extension SwiftVersion: LosslessStringConvertible, CustomStringConvertible {
|
||||
public var description: String {
|
||||
"\(major).\(minor).\(patch)"
|
||||
}
|
||||
|
||||
public init?(_ description: String) {
|
||||
// inverse of https://github.com/swiftlang/swift/blob/896191b38/lib/Basic/Version.cpp#L266
|
||||
|
||||
var output = description[...]
|
||||
if output.hasPrefix("Apple ") {
|
||||
output = output.dropFirst("Apple ".count)
|
||||
}
|
||||
if output.hasPrefix("Swift version ") {
|
||||
output = output.dropFirst("Swift version ".count)
|
||||
output = output.prefix { !$0.isWhitespace }
|
||||
}
|
||||
let isDev = output.hasSuffix("-dev")
|
||||
if isDev { output = output.dropLast("-dev".count) }
|
||||
|
||||
let parts = output.split(separator: ".")
|
||||
var numericParts = parts.compactMap { Int($0) }
|
||||
guard parts.count == numericParts.count else {
|
||||
return nil
|
||||
}
|
||||
|
||||
switch numericParts.count {
|
||||
case 2: numericParts.append(0)
|
||||
case 3: break
|
||||
default: return nil
|
||||
}
|
||||
|
||||
self.init(numericParts[0], numericParts[1], numericParts[2])
|
||||
}
|
||||
}
|
||||
|
||||
extension SwiftVersion {
|
||||
private static let cached = Task<Self, Error> {
|
||||
let outputString: String?
|
||||
do {
|
||||
outputString = try await Subprocess.run(
|
||||
.path(try await BuildSettings.swiftURL()),
|
||||
arguments: ["--version"],
|
||||
output: .string(limit: .max)
|
||||
)
|
||||
.checkSuccess()
|
||||
.standardOutput
|
||||
} catch {
|
||||
throw StringError("Failed to obtain Swift version")
|
||||
}
|
||||
|
||||
let output = outputString ?? ""
|
||||
guard let version = Self(output) else {
|
||||
throw StringError("Could not parse Swift version: '\(output)'")
|
||||
}
|
||||
return version
|
||||
}
|
||||
|
||||
public static var current: Self {
|
||||
get async throws {
|
||||
try await cached.value
|
||||
}
|
||||
}
|
||||
}
|
||||
+246
-118
@@ -1,10 +1,5 @@
|
||||
#if os(macOS)
|
||||
import Foundation
|
||||
import PathKit
|
||||
import Version
|
||||
import ProjectSpec
|
||||
import XcodeGenKit
|
||||
import XcodeProj
|
||||
import XcodeProjects
|
||||
|
||||
public struct XcodePacker {
|
||||
public var plan: Plan
|
||||
@@ -14,151 +9,284 @@ public struct XcodePacker {
|
||||
}
|
||||
|
||||
// swiftlint:disable:next function_body_length
|
||||
public func createProject() async throws -> URL {
|
||||
let xtoolDir: Path = "xtool"
|
||||
public func createProject(
|
||||
at root: URL = URL(fileURLWithPath: FileManager.default.currentDirectoryPath, isDirectory: true)
|
||||
) async throws -> URL {
|
||||
let xtoolDir = root.appendingPathComponent("xtool", isDirectory: true)
|
||||
let projectDir = xtoolDir.appendingPathComponent(".xtool-tmp", isDirectory: true)
|
||||
try? FileManager.default.removeItem(at: projectDir)
|
||||
try FileManager.default.createDirectory(at: projectDir, withIntermediateDirectories: true)
|
||||
|
||||
let projectDir: Path = xtoolDir + ".xtool-tmp"
|
||||
try? xtoolDir.delete()
|
||||
try projectDir.mkpath()
|
||||
let fromProjectToRoot = "../.."
|
||||
|
||||
let fromProjectToRoot = try Path(".").relativePath(from: projectDir)
|
||||
|
||||
guard let deploymentTarget = Version(tolerant: plan.app.deploymentTarget) else {
|
||||
throw StringError("Could not parse deployment target '\(plan.app.deploymentTarget)'")
|
||||
let emptyText = Data("// leave this file empty".utf8)
|
||||
let products = plan.allProducts
|
||||
let targetIDs = products.map {
|
||||
XCSchema.ObjectID("xtool:\($0.product)")
|
||||
}
|
||||
let sourcePhase = XCSchema.BuildPhase.sources(.init(objectID: nil, name: nil))
|
||||
let frameworksPhase = XCSchema.BuildPhase.frameworks(.init(objectID: nil, name: nil))
|
||||
|
||||
let emptyText = Data("""
|
||||
// leave this file empty
|
||||
""".utf8)
|
||||
var groups: [XCSchema.Reference] = []
|
||||
var productFiles: [XCSchema.Reference] = []
|
||||
var targets: [XCSchema.Target] = []
|
||||
|
||||
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"
|
||||
for (index, product) in products.enumerated() {
|
||||
let productDir = projectDir.appendingPathComponent(product.product, isDirectory: true)
|
||||
try FileManager.default.createDirectory(at: productDir, withIntermediateDirectories: true)
|
||||
try emptyText.write(to: productDir.appendingPathComponent("empty.c"))
|
||||
|
||||
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
|
||||
|
||||
if let iconPath = product.iconPath {
|
||||
plist["CFBundleIconFile"] = URL(fileURLWithPath: iconPath).deletingPathExtension().lastPathComponent
|
||||
}
|
||||
let encodedPlist = try PropertyListSerialization.data(fromPropertyList: plist, format: .xml, options: 0)
|
||||
try infoPath.write(encodedPlist)
|
||||
try encodedPlist.write(to: productDir.appendingPathComponent("Info.plist"))
|
||||
|
||||
var buildSettings: [String: BuildSetting] = [
|
||||
var buildSettings: [String: XCSchema.BuildSetting] = [
|
||||
"PRODUCT_BUNDLE_IDENTIFIER": .string(product.bundleID),
|
||||
"TARGETED_DEVICE_FAMILY": .string(families.map { "\($0)" }.joined(separator: ",")),
|
||||
"PRODUCT_NAME": .string(product.targetName),
|
||||
"TARGETED_DEVICE_FAMILY": .string(families.map(String.init).joined(separator: ",")),
|
||||
"IPHONEOS_DEPLOYMENT_TARGET": .string(product.deploymentTarget),
|
||||
"INFOPLIST_FILE": .string("\(product.product)/Info.plist"),
|
||||
"LD_RUNPATH_SEARCH_PATHS": .array(["$(inherited)", "@executable_path/Frameworks"]),
|
||||
]
|
||||
|
||||
if product.type == .appExtension {
|
||||
buildSettings["APPLICATION_EXTENSION_API_ONLY"] = true
|
||||
buildSettings["APPLICATION_EXTENSION_API_ONLY"] = .string("YES")
|
||||
buildSettings["LD_RUNPATH_SEARCH_PATHS"] = .array([
|
||||
"$(inherited)", "@executable_path/Frameworks", "@executable_path/../../Frameworks",
|
||||
])
|
||||
}
|
||||
|
||||
if let entitlementsPath = product.entitlementsPath {
|
||||
buildSettings["CODE_SIGN_ENTITLEMENTS"] = .string((fromProjectToRoot + Path(entitlementsPath)).string)
|
||||
let path = (entitlementsPath as NSString).isAbsolutePath
|
||||
? entitlementsPath
|
||||
: (fromProjectToRoot as NSString).appendingPathComponent(entitlementsPath)
|
||||
buildSettings["CODE_SIGN_ENTITLEMENTS"] = .string(path)
|
||||
}
|
||||
|
||||
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
|
||||
let source = XCSchema.FileReference(
|
||||
objectID: nil,
|
||||
path: "empty.c",
|
||||
explicitFileType: nil,
|
||||
expectedSignature: nil,
|
||||
textEncoding: nil,
|
||||
lineEnding: nil,
|
||||
includeInIndex: nil,
|
||||
buildFiles: [.init(
|
||||
objectID: nil,
|
||||
buildPhase: .named(
|
||||
target: .init(targetName: product.targetName),
|
||||
kind: .sources,
|
||||
name: nil
|
||||
),
|
||||
],
|
||||
dependencies: [
|
||||
Dependency(
|
||||
type: .package(products: [product.product]),
|
||||
reference: "RootPackage"
|
||||
),
|
||||
] + additionalDependencies,
|
||||
info: Plist(
|
||||
path: try infoPath.relativePath(from: projectDir).string,
|
||||
attributes: [:]
|
||||
)
|
||||
properties: buildFileProperties(),
|
||||
)],
|
||||
)
|
||||
let info = XCSchema.FileReference(
|
||||
objectID: nil,
|
||||
path: "Info.plist",
|
||||
explicitFileType: nil,
|
||||
expectedSignature: nil,
|
||||
textEncoding: nil,
|
||||
lineEnding: nil,
|
||||
includeInIndex: nil,
|
||||
buildFiles: [],
|
||||
)
|
||||
let resources = try resourceReferences(for: product, at: root)
|
||||
groups.append(.group(.init(
|
||||
objectID: nil,
|
||||
name: product.product,
|
||||
path: try .init(base: .group, path: product.product),
|
||||
includeInIndex: nil,
|
||||
children: [.fileReference(source), .fileReference(info)] + resources,
|
||||
)))
|
||||
|
||||
let productFilename = "\(product.targetName).\(product.type == .application ? "app" : "appex")"
|
||||
let productFile = XCSchema.FileReference(
|
||||
objectID: nil,
|
||||
path: try .init(base: .buildProducts, path: productFilename),
|
||||
explicitFileType: .init(fileTypeID: product.type == .application ? "wrapper.application" : "wrapper.app-extension"),
|
||||
expectedSignature: nil,
|
||||
textEncoding: nil,
|
||||
lineEnding: nil,
|
||||
includeInIndex: false,
|
||||
buildFiles: index == 0 ? [] : [.init(
|
||||
objectID: nil,
|
||||
buildPhase: .named(
|
||||
target: .init(targetName: plan.app.targetName),
|
||||
kind: .copy,
|
||||
name: "Embed App Extensions",
|
||||
),
|
||||
properties: buildFileProperties(removeHeadersOnCopy: true),
|
||||
)],
|
||||
)
|
||||
productFiles.append(.fileReference(productFile))
|
||||
|
||||
let packageProduct = XCSchema.SwiftPackageProductReference(
|
||||
objectID: nil,
|
||||
package: nil,
|
||||
productName: product.product,
|
||||
productType: .other,
|
||||
)
|
||||
let packageMember = XCSchema.SwiftPackageProductTargetMember(
|
||||
packageProduct: packageProduct,
|
||||
buildFile: .init(
|
||||
objectID: nil,
|
||||
buildPhase: .named(kind: .frameworks, name: nil),
|
||||
properties: buildFileProperties(),
|
||||
),
|
||||
)
|
||||
var phases = [sourcePhase, frameworksPhase]
|
||||
if !resources.isEmpty {
|
||||
phases.append(.copy(.init(
|
||||
objectID: nil,
|
||||
name: "Copy Root Resources",
|
||||
bundleBasePath: .resourcesDir,
|
||||
relativePath: "",
|
||||
scope: .always,
|
||||
)))
|
||||
}
|
||||
if index == 0 && !plan.extensions.isEmpty {
|
||||
phases.append(.copy(.init(
|
||||
objectID: nil,
|
||||
name: "Embed App Extensions",
|
||||
bundleBasePath: .plugInsDir,
|
||||
relativePath: "",
|
||||
scope: .always,
|
||||
)))
|
||||
}
|
||||
let dependencies: [XCSchema.TargetDependency] = index == 0
|
||||
? plan.extensions.map {
|
||||
.localTarget(XCSchema.LocalTargetReference(targetName: $0.targetName), [])
|
||||
}
|
||||
: []
|
||||
targets.append(.native(XCSchema.CommonTargetProperties(
|
||||
name: product.targetName,
|
||||
objectID: targetIDs[index],
|
||||
configurationListDebugID: nil,
|
||||
dependencies: dependencies,
|
||||
buildPhases: phases,
|
||||
buildRules: [],
|
||||
specializedConfigurations: [],
|
||||
buildSettings: buildSettings,
|
||||
product: .namePath(.init(components: [.child("Products"), .child(productFilename)])),
|
||||
productTypeID: XCSchema.ProductTypeID(
|
||||
abbreviatedRepresentation: product.type == .application
|
||||
? "application"
|
||||
: "app-extension"
|
||||
),
|
||||
testHostTarget: nil,
|
||||
legacyProvisioningStyle: nil,
|
||||
legacyTeamID: nil,
|
||||
lastSwiftUpdateCheck: nil,
|
||||
lastSwiftMigration: nil,
|
||||
packageProductTargetMembers: [packageMember],
|
||||
)))
|
||||
}
|
||||
|
||||
let project = Project(
|
||||
name: plan.app.targetName,
|
||||
targets: targets,
|
||||
packages: [
|
||||
"RootPackage": .local(
|
||||
path: fromProjectToRoot.string,
|
||||
group: nil,
|
||||
excludeFromProject: false
|
||||
),
|
||||
let schema = XCSchema.Project(
|
||||
objectID: nil,
|
||||
rootGroupDebugID: nil,
|
||||
configurationListDebugID: nil,
|
||||
topLevelReferences: groups + [
|
||||
.group(XCSchema.Group(
|
||||
objectID: nil,
|
||||
name: "Products",
|
||||
path: "",
|
||||
includeInIndex: nil,
|
||||
children: productFiles,
|
||||
))
|
||||
],
|
||||
options: SpecOptions(
|
||||
localPackagesGroup: ""
|
||||
)
|
||||
packages: [.init(location: .local(.init(path: fromProjectToRoot)), traits: [])],
|
||||
configurations: ["Debug", "Release"].map {
|
||||
.init(name: .init(name: $0), file: nil, objectID: nil)
|
||||
},
|
||||
buildSettings: ["SDKROOT": .string("iphoneos")],
|
||||
defaultConfigurationName: .init(name: "Debug"),
|
||||
targets: targets,
|
||||
localizationInfo: .init(development: .init(languageID: "en"), supported: []),
|
||||
requiredCapabilities: [],
|
||||
buildIndependentTargetsInParallel: true,
|
||||
lastUpgradeCheck: nil,
|
||||
lastSwiftUpdateCheck: nil,
|
||||
lastSwiftMigration: nil,
|
||||
organizationName: nil,
|
||||
classPrefix: nil,
|
||||
productsGroup: .namePath(.init(components: [.child("Products")])),
|
||||
importedProducts: [],
|
||||
)
|
||||
|
||||
// TODO: Handle plan.resources of type .root
|
||||
// TODO: Handle plan.iconPath
|
||||
let project = XcodeProject(project: schema)
|
||||
let projectURL = projectDir.appending(path: "\(plan.app.product).xcodeproj")
|
||||
try project.write(to: projectURL)
|
||||
|
||||
let generator = ProjectGenerator(project: project)
|
||||
let xcodeproj = projectDir + "\(plan.app.product).xcodeproj"
|
||||
let xcworkspace = xtoolDir + "\(plan.app.product).xcworkspace"
|
||||
do {
|
||||
let current = Path.current
|
||||
Path.current = xcodeproj.parent()
|
||||
defer { Path.current = current }
|
||||
let xcodeProject = try generator.generateXcodeProject(userName: NSUserName())
|
||||
if let packageRef = xcodeProject.pbxproj.fileReferences.first(where: { $0.name == ".." }) {
|
||||
for group in xcodeProject.pbxproj.groups {
|
||||
group.children.removeAll(where: { $0.uuid == packageRef.uuid })
|
||||
}
|
||||
xcodeProject.pbxproj.delete(object: packageRef)
|
||||
}
|
||||
let workspace = XcodeWorkspace(children: [
|
||||
.file(XcodeWorkspace.Location(base: .container, path: "..")),
|
||||
.file(XcodeWorkspace.Location(base: .group, path: ".xtool-tmp/\(projectURL.lastPathComponent)"))
|
||||
])
|
||||
let workspaceURL = xtoolDir.appending(path: "\(plan.app.product).xcworkspace")
|
||||
try workspace.write(to: workspaceURL)
|
||||
return workspaceURL
|
||||
}
|
||||
|
||||
try xcodeProject.write(path: Path(xcodeproj.lastComponent))
|
||||
private func resourceReferences(for product: Plan.Product, at root: URL) throws -> [XCSchema.Reference] {
|
||||
var paths = product.resources.compactMap { resource -> String? in
|
||||
guard case .root(let source) = resource else { return nil }
|
||||
return source
|
||||
}
|
||||
if let iconPath = product.iconPath {
|
||||
paths.append(iconPath)
|
||||
}
|
||||
|
||||
do {
|
||||
let current = Path.current
|
||||
Path.current = xcworkspace.parent()
|
||||
defer { Path.current = current }
|
||||
var visited: Set<String> = []
|
||||
return try paths.compactMap { path in
|
||||
let url = URL(fileURLWithPath: path, relativeTo: root).standardizedFileURL
|
||||
guard visited.insert(url.path).inserted else { return nil }
|
||||
let isAbsolute = (path as NSString).isAbsolutePath
|
||||
let referencePath = isAbsolute ? path : ("../.." as NSString).appendingPathComponent(path)
|
||||
var isDirectory: ObjCBool = false
|
||||
_ = FileManager.default.fileExists(atPath: url.path, isDirectory: &isDirectory)
|
||||
|
||||
let xcworkspaceDirectory = xcworkspace.parent()
|
||||
let fromWorkspaceToSelf = try Path(".").relativePath(from: xcworkspaceDirectory).withName()
|
||||
let fromWorkspaceToProject = try xcodeproj.relativePath(from: xcworkspaceDirectory).withName()
|
||||
let workspace = XCWorkspace(data: .init(children: [
|
||||
.file(.init(location: .container(fromWorkspaceToSelf.string))),
|
||||
.file(.init(location: .group(fromWorkspaceToProject.string))),
|
||||
]))
|
||||
try workspace.write(path: Path(xcworkspace.lastComponent))
|
||||
return .fileReference(.init(
|
||||
objectID: nil,
|
||||
path: try .init(base: isAbsolute ? .absolute : .project, path: referencePath),
|
||||
explicitFileType: isDirectory.boolValue ? .init(fileTypeID: "folder") : nil,
|
||||
expectedSignature: nil,
|
||||
textEncoding: nil,
|
||||
lineEnding: nil,
|
||||
includeInIndex: nil,
|
||||
buildFiles: [.init(
|
||||
objectID: nil,
|
||||
buildPhase: .named(
|
||||
target: .init(targetName: product.targetName),
|
||||
kind: .copy,
|
||||
name: "Copy Root Resources",
|
||||
),
|
||||
properties: buildFileProperties(),
|
||||
)],
|
||||
))
|
||||
}
|
||||
}
|
||||
|
||||
return xcworkspace.url
|
||||
private func buildFileProperties(removeHeadersOnCopy: Bool = false) -> XCSchema.BuildFileProperties {
|
||||
XCSchema.BuildFileProperties(
|
||||
platformFilters: [],
|
||||
additionalBuildFlags: nil,
|
||||
assetTags: [],
|
||||
attributes: XCSchema.BuildFileAttributes(
|
||||
headerRole: nil,
|
||||
machInterfaceGeneration: nil,
|
||||
isWeak: false,
|
||||
codeSignOnCopy: false,
|
||||
codeGeneration: .default,
|
||||
headerPreservation: removeHeadersOnCopy ? .removeOnCopy : .keep,
|
||||
decompress: false,
|
||||
codeGenerationVisibility: nil,
|
||||
),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
extension Path {
|
||||
fileprivate func withName() -> Path {
|
||||
// eg if curr dir is Foo, this converts "." to "../Foo"
|
||||
// which includes the name in the path, and therefore
|
||||
// in the Xcode navigator
|
||||
self.parent() + self.absolute().lastComponent
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
+3
-2
@@ -100,8 +100,9 @@ public struct DeveloperServicesFetchCertificateOperation: DeveloperServicesOpera
|
||||
return try await self.replaceCertificates(certificates, requireConfirmation: true)
|
||||
}
|
||||
|
||||
let knownSerialNumber = signingInfo.certificate.serialNumber()
|
||||
guard let certificate = certificates.first(where: { $0.attributes?.serialNumber == knownSerialNumber }) else {
|
||||
guard let certificate = certificates.first(where: {
|
||||
$0.attributes?.serialNumber.map(signingInfo.certificate.hasSerialNumber) == true
|
||||
}) else {
|
||||
// we need to revoke existing certs, otherwise it doesn't always let us make a new one
|
||||
return try await self.replaceCertificates(certificates, requireConfirmation: true)
|
||||
}
|
||||
|
||||
@@ -54,7 +54,6 @@ public struct DeveloperServicesClient: Sendable {
|
||||
}
|
||||
}
|
||||
|
||||
@Dependency(\.deviceInfoProvider) var deviceInfoProvider
|
||||
@Dependency(\.anisetteDataProvider) var anisetteDataProvider
|
||||
@Dependency(\.httpClient) var httpClient
|
||||
|
||||
@@ -76,8 +75,6 @@ public struct DeveloperServicesClient: Sendable {
|
||||
throw Error.malformedRequest
|
||||
}
|
||||
|
||||
let deviceInfo = try deviceInfoProvider.fetch()
|
||||
|
||||
var httpRequest = HTTPRequest(method: .post, url: url)
|
||||
let acceptedLanguages = Locale.preferredLanguages.joined(separator: ", ")
|
||||
|
||||
@@ -88,8 +85,6 @@ public struct DeveloperServicesClient: Sendable {
|
||||
request.methodOverride.map { httpRequest.headerFields[.init("X-HTTP-Method-Override")!] = $0 }
|
||||
|
||||
httpRequest.headerFields[.init(DeviceInfo.xcodeVersionKey)!] = DeviceInfo.xcodeVersion
|
||||
httpRequest.headerFields[.init(DeviceInfo.clientInfoKey)!] = deviceInfo.clientInfo.clientString
|
||||
httpRequest.headerFields[.init(DeviceInfo.deviceIDKey)!] = deviceInfo.deviceID
|
||||
|
||||
httpRequest.headerFields[.init("X-Apple-I-Identity-Id")!] = loginToken.adsid
|
||||
httpRequest.headerFields[.init("X-Apple-App-Info")!] = AppTokenKey.xcode.rawValue
|
||||
@@ -103,8 +98,6 @@ public struct DeveloperServicesClient: Sendable {
|
||||
|
||||
let (_, data) = try await httpClient.makeRequest(httpRequest, body: body)
|
||||
|
||||
// String(data: data, encoding: .utf8).map { print("\(url): \($0)") }
|
||||
|
||||
let decoded: R.Response = try request.apiVersion.decode(response: data)
|
||||
|
||||
return try await request.parse(decoded)
|
||||
|
||||
@@ -105,7 +105,6 @@ public struct XcodeAuthData: Sendable {
|
||||
}
|
||||
|
||||
public struct DeveloperAPIXcodeAuthMiddleware: ClientMiddleware {
|
||||
@Dependency(\.deviceInfoProvider) private var deviceInfoProvider
|
||||
@Dependency(\.anisetteDataProvider) private var anisetteDataProvider
|
||||
|
||||
public var authData: XcodeAuthData
|
||||
@@ -130,7 +129,7 @@ public struct DeveloperAPIXcodeAuthMiddleware: ClientMiddleware {
|
||||
) async throws -> (HTTPResponse, HTTPBody?) {
|
||||
var request = request
|
||||
|
||||
let deviceInfo = try deviceInfoProvider.fetch()
|
||||
let anisetteData = try await anisetteDataProvider.fetchAnisetteData()
|
||||
|
||||
// General
|
||||
request.headerFields[.acceptLanguage] = Locale.preferredLanguages.joined(separator: ", ")
|
||||
@@ -142,17 +141,12 @@ public struct DeveloperAPIXcodeAuthMiddleware: ClientMiddleware {
|
||||
request.headerFields[.userAgent] = "Xcode"
|
||||
request.headerFields[.init(DeviceInfo.xcodeVersionKey)!] = DeviceInfo.xcodeVersion
|
||||
|
||||
// MobileMe identity
|
||||
request.headerFields[.init(DeviceInfo.clientInfoKey)!] = deviceInfo.clientInfo.clientString
|
||||
request.headerFields[.init(DeviceInfo.deviceIDKey)!] = deviceInfo.deviceID
|
||||
|
||||
// GrandSlam authentication
|
||||
request.headerFields[.init("X-Apple-App-Info")!] = AppTokenKey.xcode.rawValue
|
||||
request.headerFields[.init("X-Apple-I-Identity-Id")!] = authData.loginToken.adsid
|
||||
request.headerFields[.init("X-Apple-GS-Token")!] = authData.loginToken.token
|
||||
|
||||
// Anisette
|
||||
let anisetteData = try await anisetteDataProvider.fetchAnisetteData()
|
||||
for (key, value) in anisetteData.dictionary {
|
||||
request.headerFields[.init(key)!] = value
|
||||
}
|
||||
|
||||
+10
-7
@@ -61,13 +61,16 @@ public struct DeveloperServicesFetchProfileOperation: DeveloperServicesOperation
|
||||
break
|
||||
}
|
||||
|
||||
let serialNumber = signingInfo.certificate.serialNumber()
|
||||
let certs = try await context.developerAPIClient.certificatesGetCollection(
|
||||
query: .init(
|
||||
filter_lbrack_serialNumber_rbrack_: [serialNumber]
|
||||
)
|
||||
)
|
||||
.ok.body.json.data
|
||||
// Match locally rather than with filter[serialNumber]: the API lists serials with a
|
||||
// leading zero nibble ("0E41…") but its filter only matches them without it ("E41…").
|
||||
let certs = try await DeveloperAPIPages {
|
||||
try await context.developerAPIClient.certificatesGetCollection().ok.body.json
|
||||
} next: {
|
||||
$0.links.next
|
||||
}
|
||||
.map(\.data)
|
||||
.reduce(into: [], +=)
|
||||
.filter { $0.attributes?.serialNumber.map(signingInfo.certificate.hasSerialNumber) == true }
|
||||
|
||||
let allDevices = try await context.developerAPIClient.devicesGetCollection()
|
||||
.ok.body.json.data
|
||||
|
||||
@@ -18,15 +18,6 @@ public protocol RawADIProvider: Sendable {
|
||||
) async throws -> (machineID: Data, otp: Data)
|
||||
}
|
||||
|
||||
extension RawADIProvider {
|
||||
public func clientInfo() async throws -> String {
|
||||
// Looks like Apple detects attempts to use a macOS client string on Windows :/
|
||||
"""
|
||||
<PC> <Windows;6.2(0,0);9200> <com.apple.AuthKitWin/1 (com.apple.iCloud/7.21)>
|
||||
"""
|
||||
}
|
||||
}
|
||||
|
||||
private struct UnimplementedRawADIProvider: RawADIProvider {
|
||||
func startProvisioning(
|
||||
spim: Data,
|
||||
@@ -44,17 +35,16 @@ private struct UnimplementedRawADIProvider: RawADIProvider {
|
||||
let closure: (UUID, inout UInt64, Data) async throws -> (Data, Data) = unimplemented()
|
||||
return try await closure(userID, &routingInfo, provisioningInfo)
|
||||
}
|
||||
|
||||
func clientInfo() async throws -> String {
|
||||
let closure: () async throws -> String = unimplemented()
|
||||
return try await closure()
|
||||
}
|
||||
}
|
||||
|
||||
private enum RawADIProviderDependencyKey: DependencyKey {
|
||||
static let testValue: RawADIProvider = UnimplementedRawADIProvider()
|
||||
static let liveValue: RawADIProvider = {
|
||||
#if canImport(XADI)
|
||||
return XADIProvider()
|
||||
#else
|
||||
return OmnisetteADIProvider()
|
||||
#endif
|
||||
}()
|
||||
static let liveValue: RawADIProvider = OmnisetteADIProvider()
|
||||
}
|
||||
|
||||
extension DependencyValues {
|
||||
@@ -92,13 +82,10 @@ public struct ADIDataProvider: AnisetteDataProvider {
|
||||
|
||||
private let _clientInfo = LockIsolated<String?>(nil)
|
||||
|
||||
public init(provisioningData: ProvisioningData? = nil) {
|
||||
public init() {
|
||||
@Dependency(\.keyValueStorage) var storage
|
||||
if let provisioningData {
|
||||
self.localUserUID = provisioningData.localUserUID
|
||||
try? storage.setData(provisioningData.adiPb, forKey: Self.provisioningKey)
|
||||
try? storage.setString("\(provisioningData.routingInfo)", forKey: Self.routingInfoKey)
|
||||
} else if let localUserUIDString = try? storage.string(forKey: Self.localUserUIDKey),
|
||||
|
||||
if let localUserUIDString = try? storage.string(forKey: Self.localUserUIDKey),
|
||||
let localUserUID = UUID(uuidString: localUserUIDString) {
|
||||
self.localUserUID = localUserUID
|
||||
} else {
|
||||
@@ -110,9 +97,15 @@ public struct ADIDataProvider: AnisetteDataProvider {
|
||||
self.localUserID = SHA256.hash(data: Data(localUserUID.uuidString.utf8))
|
||||
.map { String(format: "%02X", $0) }
|
||||
.joined()
|
||||
|
||||
if (try? storage.string(forKey: Self.providerIDKey)) != Self.providerID {
|
||||
self.resetProvisioning()
|
||||
try? storage.setString(Self.providerID, forKey: Self.providerIDKey)
|
||||
}
|
||||
}
|
||||
|
||||
private static let localUserUIDKey = "XTLLocalUserUID"
|
||||
private static let providerIDKey = "XTLADIProviderID"
|
||||
private static let provisioningKey = "XTLProvisioningInfo"
|
||||
private static let routingInfoKey = "XTLRoutingInfo"
|
||||
|
||||
@@ -176,15 +169,12 @@ public struct ADIDataProvider: AnisetteDataProvider {
|
||||
]
|
||||
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
|
||||
// request.headers[DeviceInfo.clientInfoKey] = self.deviceInfo.clientInfo.clientString
|
||||
// self.deviceInfo.dictionary.forEach { request.headers[$0] = $1 }
|
||||
for (key, value) in try await deviceInfo().dictionary {
|
||||
request.headerFields[.init(key)!] = value
|
||||
}
|
||||
|
||||
let (_, response) = try await self.httpClient.makeRequest(request, body: body)
|
||||
|
||||
// print(String(data: response, encoding: .utf8) ?? "<no utf8 data>")
|
||||
|
||||
return try GrandSlamOperationDecoder<Response>.decode(data: response)
|
||||
}
|
||||
|
||||
@@ -236,7 +226,7 @@ public struct ADIDataProvider: AnisetteDataProvider {
|
||||
machineID: mid.base64EncodedString(),
|
||||
localUserID: self.localUserID,
|
||||
oneTimePassword: otp.base64EncodedString(),
|
||||
deviceID: self.localUserUID.uuidString
|
||||
deviceInfo: try await deviceInfo(),
|
||||
)
|
||||
}
|
||||
|
||||
@@ -245,6 +235,12 @@ public struct ADIDataProvider: AnisetteDataProvider {
|
||||
try? storage.setString(nil, forKey: Self.routingInfoKey)
|
||||
}
|
||||
|
||||
private static var providerID: String? {
|
||||
"mac-omnisette"
|
||||
}
|
||||
|
||||
public var providerID: String? { Self.providerID }
|
||||
|
||||
public func provisioningData() -> ProvisioningData? {
|
||||
guard let provisioningInfo = try? storage.data(forKey: Self.provisioningKey),
|
||||
let routingInfoString = try? storage.string(forKey: Self.routingInfoKey),
|
||||
@@ -278,8 +274,32 @@ public struct ADIDataProvider: AnisetteDataProvider {
|
||||
)
|
||||
}
|
||||
|
||||
public func deviceInfo() async throws -> DeviceInfo {
|
||||
DeviceInfo(
|
||||
deviceID: localUserUID.uuidString,
|
||||
clientInfo: try await clientInfo(),
|
||||
)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public struct ADIError: Error {
|
||||
public struct ADIError: Error, CustomStringConvertible {
|
||||
public var code: Int
|
||||
|
||||
public var description: String {
|
||||
switch code {
|
||||
case -45061:
|
||||
return """
|
||||
You were logged out. Please log in again with `xtool auth`.
|
||||
|
||||
If you see this repeatedly, please file an issue at https://github.com/xtool-org/xtool/issues/new/choose
|
||||
"""
|
||||
default:
|
||||
return """
|
||||
Apple Anisette library returned error \(code). Please try logging in again with `xtool auth`.
|
||||
|
||||
If this problem persists, file an issue at https://github.com/xtool-org/xtool/issues/new/choose
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -49,10 +49,9 @@ public struct AnisetteData {
|
||||
static let oneTimePasswordKey = "X-Apple-I-MD"
|
||||
public let oneTimePassword: String
|
||||
|
||||
static let deviceIDKey = "X-Mme-Device-Id"
|
||||
public var deviceID: String?
|
||||
public let deviceInfo: DeviceInfo
|
||||
|
||||
var dictionary: [String: String] {
|
||||
public var dictionary: [String: String] {
|
||||
// GSA doesn't like "en_US@rg=..."; it has to be just "en_US".
|
||||
let localeIdentifier = if let language = locale.language.languageCode?.identifier,
|
||||
let region = locale.region?.identifier {
|
||||
@@ -60,7 +59,7 @@ public struct AnisetteData {
|
||||
} else {
|
||||
"en_US"
|
||||
}
|
||||
var dictionary = [
|
||||
return [
|
||||
Self.localeKey: localeIdentifier,
|
||||
Self.timeZoneKey: timeZone.abbreviation() ?? "UTC",
|
||||
Self.clientTimeKey: Self.dateFormatter.string(from: clientTime),
|
||||
@@ -69,10 +68,7 @@ public struct AnisetteData {
|
||||
Self.localUserIDKey: localUserID,
|
||||
Self.oneTimePasswordKey: oneTimePassword,
|
||||
]
|
||||
if let deviceID {
|
||||
dictionary[Self.deviceIDKey] = deviceID
|
||||
}
|
||||
return dictionary
|
||||
.merging(deviceInfo.dictionary) { _, b in b }
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -10,10 +10,20 @@ import Foundation
|
||||
import Dependencies
|
||||
|
||||
public protocol AnisetteDataProvider: Sendable {
|
||||
/// Stored alongside login data. If the provider reports a new ID, we log out.
|
||||
///
|
||||
/// This is useful when switching Anisette provider implementations if the old
|
||||
/// implementation's provisioning data won't work with the new implementation.
|
||||
///
|
||||
/// The default implementation returns `nil`.
|
||||
var providerID: String? { get }
|
||||
|
||||
// This is a suggestion and not a requirement.
|
||||
func resetProvisioning() async
|
||||
func provisioningData() -> ProvisioningData?
|
||||
|
||||
func deviceInfo() async throws -> DeviceInfo
|
||||
|
||||
func fetchAnisetteData() async throws -> AnisetteData
|
||||
}
|
||||
|
||||
@@ -24,6 +34,7 @@ public struct ProvisioningData: Hashable, Codable, Sendable {
|
||||
}
|
||||
|
||||
extension AnisetteDataProvider {
|
||||
public var providerID: String? { nil }
|
||||
public func provisioningData() -> ProvisioningData? { nil }
|
||||
public func resetProvisioning() async {}
|
||||
}
|
||||
@@ -45,4 +56,9 @@ private struct UnimplementedAnisetteDataProvider: AnisetteDataProvider {
|
||||
let closure: () async throws -> AnisetteData = unimplemented()
|
||||
return try await closure()
|
||||
}
|
||||
|
||||
func deviceInfo() async throws -> DeviceInfo {
|
||||
let closure: () async throws -> DeviceInfo = unimplemented()
|
||||
return try await closure()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,102 +0,0 @@
|
||||
//
|
||||
// DeviceInfo+Fetching.swift
|
||||
// XKit
|
||||
//
|
||||
// Created by Kabir Oberai on 18/06/20.
|
||||
// Copyright © 2020 Kabir Oberai. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
#if os(macOS)
|
||||
extension DeviceInfo {
|
||||
|
||||
private static func fetchDeviceID() -> String? {
|
||||
var waitTime = timespec(tv_sec: 0, tv_nsec: 0) // wait indefinitely
|
||||
let bytes = [UInt8](unsafeUninitializedCapacity: MemoryLayout<uuid_t>.size) { buf, count in
|
||||
// force unwrapping is safe because uuid_t has a non-zero size
|
||||
count = (gethostuuid(buf.baseAddress!, &waitTime) == 0) ? buf.count : 0
|
||||
}
|
||||
guard !bytes.isEmpty else { return nil }
|
||||
return bytes.withUnsafeBufferPointer {
|
||||
UUID(uuid: UnsafeRawBufferPointer($0).load(as: uuid_t.self)).uuidString
|
||||
}
|
||||
}
|
||||
|
||||
private static func hardwareProperty(forKey key: String) -> Data? {
|
||||
let entry = IORegistryEntryFromPath(kIOMainPortDefault, "IODeviceTree:/options")
|
||||
guard entry != 0 else { return nil }
|
||||
defer { IOObjectRelease(entry) }
|
||||
|
||||
return IORegistryEntryCreateCFProperty(
|
||||
entry, key as CFString, kCFAllocatorDefault, 0
|
||||
)?.takeRetainedValue() as? Data
|
||||
}
|
||||
|
||||
private static func fetchROMAddress() -> String? {
|
||||
hardwareProperty(forKey: "4D1EDE05-38C7-4a6a-9CC6-4BCCA8B38C14:ROM")?
|
||||
.map { String(format: "%02hhx", $0) }
|
||||
.joined()
|
||||
}
|
||||
|
||||
private static func fetchMLBSerialNumber() -> String? {
|
||||
hardwareProperty(forKey: "4D1EDE05-38C7-4a6a-9CC6-4BCCA8B38C14:MLB")?
|
||||
.map { String(format: isprint(Int32($0)) != 0 ? "%c" : "%02hhx", $0) }
|
||||
.joined()
|
||||
}
|
||||
|
||||
private static func fetchSerialNumber() -> String? {
|
||||
let service = IOServiceGetMatchingService(kIOMainPortDefault, IOServiceMatching("IOPlatformExpertDevice"))
|
||||
guard service != 0 else { return nil }
|
||||
defer { IOObjectRelease(service) }
|
||||
return IORegistryEntryCreateCFProperty(
|
||||
service, "IOPlatformSerialNumber" as CFString, kCFAllocatorDefault, 0
|
||||
)?.takeRetainedValue() as? String
|
||||
}
|
||||
|
||||
private static func fetchHardwareModel() -> String? {
|
||||
var modelSize = 0
|
||||
guard sysctlbyname("hw.model", nil, &modelSize, nil, 0) == 0,
|
||||
modelSize > 0 else { return nil }
|
||||
return String(unsafeUninitializedCapacity: modelSize) { buf in
|
||||
var len = modelSize
|
||||
guard sysctlbyname("hw.model", buf.baseAddress, &len, nil, 0) == 0,
|
||||
len == modelSize else { return 0 }
|
||||
return len - 1 // exclude NUL
|
||||
}
|
||||
}
|
||||
|
||||
public static func current() -> DeviceInfo? {
|
||||
let romAddress = fetchROMAddress() ?? ""
|
||||
let mlbSerialNumber = fetchMLBSerialNumber() ?? ""
|
||||
|
||||
guard let deviceID = fetchDeviceID(),
|
||||
let serialNumber = fetchSerialNumber(),
|
||||
let modelID = fetchHardwareModel()
|
||||
else { return nil }
|
||||
return DeviceInfo(
|
||||
deviceID: deviceID,
|
||||
romAddress: romAddress,
|
||||
mlbSerialNumber: mlbSerialNumber,
|
||||
serialNumber: serialNumber,
|
||||
modelID: modelID
|
||||
)
|
||||
}
|
||||
|
||||
}
|
||||
#else
|
||||
extension DeviceInfo {
|
||||
public static func current() -> DeviceInfo? {
|
||||
return DeviceInfo(
|
||||
deviceID: "99B5D9D4-B068-5CEE-A799-5EBB5B0894A6",
|
||||
romAddress: "94f6a300e9a0",
|
||||
mlbSerialNumber: "C02520301W0GF2D1U",
|
||||
serialNumber: "C02PQKRJG8WP",
|
||||
modelID: "Mac16,1"
|
||||
)
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
// FIXME: Figure out DeviceInfo.current() outside macOS
|
||||
// (see above)
|
||||
@@ -1,116 +1,20 @@
|
||||
//
|
||||
// DeviceInfo.swift
|
||||
// XKit
|
||||
//
|
||||
// Created by Kabir Oberai on 19/11/19.
|
||||
// Copyright © 2019 Kabir Oberai. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import Dependencies
|
||||
|
||||
public struct DeviceInfo: Codable, Sendable {
|
||||
|
||||
/// `X-Xcode-Version`
|
||||
static let xcodeVersionKey = "X-Xcode-Version"
|
||||
/// Not included in `dictionary`
|
||||
public static let xcodeVersionKey = "X-Xcode-Version"
|
||||
public static let xcodeVersion = "26.5 (17F42)"
|
||||
public static let akdUserAgent = "akd/1.0 CFNetwork/808.1.4"
|
||||
|
||||
public struct ClientInfo: Codable {
|
||||
public let modelID: String // e.g. MacBookPro11,5
|
||||
|
||||
var clientString: String {
|
||||
"""
|
||||
<\(modelID)> <macOS;27.0;26A5378j> <com.apple.AuthKit/1 (com.apple.akd/1.0)>
|
||||
"""
|
||||
}
|
||||
|
||||
var userAgent: String {
|
||||
"AuthKit/1 (Macintosh; OS X 27.0) (com.apple.dt.Xcode/26.5)"
|
||||
}
|
||||
|
||||
public init(modelID: String) {
|
||||
self.modelID = modelID
|
||||
}
|
||||
}
|
||||
|
||||
/// `X-Mme-Device-Id`
|
||||
static let deviceIDKey = "X-Mme-Device-Id"
|
||||
public static let deviceIDKey = "X-Mme-Device-Id"
|
||||
public let deviceID: String
|
||||
|
||||
/// `X-Apple-I-ROM`
|
||||
static let romAddressKey = "X-Apple-I-ROM"
|
||||
public let romAddress: String
|
||||
public static let clientInfoKey = "X-MMe-Client-Info"
|
||||
public let clientInfo: String
|
||||
|
||||
/// `X-Apple-I-MLB`
|
||||
static let mlbSerialNumberKey = "X-Apple-I-MLB"
|
||||
/// main logic board serial number
|
||||
public let mlbSerialNumber: String
|
||||
|
||||
/// `X-Apple-I-SRL-NO`
|
||||
static let serialNumberKey = "X-Apple-I-SRL-NO"
|
||||
public let serialNumber: String
|
||||
|
||||
public let modelID: String
|
||||
|
||||
/// `X-MMe-Client-Info`
|
||||
static let clientInfoKey = "X-MMe-Client-Info"
|
||||
public var clientInfo: ClientInfo { .init(modelID: modelID) }
|
||||
|
||||
public init(
|
||||
deviceID: String,
|
||||
romAddress: String,
|
||||
mlbSerialNumber: String,
|
||||
serialNumber: String,
|
||||
modelID: String
|
||||
) {
|
||||
self.deviceID = deviceID
|
||||
self.romAddress = romAddress
|
||||
self.mlbSerialNumber = mlbSerialNumber
|
||||
self.serialNumber = serialNumber
|
||||
self.modelID = modelID
|
||||
}
|
||||
|
||||
var dictionary: [String: String] {
|
||||
public var dictionary: [String: String] {
|
||||
[
|
||||
Self.clientInfoKey: clientInfo,
|
||||
Self.deviceIDKey: deviceID,
|
||||
Self.romAddressKey: romAddress,
|
||||
Self.mlbSerialNumberKey: mlbSerialNumber,
|
||||
Self.serialNumberKey: serialNumber
|
||||
]
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
extension DeviceInfo {
|
||||
public enum FetchError: Error {
|
||||
case couldNotFetch
|
||||
}
|
||||
|
||||
fileprivate static func fetch() throws -> Self {
|
||||
guard let deviceInfo = DeviceInfo.current() else {
|
||||
throw FetchError.couldNotFetch
|
||||
}
|
||||
return deviceInfo
|
||||
}
|
||||
}
|
||||
|
||||
public struct DeviceInfoProvider: DependencyKey, Sendable {
|
||||
public var fetch: @Sendable () throws -> DeviceInfo
|
||||
|
||||
public init(fetch: @escaping @Sendable () throws -> DeviceInfo) {
|
||||
self.fetch = fetch
|
||||
}
|
||||
|
||||
private static let current = Result { try DeviceInfo.fetch() }
|
||||
|
||||
public static let testValue = DeviceInfoProvider(fetch: unimplemented())
|
||||
public static let liveValue = DeviceInfoProvider { try current.get() }
|
||||
}
|
||||
|
||||
extension DependencyValues {
|
||||
public var deviceInfoProvider: DeviceInfoProvider {
|
||||
get { self[DeviceInfoProvider.self] }
|
||||
set { self[DeviceInfoProvider.self] = newValue }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,256 +0,0 @@
|
||||
//
|
||||
// LocalAnisetteDataProviders.swift
|
||||
// XKit
|
||||
//
|
||||
// Created by Kabir Oberai on 29/06/20.
|
||||
// Copyright © 2020 Kabir Oberai. All rights reserved.
|
||||
//
|
||||
|
||||
#if false
|
||||
|
||||
// For reference: https://github.com/xtool-org/xtool/issues/196
|
||||
|
||||
import Foundation
|
||||
|
||||
/// Creates a socket connected to `ip` on `port`.
|
||||
///
|
||||
/// - Returns: A connected socket file descriptor, or `nil` if
|
||||
/// the connection failed. The caller is responsible for closing
|
||||
/// the returned file descriptor.
|
||||
private func connect(toIP ip: String, port: UInt16) -> Int32? {
|
||||
var addr = sockaddr_in()
|
||||
addr.sin_family = .init(AF_INET)
|
||||
addr.sin_port = CFSwapInt16HostToBig(port)
|
||||
addr.sin_addr.s_addr = inet_addr(ip)
|
||||
|
||||
// we can't do this inside withUnsafePointer due to memory exclusivity rules
|
||||
let addrSize = MemoryLayout.size(ofValue: addr)
|
||||
|
||||
let socketFd = socket(AF_INET, SOCK_STREAM, 0)
|
||||
guard socketFd != -1 else { return nil }
|
||||
guard withUnsafePointer(to: &addr, {
|
||||
connect(
|
||||
socketFd,
|
||||
UnsafeRawPointer($0).assumingMemoryBound(to: sockaddr.self),
|
||||
.init(addrSize)
|
||||
)
|
||||
}) == 0 else { return nil }
|
||||
|
||||
return socketFd
|
||||
}
|
||||
|
||||
public class NetcatAnisetteDataProvider: AnisetteDataProvider {
|
||||
|
||||
private struct RawAnisetteData {
|
||||
let machineID: String
|
||||
let localUserID: String
|
||||
let routingInfo: String
|
||||
let oneTimePassword: String
|
||||
}
|
||||
|
||||
private class ConnectionInfo {
|
||||
let socketFd: Int32
|
||||
let machineID: String
|
||||
let localUserID: String
|
||||
let routingInfo: String
|
||||
let firstOTP: String
|
||||
|
||||
init(socketFd: Int32, machineID: String, localUserID: String, routingInfo: String, firstOTP: String) {
|
||||
self.socketFd = socketFd
|
||||
self.machineID = machineID
|
||||
self.localUserID = localUserID
|
||||
self.routingInfo = routingInfo
|
||||
self.firstOTP = firstOTP
|
||||
}
|
||||
|
||||
deinit { close(socketFd) }
|
||||
}
|
||||
|
||||
public enum Error: Swift.Error {
|
||||
/// The user is probably not running anisettehelperd on the host machine
|
||||
case helperUnreachable
|
||||
case invalidAnisetteData
|
||||
case networkError(errno: Int32)
|
||||
}
|
||||
|
||||
public let ip: String
|
||||
public let port: UInt16
|
||||
public let deviceInfo: DeviceInfo
|
||||
private var _connectionInfo: ConnectionInfo?
|
||||
private var hasUsedFirstOTP = false
|
||||
|
||||
public init(ip: String, port: UInt16, deviceInfo: DeviceInfo) {
|
||||
self.ip = ip
|
||||
self.port = port
|
||||
self.deviceInfo = deviceInfo
|
||||
}
|
||||
|
||||
public convenience init(localPort port: UInt16, deviceInfo: DeviceInfo) {
|
||||
self.init(ip: "0.0.0.0", port: port, deviceInfo: deviceInfo)
|
||||
}
|
||||
|
||||
private func readAll(fromSocket sock: Int32) throws -> Data {
|
||||
let capacity = 1024
|
||||
let buf = UnsafeMutablePointer<UInt8>.allocate(capacity: capacity)
|
||||
defer { buf.deallocate() }
|
||||
var data = Data()
|
||||
while true {
|
||||
let count = recv(sock, buf, capacity, 0)
|
||||
guard count != -1 else {
|
||||
throw Error.networkError(errno: errno)
|
||||
}
|
||||
data.append(buf, count: count)
|
||||
if count < capacity {
|
||||
break
|
||||
}
|
||||
}
|
||||
return data
|
||||
}
|
||||
|
||||
private func connectionInfo() throws -> ConnectionInfo {
|
||||
if let connectionInfo = _connectionInfo { return connectionInfo }
|
||||
|
||||
guard let socketFd = connect(toIP: ip, port: port) else { throw Error.helperUnreachable }
|
||||
|
||||
let id = deviceInfo.deviceID
|
||||
write(socketFd, id, strlen(id) + 1) // include null
|
||||
let clientInfo = deviceInfo.clientInfo.clientString
|
||||
write(socketFd, clientInfo, strlen(clientInfo) + 1)
|
||||
|
||||
let initialData = try readAll(fromSocket: socketFd)
|
||||
guard let string = String(data: initialData, encoding: .utf8)
|
||||
else { throw Error.invalidAnisetteData }
|
||||
|
||||
let components = string.split(separator: "\r\n")
|
||||
guard components.count == 4 else { throw Error.invalidAnisetteData }
|
||||
|
||||
let connectionInfo = ConnectionInfo(
|
||||
socketFd: socketFd,
|
||||
machineID: String(components[0]),
|
||||
localUserID: String(components[1]),
|
||||
routingInfo: String(components[2]),
|
||||
firstOTP: String(components[3])
|
||||
)
|
||||
_connectionInfo = connectionInfo
|
||||
return connectionInfo
|
||||
}
|
||||
|
||||
private func rawAnisetteData() throws -> RawAnisetteData {
|
||||
let info = try connectionInfo()
|
||||
if !hasUsedFirstOTP {
|
||||
return RawAnisetteData(
|
||||
machineID: info.machineID,
|
||||
localUserID: info.localUserID,
|
||||
routingInfo: info.routingInfo,
|
||||
oneTimePassword: info.firstOTP
|
||||
)
|
||||
}
|
||||
|
||||
write(info.socketFd, "a\n", 3)
|
||||
let response = try readAll(fromSocket: info.socketFd)
|
||||
guard let otp = String(data: response, encoding: .utf8)
|
||||
else { throw Error.invalidAnisetteData }
|
||||
return RawAnisetteData(
|
||||
machineID: info.machineID,
|
||||
localUserID: info.localUserID,
|
||||
routingInfo: info.routingInfo,
|
||||
oneTimePassword: otp
|
||||
)
|
||||
}
|
||||
|
||||
public func fetchAnisetteData(completion: @escaping (Result<AnisetteData, Swift.Error>) -> Void) {
|
||||
let time = Date()
|
||||
|
||||
let raw: RawAnisetteData
|
||||
let routingInfo: UInt64
|
||||
do {
|
||||
raw = try rawAnisetteData()
|
||||
guard let rinfo = UInt64(raw.routingInfo)
|
||||
else { throw Error.invalidAnisetteData }
|
||||
routingInfo = rinfo
|
||||
} catch {
|
||||
return completion(.failure(error))
|
||||
}
|
||||
|
||||
let anisette = AnisetteData(
|
||||
clientTime: time,
|
||||
routingInfo: routingInfo,
|
||||
machineID: raw.machineID,
|
||||
localUserID: raw.localUserID,
|
||||
oneTimePassword: raw.oneTimePassword
|
||||
)
|
||||
|
||||
completion(.success(anisette))
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/// Provides Anisette Data by making a request to a TCP server
|
||||
public class TCPAnisetteDataProvider: AnisetteDataProvider {
|
||||
|
||||
public enum Error: Swift.Error {
|
||||
/// The user is probably not running anisettehelperd on the host machine
|
||||
case helperUnreachable
|
||||
case invalidAnisetteData
|
||||
}
|
||||
|
||||
public let ip: String
|
||||
public let port: UInt16
|
||||
|
||||
public init(ip: String, port: UInt16) {
|
||||
self.ip = ip
|
||||
self.port = port
|
||||
}
|
||||
|
||||
public convenience init(localPort port: UInt16) {
|
||||
self.init(ip: "0.0.0.0", port: port)
|
||||
}
|
||||
|
||||
private func rawAnisetteData() throws -> Data {
|
||||
guard let socketFd = connect(toIP: ip, port: port) else { throw Error.helperUnreachable }
|
||||
|
||||
let capacity = 1024
|
||||
let buf = UnsafeMutablePointer<UInt8>.allocate(capacity: capacity)
|
||||
defer { buf.deallocate() }
|
||||
var data = Data()
|
||||
while true {
|
||||
let count = recv(socketFd, buf, capacity, 0)
|
||||
// swiftlint:disable:next empty_count
|
||||
guard count != 0 else { break }
|
||||
data.append(buf, count: count)
|
||||
}
|
||||
|
||||
return data
|
||||
}
|
||||
|
||||
public func fetchAnisetteData(completion: @escaping (Result<AnisetteData, Swift.Error>) -> Void) {
|
||||
let time = Date()
|
||||
|
||||
let rawDeserialized: Any
|
||||
do {
|
||||
let raw = try rawAnisetteData()
|
||||
rawDeserialized = try PropertyListSerialization.propertyList(from: raw, format: nil)
|
||||
} catch {
|
||||
return completion(.failure(error))
|
||||
}
|
||||
|
||||
guard let data = rawDeserialized as? [String: Any],
|
||||
let rinfoString = data[AnisetteData.routingInfoKey] as? String,
|
||||
let rinfo = UInt64(rinfoString),
|
||||
let machineID = data[AnisetteData.machineIDKey] as? String,
|
||||
let localUserID = data[AnisetteData.localUserIDKey] as? String,
|
||||
let oneTimePassword = data[AnisetteData.oneTimePasswordKey] as? String
|
||||
else { return completion(.failure(Error.invalidAnisetteData)) }
|
||||
|
||||
completion(.success(AnisetteData(
|
||||
clientTime: time,
|
||||
routingInfo: rinfo,
|
||||
machineID: machineID,
|
||||
localUserID: localUserID,
|
||||
oneTimePassword: oneTimePassword
|
||||
)))
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -6,10 +6,9 @@ struct OmnisetteADIProvider: RawADIProvider {
|
||||
|
||||
// should implement v3 of https://github.com/SideStore/omnisette-server
|
||||
// list: https://servers.sidestore.io/servers.json
|
||||
// e.g. https://ani.sidestore.io
|
||||
private let url: URL
|
||||
init(
|
||||
url: URL = URL(string: "https://ani.sidestore.io")! // URL(string: "http://localhost:6969")!
|
||||
url: URL = URL(string: "https://mac-ani.jkcoxson.com")!
|
||||
) {
|
||||
self.url = url
|
||||
}
|
||||
|
||||
@@ -1,196 +0,0 @@
|
||||
#if canImport(XADI)
|
||||
|
||||
import Foundation
|
||||
import XADI
|
||||
import Dependencies
|
||||
import Subprocess
|
||||
|
||||
public actor XADIProvider: RawADIProvider {
|
||||
@MainActor private static var loadTask: Task<Void, Error>?
|
||||
@Dependency(\.httpClient) private var httpClient
|
||||
@Dependency(\.persistentDirectory) private var persistentDirectory
|
||||
|
||||
private var directory: URL { persistentDirectory.appendingPathComponent("Anisette") }
|
||||
|
||||
public init() {}
|
||||
|
||||
private func _loadADI(id: UUID) async throws {
|
||||
let dir = self.directory
|
||||
let libDir = dir.appending(path: "libs")
|
||||
if !libDir.dirExists {
|
||||
let tmp = dir.appending(path: "tmp")
|
||||
try? FileManager.default.createDirectory(at: tmp, withIntermediateDirectories: true)
|
||||
|
||||
let applemusic = tmp.appending(path: "applemusic.apk")
|
||||
if !applemusic.exists {
|
||||
print("[Downloading libraries] ...", terminator: "")
|
||||
fflush(stdoutSafe)
|
||||
let url = URL(string: "https://apps.mzstatic.com/content/android-apple-music-apk/applemusic.apk")!
|
||||
defer { print("") }
|
||||
let data = try await httpClient.makeRequest(HTTPRequest(url: url)) { progress in
|
||||
guard let progress else { return }
|
||||
let progString = "\(Int(progress * 100))%".padding(toLength: 4, leading: true)
|
||||
print("\r[Downloading libraries] \(progString)", terminator: "")
|
||||
fflush(stdoutSafe)
|
||||
}.body
|
||||
try data.write(to: applemusic)
|
||||
}
|
||||
|
||||
#if arch(arm64)
|
||||
let arch = "arm64-v8a"
|
||||
#elseif arch(x86_64)
|
||||
let arch = "x86_64"
|
||||
#else
|
||||
#error("Unsupported architecture")
|
||||
#endif
|
||||
let archDir = "lib/\(arch)"
|
||||
|
||||
// TODO: Use ZIPFoundation
|
||||
try await Subprocess.run(
|
||||
.name("unzip"),
|
||||
arguments: [
|
||||
"-q",
|
||||
applemusic.path,
|
||||
"\(archDir)/libCoreADI.so",
|
||||
"\(archDir)/libstoreservicescore.so",
|
||||
"-d", tmp.path
|
||||
],
|
||||
output: .discarded
|
||||
).checkSuccess()
|
||||
try FileManager.default.moveItem(
|
||||
at: tmp.appending(path: archDir),
|
||||
to: libDir
|
||||
)
|
||||
try? FileManager.default.removeItem(at: tmp)
|
||||
}
|
||||
|
||||
xadi_Load(strdup(libDir.path()))
|
||||
|
||||
let rawID = id.uuidString.replacingOccurrences(of: "-", with: "").prefix(16).lowercased()
|
||||
try check(xadi_SetAndroidID(rawID, UInt32(rawID.utf8.count)))
|
||||
|
||||
let adi = dir.appending(path: "adi")
|
||||
try? FileManager.default.createDirectory(at: adi, withIntermediateDirectories: true)
|
||||
try check(xadi_SetProvisioningPath(adi.path()))
|
||||
}
|
||||
|
||||
@MainActor private func loadADI(id: UUID) async throws {
|
||||
if let loadTask = Self.loadTask {
|
||||
try await loadTask.value
|
||||
return
|
||||
}
|
||||
let loadTask = Task { try await _loadADI(id: id) }
|
||||
Self.loadTask = loadTask
|
||||
try await loadTask.value
|
||||
}
|
||||
|
||||
public func clientInfo() async throws -> String {
|
||||
"""
|
||||
<MacBookPro13,2> <macOS;13.1;22C65> <com.apple.AuthKit/1 (com.apple.dt.Xcode/3594.4.19)>
|
||||
"""
|
||||
}
|
||||
|
||||
public func startProvisioning(spim: Data, userID: UUID) async throws -> (any RawADIProvisioningSession, Data) {
|
||||
try await loadADI(id: userID)
|
||||
|
||||
var sessionID: UInt32 = 0
|
||||
var cpimBytes: UnsafeMutableRawPointer?
|
||||
var cpimLen: UInt32 = 0
|
||||
try check(spim.withUnsafeBytes { spimBytes in
|
||||
xadi_ProvisioningStart(
|
||||
UInt64(bitPattern: -2),
|
||||
spimBytes.baseAddress!, UInt32(spimBytes.count),
|
||||
&cpimBytes, &cpimLen,
|
||||
&sessionID
|
||||
)
|
||||
})
|
||||
let data = Data(UnsafeRawBufferPointer(start: cpimBytes, count: Int(cpimLen)))
|
||||
_ = cpimBytes.map { xadi_Dispose($0) }
|
||||
return (
|
||||
ADISession(
|
||||
sessionID: sessionID,
|
||||
adiDirectory: directory.appending(path: "adi")
|
||||
),
|
||||
data
|
||||
)
|
||||
}
|
||||
|
||||
private struct ADISession: RawADIProvisioningSession {
|
||||
let sessionID: UInt32
|
||||
let adiDirectory: URL
|
||||
|
||||
func endProvisioning(routingInfo: UInt64, ptm: Data, tk: Data) async throws -> Data {
|
||||
try check(ptm.withUnsafeBytes { ptmBuf in
|
||||
tk.withUnsafeBytes { tkBuf in
|
||||
xadi_ProvisioningEnd(
|
||||
sessionID,
|
||||
ptmBuf.baseAddress!, UInt32(ptmBuf.count),
|
||||
tkBuf.baseAddress!, UInt32(tkBuf.count)
|
||||
)
|
||||
}
|
||||
})
|
||||
let file = adiDirectory.appending(path: "adi.pb")
|
||||
// adi saves the file as 0o034 (group wx, public r) by default
|
||||
// which is a... strange choice that prevents us from reading
|
||||
// or writing by default. Since we're the owner, we can easily
|
||||
// change this though.
|
||||
try FileManager.default.setAttributes(
|
||||
// rw for owner
|
||||
[.posixPermissions: 0o600],
|
||||
ofItemAtPath: file.path
|
||||
)
|
||||
return try Data(contentsOf: file)
|
||||
}
|
||||
}
|
||||
|
||||
public func requestOTP(
|
||||
userID: UUID,
|
||||
routingInfo: inout UInt64,
|
||||
provisioningInfo: Data
|
||||
) async throws -> (machineID: Data, otp: Data) {
|
||||
try await loadADI(id: userID)
|
||||
|
||||
var midBytes: UnsafeMutableRawPointer?
|
||||
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")
|
||||
try provisioningInfo.write(to: adiFile)
|
||||
|
||||
try check(xadi_OTPRequest(
|
||||
UInt64(bitPattern: -2),
|
||||
&midBytes, &midLen,
|
||||
&otpBytes, &otpLen
|
||||
))
|
||||
|
||||
let mid = Data(UnsafeRawBufferPointer(start: midBytes, count: Int(midLen)))
|
||||
let otp = Data(UnsafeRawBufferPointer(start: otpBytes, count: Int(otpLen)))
|
||||
|
||||
_ = midBytes.map { xadi_Dispose($0) }
|
||||
_ = otpBytes.map { xadi_Dispose($0) }
|
||||
|
||||
return (machineID: mid, otp: otp)
|
||||
}
|
||||
}
|
||||
|
||||
private func check(_ adiStatus: Int32) throws {
|
||||
guard adiStatus == 0 else {
|
||||
throw ADIError(code: Int(adiStatus))
|
||||
}
|
||||
}
|
||||
|
||||
extension StringProtocol {
|
||||
fileprivate func padding(
|
||||
toLength minLength: Int,
|
||||
withPad pad: Character = " ",
|
||||
leading: Bool = false
|
||||
) -> String {
|
||||
let justPadding = String(repeating: pad, count: Swift.max(minLength - count, 0))
|
||||
return leading ? justPadding + self : self + justPadding
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
import Foundation
|
||||
import Crypto
|
||||
import _CryptoExtras
|
||||
import CryptoExtras
|
||||
import BigInt
|
||||
|
||||
struct SRPClient {
|
||||
|
||||
@@ -15,22 +15,19 @@ struct GrandSlamClient: Sendable {
|
||||
|
||||
private let lookupManager = GrandSlamLookupManager()
|
||||
|
||||
@Dependency(\.deviceInfoProvider) var deviceInfoProvider
|
||||
@Dependency(\.anisetteDataProvider) var anisetteDataProvider
|
||||
@Dependency(\.httpClient) var httpClient
|
||||
|
||||
init() {}
|
||||
|
||||
func send<R: GrandSlamRequest>(_ request: R) async throws -> R.Decoder.Value {
|
||||
let deviceInfo = try deviceInfoProvider.fetch()
|
||||
|
||||
let anisetteData = try await anisetteDataProvider.fetchAnisetteData()
|
||||
let url = try await lookupManager.fetchURL(forEndpoint: R.endpoint)
|
||||
|
||||
let method = request.method(deviceInfo: deviceInfo, anisetteData: anisetteData)
|
||||
let method = request.method(anisetteData: anisetteData)
|
||||
var httpRequest = HTTPRequest(method: method.httpMethod, url: url)
|
||||
httpRequest.headerFields[.contentType] = "text/x-xml-plist"
|
||||
httpRequest.headerFields[.init(DeviceInfo.clientInfoKey)!] = deviceInfo.clientInfo.clientString
|
||||
httpRequest.headerFields[.init(DeviceInfo.clientInfoKey)!] = anisetteData.deviceInfo.clientInfo
|
||||
let body: Data? = switch method {
|
||||
case .get:
|
||||
nil
|
||||
@@ -39,7 +36,7 @@ struct GrandSlamClient: Sendable {
|
||||
fromPropertyList: body, format: .xml, options: 0
|
||||
)
|
||||
}
|
||||
request.configure(request: &httpRequest, deviceInfo: deviceInfo, anisetteData: anisetteData)
|
||||
request.configure(request: &httpRequest, anisetteData: anisetteData)
|
||||
|
||||
// GrandSlam doesn't seem to like reused (keep-alive) connections so create a
|
||||
// new one for each request. cf https://github.com/rileytestut/AltSign/pull/52
|
||||
|
||||
@@ -21,33 +21,27 @@ actor GrandSlamLookupManager {
|
||||
private let decoder = PropertyListDecoder()
|
||||
private var endpoints: GrandSlamEndpoints?
|
||||
|
||||
@Dependency(\.deviceInfoProvider) var deviceInfoProvider
|
||||
@Dependency(\.anisetteDataProvider) var anisetteDataProvider
|
||||
@Dependency(\.httpClient) var httpClient
|
||||
|
||||
init() {}
|
||||
|
||||
private func performLookup() async throws -> GrandSlamEndpoints {
|
||||
let deviceInfo = try deviceInfoProvider.fetch()
|
||||
let deviceInfo = try await anisetteDataProvider.deviceInfo()
|
||||
|
||||
/* {
|
||||
"X-Apple-I-Locale" = "en_IN";
|
||||
"X-Apple-I-TimeZone" = "Asia/Kolkata";
|
||||
"X-Apple-I-TimeZone-Offset" = 19800;
|
||||
"X-MMe-Client-Info" = "<MacBookPro11,5> <Mac OS X;10.14.6;18G103> <com.apple.AuthKit/1 (com.apple.akd/1.0)>";
|
||||
"X-MMe-Country" = IN;
|
||||
"X-Mme-Device-Id" = "[REDACTED]";
|
||||
} */
|
||||
var request = HTTPRequest(url: Self.lookupURL)
|
||||
request.headerFields = [
|
||||
.userAgent: deviceInfo.clientInfo.userAgent,
|
||||
.init(DeviceInfo.clientInfoKey)!: deviceInfo.clientInfo.clientString,
|
||||
.init(DeviceInfo.deviceIDKey)!: deviceInfo.deviceID,
|
||||
.userAgent: DeviceInfo.akdUserAgent,
|
||||
.init(AnisetteData.iLocaleKey)!: Locale.current.identifier,
|
||||
.init(AnisetteData.timeZoneKey)!: TimeZone.current.identifier,
|
||||
.init("X-Apple-I-TimeZone-Offset")!: "\(TimeZone.current.secondsFromGMT())"
|
||||
]
|
||||
request.headerFields[.init("X-MMe-Country")!] = Locale.current.region?.identifier
|
||||
|
||||
for (key, value) in deviceInfo.dictionary {
|
||||
request.headerFields[.init(key)!] = value
|
||||
}
|
||||
|
||||
let (_, body) = try await httpClient.makeRequest(request)
|
||||
|
||||
return try self.decoder.decode(Response.self, from: body).urls
|
||||
|
||||
@@ -27,7 +27,15 @@ struct GrandSlamTwoFactorAuthenticateOperation {
|
||||
private func performSMSAuth() async throws {
|
||||
// TODO: parse phone number list from o=complete req?
|
||||
let phoneNumberID = "1"
|
||||
try await client.send(GrandSlamSMSAuthRequest(loginData: loginData, phoneNumberID: phoneNumberID))
|
||||
do {
|
||||
try await client.send(GrandSlamSMSAuthRequest(loginData: loginData, phoneNumberID: phoneNumberID))
|
||||
} catch let error as HTTPResponseError where error.status.code == 403 {
|
||||
print("""
|
||||
warning: Could not send verification code via SMS. Falling back to trusted device authentication...
|
||||
""")
|
||||
try await performTrustedDeviceAuth()
|
||||
return
|
||||
}
|
||||
try await validateCode(phoneNumberID: phoneNumberID)
|
||||
}
|
||||
|
||||
@@ -51,7 +59,14 @@ struct GrandSlamTwoFactorAuthenticateOperation {
|
||||
|
||||
private func performTrustedDeviceAuth() async throws {
|
||||
let request = GrandSlamTrustedDeviceRequest(loginData: loginData)
|
||||
try await client.send(request)
|
||||
do {
|
||||
try await client.send(request)
|
||||
} catch let error as HTTPResponseError where error.status.code == 403 {
|
||||
print("""
|
||||
warning: Could not send verification code. Generate one manually.
|
||||
See https://github.com/xtool-org/xtool/discussions/368
|
||||
""")
|
||||
}
|
||||
try await validateCode()
|
||||
}
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@ struct GrandSlamSMSAuthRequest: GrandSlamTwoFactorRequest {
|
||||
let loginData: GrandSlamLoginData
|
||||
let phoneNumberID: String
|
||||
|
||||
func method(deviceInfo: DeviceInfo, anisetteData: AnisetteData) -> GrandSlamMethod {
|
||||
func method(anisetteData: AnisetteData) -> GrandSlamMethod {
|
||||
.post([
|
||||
"serverInfo": [
|
||||
"phoneNumber.id": phoneNumberID
|
||||
|
||||
@@ -36,7 +36,7 @@ struct GrandSlamValidateSMSRequest: GrandSlamTwoFactorRequest {
|
||||
let phoneNumberID: String
|
||||
let verificationCode: String
|
||||
|
||||
func method(deviceInfo: DeviceInfo, anisetteData: AnisetteData) -> GrandSlamMethod {
|
||||
func method(anisetteData: AnisetteData) -> GrandSlamMethod {
|
||||
.post([
|
||||
"securityCode.code": verificationCode,
|
||||
"serverInfo": [
|
||||
|
||||
@@ -69,12 +69,12 @@ extension GrandSlamOperationRequest {
|
||||
|
||||
static var endpoint: GrandSlamEndpoint { .lookup(\.gsService) }
|
||||
|
||||
func configure(request: inout HTTPRequest, deviceInfo: DeviceInfo, anisetteData: AnisetteData) {
|
||||
func configure(request: inout HTTPRequest, anisetteData: AnisetteData) {
|
||||
request.headerFields[.accept] = "*/*"
|
||||
request.headerFields[.userAgent] = deviceInfo.clientInfo.userAgent
|
||||
request.headerFields[.userAgent] = DeviceInfo.akdUserAgent
|
||||
}
|
||||
|
||||
func method(deviceInfo: DeviceInfo, anisetteData: AnisetteData) -> GrandSlamMethod {
|
||||
func method(anisetteData: AnisetteData) -> GrandSlamMethod {
|
||||
var clientData: [String: Any] = [
|
||||
"bootstrap": true,
|
||||
"icscrec": true,
|
||||
@@ -83,7 +83,6 @@ extension GrandSlamOperationRequest {
|
||||
"svct": "iCloud",
|
||||
"loc": Locale.current.identifier
|
||||
]
|
||||
clientData.merge(deviceInfo.dictionary) { _, b in b }
|
||||
clientData.merge(anisetteData.dictionary) { _, b in b }
|
||||
|
||||
var request: [String: Any] = [
|
||||
|
||||
@@ -30,6 +30,6 @@ protocol GrandSlamRequest: Sendable {
|
||||
|
||||
static var endpoint: GrandSlamEndpoint { get }
|
||||
|
||||
func configure(request: inout HTTPRequest, deviceInfo: DeviceInfo, anisetteData: AnisetteData)
|
||||
func method(deviceInfo: DeviceInfo, anisetteData: AnisetteData) -> GrandSlamMethod
|
||||
func configure(request: inout HTTPRequest, anisetteData: AnisetteData)
|
||||
func method(anisetteData: AnisetteData) -> GrandSlamMethod
|
||||
}
|
||||
|
||||
@@ -17,9 +17,10 @@ extension GrandSlamTwoFactorRequest {
|
||||
|
||||
var extraHeaders: [String: String] { [:] }
|
||||
|
||||
func configure(request: inout HTTPRequest, deviceInfo: DeviceInfo, anisetteData: AnisetteData) {
|
||||
func configure(request: inout HTTPRequest, anisetteData: AnisetteData) {
|
||||
request.headerFields[.accept] = "application/x-buddyml"
|
||||
request.headerFields[.contentType] = "application/x-plist"
|
||||
request.headerFields[.userAgent] = DeviceInfo.akdUserAgent
|
||||
request.headerFields[.init("X-Apple-App-Info")!] = "com.apple.gs.xcode.auth"
|
||||
request.headerFields[.init(DeviceInfo.xcodeVersionKey)!] = DeviceInfo.xcodeVersion
|
||||
request.headerFields[.init("X-Apple-Identity-Token")!] = loginData.identityToken
|
||||
@@ -27,7 +28,7 @@ extension GrandSlamTwoFactorRequest {
|
||||
extraHeaders.forEach { request.headerFields[.init($0)!] = $1 }
|
||||
}
|
||||
|
||||
func method(deviceInfo: DeviceInfo, anisetteData: AnisetteData) -> GrandSlamMethod {
|
||||
func method(anisetteData: AnisetteData) -> GrandSlamMethod {
|
||||
.get
|
||||
}
|
||||
|
||||
|
||||
@@ -35,11 +35,13 @@ private struct Client: HTTPClientProtocol {
|
||||
}
|
||||
|
||||
private static let tlsConfiguration: TLSConfiguration = {
|
||||
// if ssl cert parsing fails we're screwed so we might as well force try
|
||||
// swiftlint:disable:next force_try
|
||||
let appleRootCA = try! NIOSSLCertificate(bytes: Array(appleRootPEM.utf8), format: .pem)
|
||||
let appleRoots = appleRootCertificates.map { pem in
|
||||
// if ssl cert parsing fails we're screwed so we might as well force try
|
||||
// swiftlint:disable:next force_try
|
||||
try! NIOSSLCertificate(bytes: Array(pem.utf8), format: .pem)
|
||||
}
|
||||
var tlsConfiguration: TLSConfiguration = .makeClientConfiguration()
|
||||
tlsConfiguration.additionalTrustRoots = [.certificates([appleRootCA])]
|
||||
tlsConfiguration.additionalTrustRoots = [.certificates(appleRoots)]
|
||||
if ProcessInfo.processInfo.environment["XTL_DISABLE_TLS_VALIDATION"] == "1" {
|
||||
tlsConfiguration.certificateVerification = .none
|
||||
}
|
||||
@@ -136,6 +138,17 @@ private final class WebSocketSessionWrapper: WebSocketSession {
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Apple Root Certificates
|
||||
|
||||
// https://www.apple.com/certificateauthority/
|
||||
|
||||
private let appleRootCertificates: [String] = [
|
||||
appleRootPEM,
|
||||
appleRootG2PEM,
|
||||
appleRootG3PEM,
|
||||
]
|
||||
|
||||
// https://www.apple.com/appleca/AppleIncRootCertificate.cer
|
||||
private let appleRootPEM = """
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIEuzCCA6OgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQGEwJVUzET
|
||||
@@ -166,4 +179,59 @@ IQ7aunMZT7XZNn/Bh1XZp5m5MkL72NVxnn6hUrcbvZNCJBIqxw8dtk2cXmPIS4AX
|
||||
UKqK1drk/NAJBzewdXUh
|
||||
-----END CERTIFICATE-----
|
||||
"""
|
||||
|
||||
// https://www.apple.com/certificateauthority/AppleRootCA-G2.cer
|
||||
private let appleRootG2PEM = """
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIFkjCCA3qgAwIBAgIIAeDltYNno+AwDQYJKoZIhvcNAQEMBQAwZzEbMBkGA1UE
|
||||
AwwSQXBwbGUgUm9vdCBDQSAtIEcyMSYwJAYDVQQLDB1BcHBsZSBDZXJ0aWZpY2F0
|
||||
aW9uIEF1dGhvcml0eTETMBEGA1UECgwKQXBwbGUgSW5jLjELMAkGA1UEBhMCVVMw
|
||||
HhcNMTQwNDMwMTgxMDA5WhcNMzkwNDMwMTgxMDA5WjBnMRswGQYDVQQDDBJBcHBs
|
||||
ZSBSb290IENBIC0gRzIxJjAkBgNVBAsMHUFwcGxlIENlcnRpZmljYXRpb24gQXV0
|
||||
aG9yaXR5MRMwEQYDVQQKDApBcHBsZSBJbmMuMQswCQYDVQQGEwJVUzCCAiIwDQYJ
|
||||
KoZIhvcNAQEBBQADggIPADCCAgoCggIBANgREkhI2imKScUcx+xuM23+TfvgHN6s
|
||||
XuI2pyT5f1BrTM65MFQn5bPW7SXmMLYFN14UIhHF6Kob0vuy0gmVOKTvKkmMXT5x
|
||||
ZgM4+xb1hYjkWpIMBDLyyED7Ul+f9sDx47pFoFDVEovy3d6RhiPw9bZyLgHaC/Yu
|
||||
OQhfGaFjQQscp5TBhsRTL3b2CtcM0YM/GlMZ81fVJ3/8E7j4ko380yhDPLVoACVd
|
||||
J2LT3VXdRCCQgzWTxb+4Gftr49wIQuavbfqeQMpOhYV4SbHXw8EwOTKrfl+q04tv
|
||||
ny0aIWhwZ7Oj8ZhBbZF8+NfbqOdfIRqMM78xdLe40fTgIvS/cjTf94FNcX1RoeKz
|
||||
8NMoFnNvzcytN31O661A4T+B/fc9Cj6i8b0xlilZ3MIZgIxbdMYs0xBTJh0UT8TU
|
||||
gWY8h2czJxQI6bR3hDRSj4n4aJgXv8O7qhOTH11UL6jHfPsNFL4VPSQ08prcdUFm
|
||||
IrQB1guvkJ4M6mL4m1k8COKWNORj3rw31OsMiANDC1CvoDTdUE0V+1ok2Az6DGOe
|
||||
HwOx4e7hqkP0ZmUoNwIx7wHHHtHMn23KVDpA287PT0aLSmWaasZobNfMmRtHsHLD
|
||||
d4/E92GcdB/O/WuhwpyUgquUoue9G7q5cDmVF8Up8zlYNPXEpMZ7YLlmQ1A/bmH8
|
||||
DvmGqmAMQ0uVAgMBAAGjQjBAMB0GA1UdDgQWBBTEmRNsGAPCe8CjoA1/coB6HHcm
|
||||
jTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQwF
|
||||
AAOCAgEAUabz4vS4PZO/Lc4Pu1vhVRROTtHlznldgX/+tvCHM/jvlOV+3Gp5pxy+
|
||||
8JS3ptEwnMgNCnWefZKVfhidfsJxaXwU6s+DDuQUQp50DhDNqxq6EWGBeNjxtUVA
|
||||
eKuowM77fWM3aPbn+6/Gw0vsHzYmE1SGlHKy6gLti23kDKaQwFd1z4xCfVzmMX3z
|
||||
ybKSaUYOiPjjLUKyOKimGY3xn83uamW8GrAlvacp/fQ+onVJv57byfenHmOZ4VxG
|
||||
/5IFjPoeIPmGlFYl5bRXOJ3riGQUIUkhOb9iZqmxospvPyFgxYnURTbImHy99v6Z
|
||||
SYA7LNKmp4gDBDEZt7Y6YUX6yfIjyGNzv1aJMbDZfGKnexWoiIqrOEDCzBL/FePw
|
||||
N983csvMmOa/orz6JopxVtfnJBtIRD6e/J/JzBrsQzwBvDR4yGn1xuZW7AYJNpDr
|
||||
FEobXsmII9oDMJELuDY++ee1KG++P+w8j2Ud5cAeh6Squpj9kuNsJnfdBrRkBof0
|
||||
Tta6SqoWqPQFZ2aWuuJVecMsXUmPgEkrihLHdoBR37q9ZV0+N0djMenl9MU/S60E
|
||||
inpxLK8JQzcPqOMyT/RFtm2XNuyE9QoB6he7hY1Ck3DDUOUUi78/w0EP3SIEIwiK
|
||||
um1xRKtzCTrJ+VKACd+66eYWyi4uTLLT3OUEVLLUNIAytbwPF+E=
|
||||
-----END CERTIFICATE-----
|
||||
"""
|
||||
|
||||
// https://www.apple.com/certificateauthority/AppleRootCA-G3.cer
|
||||
private let appleRootG3PEM = """
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIICQzCCAcmgAwIBAgIILcX8iNLFS5UwCgYIKoZIzj0EAwMwZzEbMBkGA1UEAwwS
|
||||
QXBwbGUgUm9vdCBDQSAtIEczMSYwJAYDVQQLDB1BcHBsZSBDZXJ0aWZpY2F0aW9u
|
||||
IEF1dGhvcml0eTETMBEGA1UECgwKQXBwbGUgSW5jLjELMAkGA1UEBhMCVVMwHhcN
|
||||
MTQwNDMwMTgxOTA2WhcNMzkwNDMwMTgxOTA2WjBnMRswGQYDVQQDDBJBcHBsZSBS
|
||||
b290IENBIC0gRzMxJjAkBgNVBAsMHUFwcGxlIENlcnRpZmljYXRpb24gQXV0aG9y
|
||||
aXR5MRMwEQYDVQQKDApBcHBsZSBJbmMuMQswCQYDVQQGEwJVUzB2MBAGByqGSM49
|
||||
AgEGBSuBBAAiA2IABJjpLz1AcqTtkyJygRMc3RCV8cWjTnHcFBbZDuWmBSp3ZHtf
|
||||
TjjTuxxEtX/1H7YyYl3J6YRbTzBPEVoA/VhYDKX1DyxNB0cTddqXl5dvMVztK517
|
||||
IDvYuVTZXpmkOlEKMaNCMEAwHQYDVR0OBBYEFLuw3qFYM4iapIqZ3r6966/ayySr
|
||||
MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMAoGCCqGSM49BAMDA2gA
|
||||
MGUCMQCD6cHEFl4aXTQY2e3v9GwOAEZLuN+yRhHFD/3meoyhpmvOwgPUnPWTxnS4
|
||||
at+qIxUCMG1mihDK1A3UT82NQz60imOlM27jbdoXt2QfyFMm+YhidDkLF1vLUagM
|
||||
6BgD56KyKA==
|
||||
-----END CERTIFICATE-----
|
||||
"""
|
||||
#endif
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
//
|
||||
// Superconfig.swift
|
||||
//
|
||||
//
|
||||
// Created by Kabir Oberai on 02/05/21.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
public struct Superconfig: Codable, Sendable {
|
||||
// Stuff that needs to come from the installer
|
||||
public let udid: String
|
||||
public let pairingKeys: Data
|
||||
public let deviceInfo: DeviceInfo
|
||||
|
||||
// Stuff that can also be fetched in-app
|
||||
public let preferredTeamID: String
|
||||
public let preferredSigningInfo: SigningInfo?
|
||||
public let appleID: String
|
||||
public let provisioningData: ProvisioningData?
|
||||
public let token: DeveloperServicesLoginToken
|
||||
|
||||
public init(
|
||||
udid: String,
|
||||
pairingKeys: Data,
|
||||
deviceInfo: DeviceInfo,
|
||||
preferredTeamID: String,
|
||||
preferredSigningInfo: SigningInfo?,
|
||||
appleID: String,
|
||||
provisioningData: ProvisioningData?,
|
||||
token: DeveloperServicesLoginToken
|
||||
) {
|
||||
self.udid = udid
|
||||
self.pairingKeys = pairingKeys
|
||||
self.deviceInfo = deviceInfo
|
||||
self.preferredTeamID = preferredTeamID
|
||||
self.preferredSigningInfo = preferredSigningInfo
|
||||
self.appleID = appleID
|
||||
self.provisioningData = provisioningData
|
||||
self.token = token
|
||||
}
|
||||
|
||||
public static let filename = "Superconfig.plist"
|
||||
public static let encoder = PropertyListEncoder()
|
||||
public func save(inAppDir appDir: URL) throws {
|
||||
try Self.encoder.encode(self).write(to: appDir.appendingPathComponent(Self.filename))
|
||||
}
|
||||
}
|
||||
@@ -57,12 +57,23 @@ public struct Certificate: Codable, Sendable {
|
||||
}
|
||||
|
||||
public func serialNumber() -> String {
|
||||
// big endian, hex-encoded
|
||||
let content = raw.serialNumber.bytes.lazy
|
||||
// big endian, hex-encoded. Leading zero bytes are dropped, but not leading zero
|
||||
// nibbles: Apple formats serials like "03AB…", not "3AB…" (#305).
|
||||
raw.serialNumber.bytes
|
||||
.drop { $0 == 0 }
|
||||
.map { String(format: "%02hhX", $0) }
|
||||
.joined()
|
||||
.drop { $0 == "0" }
|
||||
return String(content)
|
||||
}
|
||||
|
||||
/// Whether `serialNumber` (hex-encoded, e.g. by the App Store Connect API)
|
||||
/// is this certificate's serial number.
|
||||
///
|
||||
/// Compares numerically, so case and leading zeros don't matter.
|
||||
public func hasSerialNumber(_ serialNumber: String) -> Bool {
|
||||
func normalized(_ hex: String) -> Substring {
|
||||
hex.uppercased().drop { $0 == "0" }
|
||||
}
|
||||
return normalized(serialNumber) == normalized(self.serialNumber())
|
||||
}
|
||||
|
||||
public func wasIssuedBefore(_ other: Certificate) -> Bool {
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
import Foundation
|
||||
import Crypto
|
||||
import X509
|
||||
import _CryptoExtras
|
||||
import CryptoExtras
|
||||
|
||||
public struct PrivateKey: Codable, Sendable {
|
||||
// pem encoded
|
||||
|
||||
@@ -76,6 +76,14 @@ struct AuthOperation {
|
||||
}
|
||||
|
||||
private func logInWithPassword() async throws -> AuthToken {
|
||||
print("""
|
||||
Heads up:
|
||||
This works by emulating a virtual Mac to interact with Apple services.
|
||||
We use a third-party service to create a randomized device ID token
|
||||
(Anisette Data) but your credentials are only ever sent to Apple.
|
||||
Still, consider using a secondary Apple ID since this is a private API.
|
||||
""")
|
||||
|
||||
let username = try await Console.promptRequired("Apple ID: ", existing: username)
|
||||
|
||||
let password: String
|
||||
@@ -111,12 +119,15 @@ struct AuthOperation {
|
||||
}
|
||||
)
|
||||
|
||||
@Dependency(\.anisetteDataProvider) var anisetteProvider
|
||||
|
||||
return AuthToken.xcode(.init(
|
||||
appleID: username,
|
||||
adsid: token.adsid,
|
||||
token: token.token,
|
||||
expiry: token.expiry,
|
||||
teamID: team.id.rawValue
|
||||
teamID: team.id.rawValue,
|
||||
anisetteProviderID: anisetteProvider.providerID
|
||||
))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,6 +9,7 @@ enum AuthToken: Codable, CustomStringConvertible {
|
||||
var token: String
|
||||
var expiry: Date
|
||||
var teamID: String
|
||||
var anisetteProviderID: String?
|
||||
}
|
||||
|
||||
struct AppStoreConnect: Codable {
|
||||
@@ -58,7 +59,18 @@ extension AuthToken {
|
||||
guard let data = try storage.data(forKey: "XTLAuthToken") else {
|
||||
return nil
|
||||
}
|
||||
return try decoder.decode(AuthToken.self, from: data)
|
||||
let decoded = try decoder.decode(AuthToken.self, from: data)
|
||||
switch decoded {
|
||||
case .xcode(let xcode):
|
||||
@Dependency(\.anisetteDataProvider) var anisetteProvider
|
||||
guard xcode.anisetteProviderID == anisetteProvider.providerID else {
|
||||
try? clear()
|
||||
return nil
|
||||
}
|
||||
case .appStoreConnect:
|
||||
break
|
||||
}
|
||||
return decoded
|
||||
}
|
||||
|
||||
static func clear() throws {
|
||||
|
||||
@@ -37,7 +37,8 @@ enum Console {
|
||||
data += view
|
||||
}
|
||||
}
|
||||
return String(decoding: data, as: UTF8.self)
|
||||
let str = String(decoding: data, as: UTF8.self)
|
||||
return str.hasSuffix("\r") ? String(str.dropLast()) : str
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -4,48 +4,17 @@ import ArgumentParser
|
||||
import Dependencies
|
||||
|
||||
struct DSAnisetteCommand: AsyncParsableCommand {
|
||||
private final class Provider: RawADIProvider, RawADIProvisioningSession {
|
||||
func startProvisioning(spim: Data, userID: UUID) async throws -> (RawADIProvisioningSession, Data) {
|
||||
print("spim: \(spim.base64EncodedString())")
|
||||
return (self, Data(base64Encoded: try await Console.prompt("cpim: "))!)
|
||||
}
|
||||
|
||||
func endProvisioning(
|
||||
routingInfo: UInt64,
|
||||
ptm: Data,
|
||||
tk: Data
|
||||
) async throws -> Data {
|
||||
print("""
|
||||
rinfo: \(routingInfo)
|
||||
ptm: \(ptm.base64EncodedString())
|
||||
tk: \(tk.base64EncodedString())
|
||||
""")
|
||||
return Data(base64Encoded: try await Console.prompt("pinfo: "))!
|
||||
}
|
||||
|
||||
func requestOTP(
|
||||
userID: UUID,
|
||||
routingInfo: inout UInt64,
|
||||
provisioningInfo: Data
|
||||
) -> (machineID: Data, otp: Data) {
|
||||
print("otp; pinfo: \(provisioningInfo)")
|
||||
return (Data(), Data())
|
||||
}
|
||||
}
|
||||
|
||||
static let configuration = CommandConfiguration(
|
||||
commandName: "anisette",
|
||||
abstract: "Test out Anisette data"
|
||||
)
|
||||
|
||||
func run() async throws {
|
||||
let provider = withDependencies {
|
||||
$0.rawADIProvider = Provider()
|
||||
} operation: {
|
||||
ADIDataProvider()
|
||||
}
|
||||
@Dependency(\.anisetteDataProvider) var provider
|
||||
let res = try await provider.fetchAnisetteData()
|
||||
print(res)
|
||||
for (key, value) in res.dictionary.sorted(by: { $0.key < $1.key }) {
|
||||
print("\(key): \(value)")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
import ArgumentParser
|
||||
import Foundation
|
||||
import XKit
|
||||
import PackLib
|
||||
import Subprocess
|
||||
|
||||
struct DevBSPCommand: AsyncParsableCommand {
|
||||
static let configuration = CommandConfiguration(
|
||||
commandName: "build-server",
|
||||
abstract: "Run build server",
|
||||
)
|
||||
|
||||
@Option
|
||||
var triple: String?
|
||||
|
||||
func run() async throws {
|
||||
guard try await SwiftVersion.current.supportsSwiftBuild else {
|
||||
throw Console.Error("`xtool dev build-server` requires Swift 6.4 or later")
|
||||
}
|
||||
let settings = try await BuildSettings(
|
||||
configuration: .debug,
|
||||
triple: triple ?? PackOperation.defaultTriple
|
||||
)
|
||||
try await Subprocess.run(
|
||||
settings.buildServerInvocation(),
|
||||
input: .currentStandardInput,
|
||||
output: .currentStandardOutput,
|
||||
error: .currentStandardError,
|
||||
)
|
||||
.checkSuccess()
|
||||
}
|
||||
}
|
||||
@@ -27,6 +27,17 @@ struct PackOperation {
|
||||
|
||||
@discardableResult
|
||||
func run() async throws -> URL {
|
||||
// TODO: support running inside a child directory
|
||||
|
||||
let contents = try FileManager.default.contentsOfDirectory(atPath: ".")
|
||||
guard contents.contains("Package.swift")
|
||||
|| contents.contains(where: { $0.hasPrefix("Package@") && $0.hasSuffix(".swift") })
|
||||
else {
|
||||
throw Console.Error("Could not find Package.swift in this directory.")
|
||||
}
|
||||
|
||||
try await EnsureSDKOperation(quiet: true).run()
|
||||
|
||||
print("Planning...")
|
||||
|
||||
let schema: PackSchema
|
||||
@@ -41,6 +52,8 @@ struct PackOperation {
|
||||
""")
|
||||
}
|
||||
|
||||
await LSPConfig.tryEnsure(using: schema)
|
||||
|
||||
let buildSettings = try await BuildSettings(
|
||||
configuration: buildOptions.configuration,
|
||||
triple: triple ?? Self.defaultTriple,
|
||||
@@ -53,11 +66,9 @@ struct PackOperation {
|
||||
)
|
||||
let plan = try await planner.createPlan()
|
||||
|
||||
#if os(macOS)
|
||||
if xcode {
|
||||
return try await XcodePacker(plan: plan).createProject()
|
||||
}
|
||||
#endif
|
||||
|
||||
let packer = Packer(
|
||||
buildSettings: buildSettings,
|
||||
@@ -96,12 +107,12 @@ struct PackOperation {
|
||||
struct DevXcodeCommand: AsyncParsableCommand {
|
||||
static let configuration = CommandConfiguration(
|
||||
commandName: "generate-xcode-project",
|
||||
abstract: "Generate Xcode project",
|
||||
discussion: "This option does nothing on Linux"
|
||||
abstract: "Generate Xcode project"
|
||||
)
|
||||
|
||||
func run() async throws {
|
||||
try await PackOperation(xcode: true).run()
|
||||
let result = try await PackOperation(xcode: true).run()
|
||||
print("Wrote to \(result.path)")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -274,6 +285,7 @@ struct DevCommand: AsyncParsableCommand {
|
||||
DevXcodeCommand.self,
|
||||
DevBuildCommand.self,
|
||||
DevRunCommand.self,
|
||||
DevBSPCommand.self,
|
||||
],
|
||||
defaultSubcommand: DevRunCommand.self
|
||||
)
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
import Foundation
|
||||
import PackLib
|
||||
|
||||
enum LSPConfig {
|
||||
static let bsp: (String, String) = (
|
||||
".bsp/xtool.json",
|
||||
"""
|
||||
{
|
||||
"name": "xtool",
|
||||
"version": "1.0",
|
||||
"bspVersion": "2.2.0",
|
||||
"languages": ["c", "cpp", "objective-c", "objective-cpp", "swift"],
|
||||
"argv": ["/usr/bin/env", "xtool", "dev", "build-server"]
|
||||
}
|
||||
"""
|
||||
)
|
||||
|
||||
static let legacyLSP: (String, String) = (
|
||||
".sourcekit-lsp/config.json",
|
||||
"""
|
||||
{
|
||||
"swiftPM": {
|
||||
"swiftSDK": "arm64-apple-ios"
|
||||
}
|
||||
}
|
||||
"""
|
||||
)
|
||||
|
||||
nonisolated(nonsending) static func tryEnsure(
|
||||
using schema: PackSchema,
|
||||
quiet: Bool = false,
|
||||
currentDirectory directory: URL = URL(filePath: FileManager.default.currentDirectoryPath)
|
||||
) async {
|
||||
do {
|
||||
try await ensure(using: schema, quiet: quiet, currentDirectory: directory)
|
||||
} catch {
|
||||
print("warning: failed to validate LSP configuration: \(error)")
|
||||
}
|
||||
}
|
||||
|
||||
nonisolated(nonsending) static func ensure(
|
||||
using schema: PackSchema,
|
||||
quiet: Bool = false,
|
||||
currentDirectory directory: URL = URL(filePath: FileManager.default.currentDirectoryPath)
|
||||
) async throws {
|
||||
if schema.skipLSP == true {
|
||||
return
|
||||
}
|
||||
|
||||
if try await SwiftVersion.current.supportsSwiftBuild {
|
||||
try await ensure(primary: bsp, secondary: legacyLSP, quiet: quiet, currentDirectory: directory)
|
||||
} else {
|
||||
try await ensure(primary: legacyLSP, secondary: bsp, quiet: quiet, currentDirectory: directory)
|
||||
}
|
||||
}
|
||||
|
||||
// creates the primary LSP-support file if it doesn't exist, and cleans up old files
|
||||
private nonisolated(nonsending) static func ensure(
|
||||
primary: (String, String),
|
||||
secondary: (String, String),
|
||||
quiet: Bool,
|
||||
currentDirectory directory: URL
|
||||
) async throws {
|
||||
let primaryURL = directory.appendingPathComponent(primary.0)
|
||||
if FileManager.default.fileExists(atPath: primaryURL.path) {
|
||||
return
|
||||
}
|
||||
|
||||
try? FileManager.default.createDirectory(
|
||||
at: primaryURL.deletingLastPathComponent(),
|
||||
withIntermediateDirectories: true
|
||||
)
|
||||
try Data((primary.1 + "\n").utf8).write(to: primaryURL)
|
||||
|
||||
let secondaryURL = directory.appendingPathComponent(secondary.0)
|
||||
if let secondaryData = try? await Data(reading: secondaryURL),
|
||||
let secondaryString = String(data: secondaryData, encoding: .utf8),
|
||||
secondaryString.trimmingCharacters(in: .whitespacesAndNewlines) == secondary.1 {
|
||||
try? FileManager.default.removeItem(at: secondaryURL)
|
||||
}
|
||||
|
||||
if !quiet {
|
||||
print("""
|
||||
[LSP] Created \(primary.0) for enhanced IDE support. You may
|
||||
need to restart your editor for the change to take effect.
|
||||
You can disable this with `skipLSP: true` in xtool.yml.
|
||||
""")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -120,17 +120,6 @@ struct NewCommand: AsyncParsableCommand {
|
||||
"""
|
||||
),
|
||||
|
||||
(
|
||||
".sourcekit-lsp/config.json",
|
||||
"""
|
||||
{
|
||||
"swiftPM": {
|
||||
"swiftSDK": "arm64-apple-ios"
|
||||
}
|
||||
}
|
||||
"""
|
||||
),
|
||||
|
||||
(
|
||||
"Sources/\(moduleName)/\(moduleName)App.swift",
|
||||
"""
|
||||
@@ -177,6 +166,12 @@ struct NewCommand: AsyncParsableCommand {
|
||||
try "\(contents)\n".write(to: url, atomically: true, encoding: .utf8)
|
||||
}
|
||||
|
||||
await LSPConfig.tryEnsure(
|
||||
using: .default,
|
||||
quiet: true,
|
||||
currentDirectory: baseURL,
|
||||
)
|
||||
|
||||
print("\nFinished generating project \(name). Next steps:")
|
||||
print("- Enter the directory with `cd \(name)`")
|
||||
print("- Build and run with `xtool dev`")
|
||||
|
||||
@@ -5,6 +5,7 @@ import Subprocess
|
||||
import XKit // HTTPClient, stdoutSafe
|
||||
import XUtils // System.File{Path,Descriptor}
|
||||
|
||||
// swiftlint:disable:next type_body_length
|
||||
struct SDKBuilder {
|
||||
enum Arch: String {
|
||||
case x86_64
|
||||
@@ -52,13 +53,45 @@ struct SDKBuilder {
|
||||
}
|
||||
}
|
||||
|
||||
enum Mode {
|
||||
/// Create a slim SDK with just the files that this version of xtool uses
|
||||
case buildSlim
|
||||
/// Create an SDK that retains a full copy of Xcode.app/Contents/Developer.
|
||||
/// Larger but allows in-place updates.
|
||||
case buildNormal
|
||||
/// Update a normal SDK in-place.
|
||||
case update
|
||||
|
||||
var usesHardLinks: Bool {
|
||||
switch self {
|
||||
case .buildSlim: false
|
||||
case .buildNormal, .update: true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let input: Input
|
||||
let output: URL
|
||||
let arch: Arch
|
||||
let mode: Mode
|
||||
|
||||
// bump this when the sdk builder logic changes
|
||||
static let sdkEpoch = 4
|
||||
|
||||
// tag from https://github.com/xtool-org/darwin-tools-linux-llvm
|
||||
static let darwinToolsVersion = "1.1.0"
|
||||
// tag from https://github.com/xtool-org/OpenAppleMacros
|
||||
static let oamVersion = "1.4.1"
|
||||
|
||||
static var currentSDKVersion: String {
|
||||
"""
|
||||
epoch=\(sdkEpoch),darwinTools=\(darwinToolsVersion),oam=\(oamVersion)
|
||||
"""
|
||||
}
|
||||
|
||||
// swiftlint:disable:next function_body_length
|
||||
func buildSDK() async throws {
|
||||
// TODO: store relevant info for staleness check
|
||||
let sdkVersion = "develop"
|
||||
let sdkVersion = Self.currentSDKVersion
|
||||
|
||||
try? FileManager.default.removeItem(at: output)
|
||||
try FileManager.default.createDirectory(
|
||||
@@ -66,9 +99,11 @@ struct SDKBuilder {
|
||||
withIntermediateDirectories: true
|
||||
)
|
||||
|
||||
// TODO: parallelize these two steps
|
||||
// TODO: parallelize these three steps
|
||||
// we need to synchronize progress reporting though
|
||||
|
||||
try await installMacros(in: output)
|
||||
|
||||
try await installToolset(in: output)
|
||||
|
||||
let dev = try await installDeveloper(in: output)
|
||||
@@ -136,6 +171,9 @@ struct SDKBuilder {
|
||||
"linker": {
|
||||
"path": "ld64.lld"
|
||||
},
|
||||
"librarian": {
|
||||
"path": "llvm-lib"
|
||||
},
|
||||
"swiftCompiler": {
|
||||
"extraCLIOptions": [
|
||||
"-Xfrontend", "-enable-cross-import-overlays",
|
||||
@@ -149,6 +187,31 @@ struct SDKBuilder {
|
||||
encoding: .utf8
|
||||
)
|
||||
|
||||
// this toolset works with the swiftbuild system on Linux
|
||||
// note that we need Swift 6.4+ because 6.3 has bugs in
|
||||
// resolving the librarian and linker paths.
|
||||
try """
|
||||
{
|
||||
"schemaVersion": "1.0",
|
||||
"rootPath": "toolset/bin",
|
||||
"linker": {
|
||||
"path": "ld64.lld"
|
||||
},
|
||||
"librarian": {
|
||||
"path": "llvm-lib"
|
||||
},
|
||||
"swiftCompiler": {
|
||||
"extraCLIOptions": [
|
||||
"-Xfrontend", "-enable-cross-import-overlays"
|
||||
]
|
||||
}
|
||||
}
|
||||
""".write(
|
||||
to: output.appendingPathComponent("toolset-swb.json"),
|
||||
atomically: false,
|
||||
encoding: .utf8
|
||||
)
|
||||
|
||||
let sdkDefinition = SDKDefinition(
|
||||
schemaVersion: "4.0",
|
||||
targetTriples: [
|
||||
@@ -169,24 +232,36 @@ struct SDKBuilder {
|
||||
.write(to: output.appendingPathComponent("darwin-sdk-version.txt"))
|
||||
}
|
||||
|
||||
private func installToolset(in output: URL) async throws {
|
||||
// tag from https://github.com/xtool-org/darwin-tools-linux-llvm
|
||||
let darwinToolsVersion = "1.0.1"
|
||||
|
||||
let toolsetDir = output.appendingPathComponent("toolset")
|
||||
|
||||
private func fetchTarball(
|
||||
url: URL,
|
||||
destination directory: URL,
|
||||
displayName: String,
|
||||
envOverride: String? = nil,
|
||||
) async throws {
|
||||
try FileManager.default.createDirectory(
|
||||
at: toolsetDir,
|
||||
at: directory,
|
||||
withIntermediateDirectories: false
|
||||
)
|
||||
|
||||
if let envOverride, let path = ProcessInfo.processInfo.environment[envOverride] {
|
||||
let archive = URL(fileURLWithPath: path)
|
||||
print("[Extracting \(displayName)] \(archive.path)")
|
||||
try await Subprocess.run(
|
||||
.name("tar"),
|
||||
arguments: ["xzf", archive.path],
|
||||
workingDirectory: FilePath(directory),
|
||||
output: .discarded,
|
||||
error: .discarded,
|
||||
)
|
||||
.checkSuccess()
|
||||
return
|
||||
}
|
||||
|
||||
@Dependency(\.httpClient) var httpClient
|
||||
let url = URL(string: """
|
||||
https://github.com/xtool-org/darwin-tools-linux-llvm/releases/download/\
|
||||
v\(darwinToolsVersion)/toolset-\(arch.rawValue).tar.gz
|
||||
""")!
|
||||
let (response, body) = try await httpClient.send(HTTPRequest(url: url))
|
||||
guard response.status == 200, let body else { throw Console.Error("Could not fetch toolset") }
|
||||
guard response.status == 200, let body else {
|
||||
throw Console.Error("Could not fetch tarball at \(url)")
|
||||
}
|
||||
let length: Int64? = switch body.length {
|
||||
case .known(let known): known
|
||||
case .unknown: nil
|
||||
@@ -196,7 +271,7 @@ struct SDKBuilder {
|
||||
try await Subprocess.run(
|
||||
.name("tar"),
|
||||
arguments: ["xzf", "-"],
|
||||
workingDirectory: FilePath(toolsetDir),
|
||||
workingDirectory: FilePath(directory),
|
||||
input: .inputWriter,
|
||||
output: .discarded,
|
||||
error: .discarded,
|
||||
@@ -211,7 +286,7 @@ struct SDKBuilder {
|
||||
|
||||
guard let length else { continue }
|
||||
let progress = Int(Double(totalWritten) / Double(length) * 100)
|
||||
print("\r[Downloading toolset] \(progress)%", terminator: "")
|
||||
print("\r[Downloading \(displayName)] \(progress)%", terminator: "")
|
||||
fflush(stdoutSafe)
|
||||
}
|
||||
}
|
||||
@@ -220,27 +295,181 @@ struct SDKBuilder {
|
||||
.checkSuccess()
|
||||
}
|
||||
|
||||
// swiftlint:disable:next function_body_length
|
||||
private func installToolset(in output: URL) async throws {
|
||||
let toolsetDir = output.appendingPathComponent("toolset")
|
||||
let url = URL(string: """
|
||||
https://github.com/xtool-org/darwin-tools-linux-llvm/releases/download/\
|
||||
v\(Self.darwinToolsVersion)/toolset-\(arch.rawValue).tar.gz
|
||||
""")!
|
||||
try await fetchTarball(
|
||||
url: url,
|
||||
destination: toolsetDir,
|
||||
displayName: "toolset",
|
||||
envOverride: "XTL_TOOLSET_TARBALL",
|
||||
)
|
||||
|
||||
// swift-build assumes we have an Apple-flavored librarian for Apple platforms
|
||||
// (https://github.com/swiftlang/swift-build/blob/b2433e74e/Sources/SWBCore/SpecImplementations/Tools/LinkerTools.swift#L1735)
|
||||
// but allows us to override this assumption if we explicitly provide the name llvm-lib (look a few lines above in that file)
|
||||
try FileManager.default.moveItem(
|
||||
at: toolsetDir.appending(path: "bin/libtool"),
|
||||
to: toolsetDir.appending(path: "bin/llvm-lib")
|
||||
)
|
||||
|
||||
let ld64 = toolsetDir.appending(path: "bin/ld64.lld")
|
||||
let origBins = toolsetDir.appending(path: "bin/orig")
|
||||
let origLD64 = origBins.appending(path: "ld64.lld")
|
||||
try FileManager.default.createDirectory(at: origBins, withIntermediateDirectories: false)
|
||||
try FileManager.default.moveItem(at: ld64, to: origLD64)
|
||||
|
||||
// this terrible hack works around the fact that lld doesn't support the -r option,
|
||||
// which merges multiple object files into one (used by SPM's SWB backend to combine
|
||||
// per-file MachOs into a single one for the module, on Darwin).
|
||||
//
|
||||
// so instead, we write a trampoline that intercepts `ld64.lld -r` and instead runs
|
||||
// libtool to build a static archive.
|
||||
try """
|
||||
#!/bin/sh
|
||||
|
||||
set -eu
|
||||
|
||||
case "$0" in
|
||||
*/*) script_path="$0" ;;
|
||||
*) script_path="$(command -v "$0")" ;;
|
||||
esac
|
||||
case "$script_path" in
|
||||
/*) script_dir="${script_path%/*}"; [ -n "$script_dir" ] || script_dir="/" ;;
|
||||
*/*) script_dir="${script_path%/*}" ;;
|
||||
*) script_dir="." ;;
|
||||
esac
|
||||
bin_dir="$(CDPATH= cd -P "$script_dir" && pwd -P)"
|
||||
|
||||
find_argument_value() {
|
||||
argument_name="$1"
|
||||
shift
|
||||
|
||||
while [ "$#" -gt 0 ]; do
|
||||
if [ "$1" = "$argument_name" ]; then
|
||||
shift
|
||||
if [ "$#" -gt 0 ]; then
|
||||
argument_value="$1"
|
||||
return 0
|
||||
fi
|
||||
return 1
|
||||
fi
|
||||
shift
|
||||
done
|
||||
|
||||
return 1
|
||||
}
|
||||
|
||||
relocatable=
|
||||
for argument do
|
||||
if [ "$argument" = "-r" ]; then
|
||||
relocatable=1
|
||||
fi
|
||||
done
|
||||
|
||||
if [ -n "$relocatable" ]; then
|
||||
missing_argument=
|
||||
|
||||
if find_argument_value -filelist "$@"; then
|
||||
filelist="$argument_value"
|
||||
else
|
||||
missing_argument=1
|
||||
fi
|
||||
if find_argument_value -dependency_info "$@"; then
|
||||
dependency_info="$argument_value"
|
||||
else
|
||||
missing_argument=1
|
||||
fi
|
||||
if find_argument_value -o "$@"; then
|
||||
output="$argument_value"
|
||||
else
|
||||
missing_argument=1
|
||||
fi
|
||||
|
||||
if [ -n "$missing_argument" ]; then
|
||||
echo "ld64.lld trampoline could not process arguments." >&2
|
||||
echo "Please file an issue at https://github.com/xtool-org/xtool/issues" >&2
|
||||
echo " Arguments: $@" >&2
|
||||
exit 2
|
||||
fi
|
||||
|
||||
exec "$bin_dir/llvm-lib" -static \
|
||||
-filelist "$filelist" \
|
||||
-dependency_info "$dependency_info" \
|
||||
-o "$output"
|
||||
fi
|
||||
|
||||
exec "$bin_dir/orig/ld64.lld" "$@"
|
||||
""".write(
|
||||
to: ld64,
|
||||
atomically: false,
|
||||
encoding: .utf8
|
||||
)
|
||||
// set -x
|
||||
try FileManager.default.setAttributes([.posixPermissions: 0o755], ofItemAtPath: ld64.path)
|
||||
}
|
||||
|
||||
private func installMacros(in output: URL) async throws {
|
||||
let url = URL(string: """
|
||||
https://github.com/xtool-org/OpenAppleMacros/releases/download/\
|
||||
v\(Self.oamVersion)/OpenAppleMacrosServer-\(arch.rawValue).tar.gz
|
||||
""")!
|
||||
let macrosDir = output.appendingPathComponent("OpenAppleMacros")
|
||||
try await fetchTarball(
|
||||
url: url,
|
||||
destination: macrosDir,
|
||||
displayName: "OpenAppleMacros",
|
||||
envOverride: "XTL_OAM_TARBALL",
|
||||
)
|
||||
|
||||
struct MacrosInfo: Decodable {
|
||||
var plugins: [String]
|
||||
}
|
||||
let macrosInfo = try JSONDecoder().decode(
|
||||
MacrosInfo.self,
|
||||
from: Data(contentsOf: macrosDir.appendingPathComponent("info.json"))
|
||||
)
|
||||
try FileManager.default.moveItem(
|
||||
at: macrosDir.appendingPathComponent("OpenAppleMacrosServer"),
|
||||
to: output.appendingPathComponent("OpenAppleMacrosServer")
|
||||
)
|
||||
try FileManager.default.removeItem(at: macrosDir)
|
||||
|
||||
let pluginsDir = output.appendingPathComponent("OpenAppleMacrosPlugins")
|
||||
try FileManager.default.createDirectory(at: pluginsDir, withIntermediateDirectories: false)
|
||||
// create a lib*.so file for each macro 'library' that we support.
|
||||
// the files are stubs (empty) because we just need them to convince swiftc that
|
||||
// yes we can handle said modules. the actual logic lives in the OpenAppleMacros
|
||||
// server.
|
||||
for library in macrosInfo.plugins {
|
||||
let target = pluginsDir.appendingPathComponent("lib\(library).so")
|
||||
try Data().write(to: target)
|
||||
}
|
||||
}
|
||||
|
||||
private static let expectedXcodeChildren = ["Info.plist", "version.plist", "Developer"]
|
||||
|
||||
// swiftlint:disable:next cyclomatic_complexity function_body_length
|
||||
private func installDeveloper(in output: URL) async throws -> URL {
|
||||
let dev = output.appendingPathComponent("Developer")
|
||||
|
||||
let expectedAppDir = output.appendingPathComponent("Xcode.app")
|
||||
let appDir: URL
|
||||
let cleanupStageDir: URL?
|
||||
let wanted: Int?
|
||||
|
||||
switch input {
|
||||
case .xip(let inputPath):
|
||||
let devStage = output.appendingPathComponent("DeveloperStage")
|
||||
try FileManager.default.createDirectory(at: devStage, withIntermediateDirectories: false)
|
||||
// unxip doesn't like cooperative cancellation atm so shield it.
|
||||
// if the user does a ^C during unxip, we'll just wait until extraction
|
||||
// is over before bailing
|
||||
wanted = try await Task {
|
||||
try await extractXIP(inputPath: inputPath, outDir: devStage.path)
|
||||
}.value
|
||||
switch (input, mode) {
|
||||
case (.xip(let inputPath), .buildSlim):
|
||||
let stage = output.appendingPathComponent("DeveloperStage")
|
||||
try FileManager.default.createDirectory(at: stage, withIntermediateDirectories: false)
|
||||
wanted = try await extractXIP(inputPath: inputPath, outDir: stage.path)
|
||||
try Task.checkCancellation()
|
||||
let contents = try FileManager.default.contentsOfDirectory(
|
||||
at: devStage,
|
||||
at: stage,
|
||||
includingPropertiesForKeys: nil
|
||||
)
|
||||
let apps = contents.filter { $0.pathExtension == "app" }
|
||||
@@ -252,12 +481,45 @@ struct SDKBuilder {
|
||||
default:
|
||||
throw Console.Error("Unrecognized xip layout (multiple apps found)")
|
||||
}
|
||||
cleanupStageDir = devStage
|
||||
case .app(let appPath):
|
||||
wanted = nil
|
||||
cleanupStageDir = stage
|
||||
case (.xip(let inputPath), .buildNormal):
|
||||
wanted = try await extractXIP(inputPath: inputPath, outDir: output.path)
|
||||
appDir = expectedAppDir
|
||||
cleanupStageDir = nil
|
||||
try cleanUpXcode(appDir)
|
||||
case (.xip, .update):
|
||||
throw Console.Error("Can't update with xip input")
|
||||
case (.app(let appPath), .buildSlim):
|
||||
appDir = URL(fileURLWithPath: appPath)
|
||||
wanted = nil
|
||||
cleanupStageDir = nil
|
||||
case (.app(let appPath), .update):
|
||||
appDir = URL(fileURLWithPath: appPath)
|
||||
wanted = nil
|
||||
cleanupStageDir = nil
|
||||
try cleanUpXcode(appDir)
|
||||
case (.app(let appPath), .buildNormal):
|
||||
let source = URL(fileURLWithPath: appPath)
|
||||
let sourceContentsDir = source.appendingPathComponent("Contents")
|
||||
let expectedContentsDir = expectedAppDir.appendingPathComponent("Contents")
|
||||
try FileManager.default.createDirectory(at: expectedContentsDir, withIntermediateDirectories: true)
|
||||
print("[Copying Xcode.app] This might take a minute...")
|
||||
for child in Self.expectedXcodeChildren {
|
||||
let expectedFile = expectedContentsDir.appendingPathComponent(child)
|
||||
let sourceFile = sourceContentsDir.appendingPathComponent(child)
|
||||
guard FileManager.default.fileExists(atPath: sourceFile.path) else {
|
||||
throw Console.Error("""
|
||||
The provided directory at '\(appPath)' does not appear to be a known version of Xcode: \
|
||||
could not read '\(sourceFile.path)'
|
||||
""")
|
||||
}
|
||||
try await FileManager.default.copyItem(at: sourceFile, to: expectedFile, preserveOwner: false)
|
||||
}
|
||||
appDir = expectedAppDir
|
||||
wanted = nil
|
||||
cleanupStageDir = nil
|
||||
}
|
||||
try Task.checkCancellation()
|
||||
|
||||
try FileManager.default.createDirectory(at: dev, withIntermediateDirectories: false)
|
||||
|
||||
@@ -280,7 +542,7 @@ struct SDKBuilder {
|
||||
}
|
||||
if count % 100 == 0 {
|
||||
if wanted == nil {
|
||||
print("\r[Installing SDKs] Copied \(count) files", terminator: "")
|
||||
print("\r[Installing SDKs] Installed \(count) files", terminator: "")
|
||||
fflush(stdoutSafe)
|
||||
}
|
||||
await Task.yield()
|
||||
@@ -293,7 +555,11 @@ struct SDKBuilder {
|
||||
if try child.resourceValues(forKeys: [.isDirectoryKey]).isDirectory == true {
|
||||
toDoDirs.append(path)
|
||||
try FileManager.default.createDirectory(at: dest, withIntermediateDirectories: false)
|
||||
} else if mode.usesHardLinks {
|
||||
// Installed SDKs retain Xcode.app developer dir, so avoid storing their developer files twice.
|
||||
try FileManager.default.linkItem(at: child, to: dest)
|
||||
} else {
|
||||
// Slim SDKs omit Xcode.app and contain independent copies.
|
||||
try FileManager.default.copyItem(at: child, to: dest)
|
||||
}
|
||||
}
|
||||
@@ -305,51 +571,77 @@ struct SDKBuilder {
|
||||
}
|
||||
print()
|
||||
|
||||
print("[Cleaning up]")
|
||||
if let cleanupStageDir {
|
||||
try? FileManager.default.removeItem(at: cleanupStageDir)
|
||||
print("[Cleaning up]")
|
||||
try FileManager.default.removeItem(at: cleanupStageDir)
|
||||
}
|
||||
|
||||
print("[Finalizing SDKs]")
|
||||
|
||||
/*
|
||||
XCTest and Testing.framework are located in *.platform/Developer/{Library/Frameworks,usr/lib} rather than inside
|
||||
the SDK. These search paths are explicitly included when building tests, which presumably ensures that normal
|
||||
applications don't accidentally link against them in production.
|
||||
|
||||
SwiftPM makes no such affordances outside of macOS, so we add the usr/lib path as include/library search paths
|
||||
in the SDK config, and symlink the frameworks into the SDKs (since there's no frameworkSearchPaths option).
|
||||
While this drops a safeguard it's better than not having the testing libs at all.
|
||||
*/
|
||||
|
||||
for platform in ["iPhoneOS", "MacOSX", "iPhoneSimulator"] {
|
||||
let lib = "../../../../../Library"
|
||||
let dest = dev.appendingPathComponent("""
|
||||
Platforms/\(platform).platform/Developer/SDKs/\(platform).sdk\
|
||||
/System/Library/Frameworks
|
||||
""").path
|
||||
let platformDir = dev.appending(path: "Platforms/\(platform).platform")
|
||||
|
||||
try patchPlatformManifest(path: platformDir.appending(path: "Info.plist"))
|
||||
|
||||
/*
|
||||
XCTest and Testing.framework are located in *.platform/Developer/{Library/Frameworks,usr/lib} rather than inside
|
||||
the SDK. These search paths are explicitly included when building tests, which presumably ensures that normal
|
||||
applications don't accidentally link against them in production.
|
||||
|
||||
SwiftPM makes no such affordances outside of macOS, so we add the usr/lib path as include/library search paths
|
||||
in the SDK config, and symlink the frameworks into the SDKs (since there's no frameworkSearchPaths option).
|
||||
While this drops a safeguard it's better than not having the testing libs at all.
|
||||
*/
|
||||
|
||||
let fwk = platformDir.appending(path: "Developer/SDKs/\(platform).sdk/System/Library/Frameworks").path
|
||||
|
||||
try FileManager.default.createSymbolicLink(
|
||||
atPath: "\(dest)/Testing.framework",
|
||||
atPath: "\(fwk)/Testing.framework",
|
||||
withDestinationPath: "\(lib)/Frameworks/Testing.framework"
|
||||
)
|
||||
|
||||
try FileManager.default.createSymbolicLink(
|
||||
atPath: "\(dest)/XCTest.framework",
|
||||
atPath: "\(fwk)/XCTest.framework",
|
||||
withDestinationPath: "\(lib)/Frameworks/XCTest.framework"
|
||||
)
|
||||
|
||||
try FileManager.default.createSymbolicLink(
|
||||
atPath: "\(dest)/XCUIAutomation.framework",
|
||||
atPath: "\(fwk)/XCUIAutomation.framework",
|
||||
withDestinationPath: "\(lib)/Frameworks/XCUIAutomation.framework"
|
||||
)
|
||||
|
||||
try FileManager.default.createSymbolicLink(
|
||||
atPath: "\(dest)/XCTestCore.framework",
|
||||
atPath: "\(fwk)/XCTestCore.framework",
|
||||
withDestinationPath: "\(lib)/PrivateFrameworks/XCTestCore.framework"
|
||||
)
|
||||
|
||||
/*
|
||||
Apply patches to load OpenAppleMacros as the swift-plugin-server
|
||||
*/
|
||||
|
||||
let bin = platformDir.appendingPathComponent("Developer/usr/bin")
|
||||
let pluginServer = bin.appendingPathComponent("swift-plugin-server")
|
||||
try? FileManager.default.createDirectory(at: bin, withIntermediateDirectories: true)
|
||||
try? FileManager.default.removeItem(at: pluginServer)
|
||||
try FileManager.default.createSymbolicLink(
|
||||
atPath: pluginServer.path,
|
||||
withDestinationPath: "../../../../../../OpenAppleMacrosServer"
|
||||
)
|
||||
|
||||
let hostDir = platformDir.appendingPathComponent("Developer/usr/lib/swift/host")
|
||||
let pluginsDir = hostDir.appendingPathComponent("plugins")
|
||||
|
||||
try FileManager.default.createDirectory(at: hostDir, withIntermediateDirectories: true)
|
||||
try? FileManager.default.removeItem(at: pluginsDir)
|
||||
try FileManager.default.createSymbolicLink(
|
||||
atPath: pluginsDir.path,
|
||||
withDestinationPath: "../../../../../../../../OpenAppleMacrosPlugins"
|
||||
)
|
||||
}
|
||||
|
||||
// we copy over the host's clang resorurce dir during install, because intrinsics can differ
|
||||
// by LLVM version
|
||||
try FileManager.default.removeItem(
|
||||
at: dev.appending(path: "Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/clang/include")
|
||||
)
|
||||
@@ -357,9 +649,62 @@ struct SDKBuilder {
|
||||
return dev
|
||||
}
|
||||
|
||||
/// Removes unneeded files from a copy of Xcode.app that's owned by xtool.
|
||||
///
|
||||
/// This is conservative: we keep anything that we expect _might_ be necessary
|
||||
/// even in a future update of xtool, so that SDK self-updates work. We only
|
||||
/// delete files that we're relatively confident won't be needed.
|
||||
///
|
||||
/// - Important: ONLY call this if we own appDir, lest we delete files from the user's Xcode.
|
||||
private func cleanUpXcode(_ appDir: URL) throws {
|
||||
let contentsDir = appDir.appendingPathComponent("Contents")
|
||||
let contents = try FileManager.default.contentsOfDirectory(
|
||||
at: contentsDir,
|
||||
includingPropertiesForKeys: nil
|
||||
)
|
||||
let expectedChildren = Set(Self.expectedXcodeChildren)
|
||||
let missingChildren = expectedChildren.subtracting(contents.map(\.lastPathComponent))
|
||||
guard missingChildren.isEmpty else {
|
||||
let missing = missingChildren.sorted().joined(separator: ", ")
|
||||
throw Console.Error("Unrecognized xip layout: missing \(missing)")
|
||||
}
|
||||
for child in contents where !expectedChildren.contains(child.lastPathComponent) {
|
||||
try FileManager.default.removeItem(at: child)
|
||||
}
|
||||
}
|
||||
|
||||
private func extractXIP(inputPath: String, outDir: String) async throws -> Int {
|
||||
// unxip doesn't like cooperative cancellation atm so shield it.
|
||||
// if the user does a ^C during unxip, we'll just wait until extraction
|
||||
// is over before bailing
|
||||
try await Task {
|
||||
try await _extractXIP(inputPath: inputPath, outDir: outDir)
|
||||
}.value
|
||||
}
|
||||
|
||||
private func patchPlatformManifest(path: URL) throws {
|
||||
let data = try Data(contentsOf: path)
|
||||
guard var plist = try PropertyListSerialization.propertyList(from: data, options: [], format: nil) as? [String: Any] else {
|
||||
throw Console.Error("Could not read '\(path.path)'")
|
||||
}
|
||||
|
||||
var defaultProperties = (plist["DefaultProperties"] as? [String: Any]) ?? [:]
|
||||
defaultProperties["SWIFT_RESOURCE_DIR"] = "$(PLATFORM_DIR)/../../Toolchains/XcodeDefault.xctoolchain/usr/lib/swift"
|
||||
defaultProperties["CLANG_RESOURCE_DIR"] = "$(SWIFT_RESOURCE_DIR)/clang"
|
||||
defaultProperties["ALTERNATE_LINKER"] = "lld"
|
||||
// stub out codesign as /bin/true (SwiftBuild often emits CodeSign tasks, e.g. when
|
||||
// building for sim). we sign post-build.
|
||||
defaultProperties["CODESIGN"] = "true"
|
||||
plist["DefaultProperties"] = defaultProperties
|
||||
|
||||
let newData = try PropertyListSerialization.data(fromPropertyList: plist, format: .xml, options: 0)
|
||||
// a non-atomic write would modify the shared inode that's hard-linked from Xcode.app
|
||||
try newData.write(to: path, options: .atomic)
|
||||
}
|
||||
|
||||
// returns the number of files we actually want to keep,
|
||||
// useful for computing progress % during fs traversal
|
||||
private func extractXIP(inputPath: String, outDir: String) async throws -> Int {
|
||||
private func _extractXIP(inputPath: String, outDir: String) async throws -> Int {
|
||||
let fd = try FileDescriptor.open(inputPath, .readOnly)
|
||||
defer { try? fd.close() }
|
||||
|
||||
@@ -500,13 +845,16 @@ struct SDKEntry {
|
||||
E("clang"),
|
||||
]),
|
||||
E("Platforms", ["iPhoneOS", "MacOSX", "iPhoneSimulator"].map {
|
||||
E("\($0).platform/Developer", [
|
||||
E("SDKs"),
|
||||
E("Library", [
|
||||
E("Frameworks"),
|
||||
E("PrivateFrameworks"),
|
||||
]),
|
||||
E("usr/lib"),
|
||||
E("\($0).platform", [
|
||||
E("Info.plist"),
|
||||
E("Developer", [
|
||||
E("SDKs"),
|
||||
E("Library", [
|
||||
E("Frameworks"),
|
||||
E("PrivateFrameworks"),
|
||||
]),
|
||||
E("usr/lib"),
|
||||
])
|
||||
])
|
||||
}),
|
||||
])
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import Foundation
|
||||
import XKit
|
||||
import Version
|
||||
import ArgumentParser
|
||||
import Dependencies
|
||||
import PackLib
|
||||
@@ -13,6 +12,7 @@ struct SDKCommand: AsyncParsableCommand {
|
||||
abstract: "Manage the Darwin Swift SDK",
|
||||
subcommands: [
|
||||
DevSDKInstallCommand.self,
|
||||
DevSDKUpdateCommand.self,
|
||||
DevSDKRemoveCommand.self,
|
||||
DevSDKBuildCommand.self,
|
||||
DevSDKStatusCommand.self,
|
||||
@@ -49,7 +49,7 @@ struct DevSDKBuildCommand: AsyncParsableCommand {
|
||||
let builderArch = try arch.sdkBuilderArch
|
||||
let input = try SDKBuilder.Input(path: path)
|
||||
let output = URL(fileURLWithPath: outputDir, isDirectory: true).appending(path: "darwin.xtoolsdk")
|
||||
let builder = SDKBuilder(input: input, output: output, arch: builderArch)
|
||||
let builder = SDKBuilder(input: input, output: output, arch: builderArch, mode: .buildSlim)
|
||||
try await builder.buildSDK()
|
||||
print("Built SDK at \(output.path). You can install it with `xtool sdk install`.")
|
||||
}
|
||||
@@ -90,8 +90,24 @@ struct DevSDKInstallCommand: AsyncParsableCommand {
|
||||
)
|
||||
var path: String
|
||||
|
||||
@Flag(
|
||||
help: "Install a slim SDK (uses less disk space). Slim SDKs cannot be updated in place."
|
||||
)
|
||||
var slim = false
|
||||
|
||||
func run() async throws {
|
||||
try await InstallSDKOperation(path: path).run()
|
||||
try await InstallSDKOperation(path: path, slim: slim).run()
|
||||
}
|
||||
}
|
||||
|
||||
struct DevSDKUpdateCommand: AsyncParsableCommand {
|
||||
static let configuration = CommandConfiguration(
|
||||
commandName: "update",
|
||||
abstract: "Update the installed Darwin Swift SDK"
|
||||
)
|
||||
|
||||
func run() async throws {
|
||||
try await UpdateSDKOperation().run()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -102,7 +118,7 @@ struct DevSDKRemoveCommand: AsyncParsableCommand {
|
||||
)
|
||||
|
||||
func run() async throws {
|
||||
guard let sdk = try await DarwinSDK.current() else {
|
||||
guard let sdk = try DarwinSDK.current() else {
|
||||
throw Console.Error("Cannot remove SDK: no Darwin SDK installed")
|
||||
}
|
||||
try sdk.remove()
|
||||
@@ -117,8 +133,11 @@ struct DevSDKStatusCommand: AsyncParsableCommand {
|
||||
)
|
||||
|
||||
func run() async throws {
|
||||
if let sdk = try await DarwinSDK.current() {
|
||||
print("Installed at \(sdk.bundle.path)")
|
||||
if let sdk = try DarwinSDK.current() {
|
||||
print("Darwin SDK is installed")
|
||||
print(" Path: \(sdk.bundle.path)")
|
||||
print(" Flavor: \(sdk.flavor)")
|
||||
print(" Version: \(sdk.version)")
|
||||
} else {
|
||||
print("Not installed")
|
||||
}
|
||||
@@ -127,76 +146,141 @@ struct DevSDKStatusCommand: AsyncParsableCommand {
|
||||
|
||||
extension DarwinSDK {
|
||||
func isUpToDate() -> Bool {
|
||||
true
|
||||
version == SDKBuilder.currentSDKVersion
|
||||
}
|
||||
}
|
||||
|
||||
private enum SwiftVersion {}
|
||||
extension SwiftVersion {
|
||||
static func current() async throws -> Version {
|
||||
let outputString: String?
|
||||
do {
|
||||
outputString = try await Subprocess.run(
|
||||
.name("swift"),
|
||||
arguments: ["--version"],
|
||||
output: .string(limit: .max)
|
||||
)
|
||||
.checkSuccess()
|
||||
.standardOutput
|
||||
} catch {
|
||||
throw Console.Error("Failed to obtain Swift version")
|
||||
struct EnsureSDKOperation {
|
||||
let quiet: Bool
|
||||
|
||||
func run() async throws {
|
||||
#if os(macOS)
|
||||
if !quiet {
|
||||
print("Skipping Darwin SDK setup since we're on macOS.")
|
||||
}
|
||||
var output = outputString?[...] ?? ""
|
||||
if output.hasPrefix("Apple ") {
|
||||
output = output.dropFirst("Apple ".count)
|
||||
#else
|
||||
let sdk = try DarwinSDK.current()
|
||||
switch sdk.map({ ($0.isUpToDate(), $0.flavor) }) {
|
||||
case (true, _)?: // swiftlint:disable:this optional_enum_case_matching
|
||||
if !quiet {
|
||||
print("Darwin SDK is up to date.")
|
||||
}
|
||||
case (false, .slim)?: // swiftlint:disable:this optional_enum_case_matching
|
||||
throw Console.Error("""
|
||||
Darwin SDK is out of date, and was installed in 'slim' mode.
|
||||
|
||||
Slim SDKs take less disk space, but can't be auto-updated.
|
||||
Please install a new SDK with
|
||||
xtool sdk install [--slim]
|
||||
""")
|
||||
case (false, .normal)?: // swiftlint:disable:this optional_enum_case_matching
|
||||
print("Darwin SDK is out of date. Rebuilding...")
|
||||
try await UpdateSDKOperation().run()
|
||||
case (false, .legacy)?: // swiftlint:disable:this optional_enum_case_matching
|
||||
print("""
|
||||
Darwin SDK is incompatible: built with an older version of xtool.
|
||||
|
||||
Requesting re-install. This is a one-time rebuild; after this,
|
||||
xtool will be able to resolve incompatibilities automatically.
|
||||
|
||||
""")
|
||||
try await generateSDK()
|
||||
case nil:
|
||||
print("Now generating the Darwin SDK.\n")
|
||||
try await generateSDK()
|
||||
}
|
||||
guard output.hasPrefix("Swift version ") else {
|
||||
throw Console.Error("Could not parse Swift version: '\(output)'")
|
||||
|
||||
func generateSDK() async throws {
|
||||
let path = try await Console.prompt("""
|
||||
Please download Xcode from http://developer.apple.com/download/all/?q=Xcode
|
||||
and enter the path to the downloaded Xcode.xip.
|
||||
|
||||
Path to Xcode.xip: \("" /* pacify swiftlint trailing_whitespace */)
|
||||
""")
|
||||
|
||||
let expanded = (path as NSString).expandingTildeInPath
|
||||
|
||||
try await InstallSDKOperation(path: expanded).run()
|
||||
}
|
||||
output = output.dropFirst("Swift version ".count)
|
||||
guard let space = output.firstIndex(of: " ") else {
|
||||
throw Console.Error("Could not parse Swift version: '\(output)'")
|
||||
}
|
||||
output = output[..<space]
|
||||
guard let version = Version(tolerant: output) else {
|
||||
throw Console.Error("Could not parse Swift version: '\(output)'")
|
||||
}
|
||||
return version
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
struct InstallSDKOperation {
|
||||
let path: String
|
||||
let slim: Bool
|
||||
|
||||
init(path: String, slim: Bool = false) {
|
||||
self.path = path
|
||||
self.slim = slim
|
||||
}
|
||||
|
||||
func run() async throws {
|
||||
#if os(macOS)
|
||||
print("Skipping SDK install; the iOS SDK ships with Xcode on macOS")
|
||||
#else
|
||||
|
||||
let tempDir = try TemporaryDirectory(name: "DarwinSDKBuild")
|
||||
let sdkPath = tempDir.url.appending(path: "darwin.artifactbundle")
|
||||
let temporaryBundle = try DarwinSDK.prepareTemporaryBundle()
|
||||
|
||||
if path.hasSuffix(".xtoolsdk") {
|
||||
print("Installing prebuilt SDK...")
|
||||
try await FileManager.default.copyItem(at: URL(filePath: path), to: sdkPath, preserveOwner: false)
|
||||
try await FileManager.default.copyItem(at: URL(filePath: path), to: temporaryBundle.url, preserveOwner: false)
|
||||
} else {
|
||||
// validate input before removing existing SDK
|
||||
let input = try SDKBuilder.Input(path: path)
|
||||
let arch = try ArchSelection.auto.sdkBuilderArch
|
||||
|
||||
let builder = SDKBuilder(input: input, output: sdkPath, arch: arch)
|
||||
let mode: SDKBuilder.Mode = slim ? .buildSlim : .buildNormal
|
||||
let builder = SDKBuilder(input: input, output: temporaryBundle.url, arch: arch, mode: mode)
|
||||
try await builder.buildSDK()
|
||||
}
|
||||
|
||||
if let sdk = try await DarwinSDK.current() {
|
||||
if let sdk = try DarwinSDK.current() {
|
||||
print("Removing existing SDK...")
|
||||
try sdk.remove()
|
||||
}
|
||||
|
||||
try await DarwinSDK.install(from: sdkPath.path)
|
||||
|
||||
// don't destroy tempDir before this point
|
||||
withExtendedLifetime(tempDir) {}
|
||||
try await temporaryBundle.install()
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
struct UpdateSDKOperation {
|
||||
func run() async throws {
|
||||
#if os(macOS)
|
||||
print("Skipping SDK install; the iOS SDK ships with Xcode on macOS")
|
||||
#else
|
||||
guard let existing = try DarwinSDK.current() else {
|
||||
throw Console.Error("Could not locate existing SDK; cannot perform update.")
|
||||
}
|
||||
let xcode = existing.bundle.appendingPathComponent("Xcode.app")
|
||||
guard xcode.dirExists else {
|
||||
// This includes prebuilt .xtoolsdk installs and installs created with --slim.
|
||||
throw Console.Error("""
|
||||
The installed SDK was built in 'slim' mode and cannot be updated in place. \
|
||||
Please install a new copy with `xtool sdk install`.
|
||||
""")
|
||||
}
|
||||
|
||||
let input = try SDKBuilder.Input(path: xcode.path)
|
||||
let arch = try ArchSelection.auto.sdkBuilderArch
|
||||
|
||||
let temporaryBundle = try DarwinSDK.prepareTemporaryBundle()
|
||||
let builder = SDKBuilder(input: input, output: temporaryBundle.url, arch: arch, mode: .update)
|
||||
try await builder.buildSDK()
|
||||
|
||||
guard DarwinSDK(bundle: temporaryBundle.url) != nil else {
|
||||
throw Console.Error("Invalid Darwin SDK at '\(temporaryBundle.url.path)'")
|
||||
}
|
||||
|
||||
try FileManager.default.moveItem(
|
||||
at: xcode,
|
||||
to: temporaryBundle.url.appendingPathComponent("Xcode.app")
|
||||
)
|
||||
try existing.remove()
|
||||
try await temporaryBundle.install()
|
||||
|
||||
print("Updated SDK")
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,36 +24,6 @@ struct SetupOperation {
|
||||
|
||||
func run() async throws {
|
||||
try await AuthOperation(logoutFromExisting: false, quiet: quiet).run()
|
||||
|
||||
#if os(macOS)
|
||||
if !quiet {
|
||||
print("Skipping Darwin SDK setup since we're on macOS.")
|
||||
}
|
||||
#else
|
||||
switch try await DarwinSDK.current()?.isUpToDate() {
|
||||
case true?:
|
||||
if !quiet {
|
||||
print("Darwin SDK is up to date.")
|
||||
}
|
||||
case false?:
|
||||
if !quiet {
|
||||
print("Darwin SDK is outdated.")
|
||||
}
|
||||
fallthrough
|
||||
case nil:
|
||||
let path = try await Console.prompt("""
|
||||
Now generating the Darwin SDK.
|
||||
|
||||
Please download Xcode from http://developer.apple.com/download/all/?q=Xcode
|
||||
and enter the path to the downloaded Xcode.xip.
|
||||
|
||||
Path to Xcode.xip: \("" /* pacify swiftlint trailing_whitespace */)
|
||||
""")
|
||||
|
||||
let expanded = (path as NSString).expandingTildeInPath
|
||||
|
||||
try await InstallSDKOperation(path: expanded).run()
|
||||
}
|
||||
#endif
|
||||
try await EnsureSDKOperation(quiet: quiet).run()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -34,11 +34,18 @@ extension FileManager {
|
||||
|
||||
#if canImport(Subprocess)
|
||||
if !preserveOwner {
|
||||
try await Subprocess.run(
|
||||
let result = try await Subprocess.run(
|
||||
.name("cp"),
|
||||
arguments: ["-R", srcURL.path, dstURL.path],
|
||||
output: .discarded,
|
||||
).checkSuccess()
|
||||
error: .string(limit: .max, encoding: UTF8.self),
|
||||
)
|
||||
do {
|
||||
try result.checkSuccess()
|
||||
} catch {
|
||||
print("Error copying \(srcURL.path) to \(dstURL.path): \(result.standardError)")
|
||||
throw error
|
||||
}
|
||||
return
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
import Foundation
|
||||
private import XcodeProj
|
||||
|
||||
extension XCSchema.Project {
|
||||
public func pbxprojRepresentation(name: String) throws -> Data {
|
||||
let xcprojData = try self.jsonRepresentation()
|
||||
let pbxproj = try PBXProj(xcprojData: xcprojData, projectName: name)
|
||||
// dataRepresentation should never return nil
|
||||
return try pbxproj.dataRepresentation() ?? Data()
|
||||
}
|
||||
|
||||
public init(pbxprojRepresentation data: Data) throws {
|
||||
let pbxproj = try PBXProj(data: data)
|
||||
let xcprojData = try pbxproj.xcprojData()
|
||||
try self.init(jsonRepresentation: xcprojData)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,78 @@
|
||||
import Foundation
|
||||
@_exported import XcodeProjectFormat
|
||||
|
||||
// This library is a lightweight layer on top of the XcodeProjectFormat
|
||||
// interface, providing other facilities for working with the Xcode
|
||||
// project formats.
|
||||
//
|
||||
// We currently use XcodeProj under the hood for some functionality, but this
|
||||
// should be considered an implementation detail.
|
||||
|
||||
public struct XcodeProject: Equatable, Sendable {
|
||||
public enum Format: Sendable {
|
||||
case pbxproj
|
||||
case xcproj
|
||||
}
|
||||
|
||||
public var project: XCSchema.Project
|
||||
public var format: Format
|
||||
|
||||
public init(
|
||||
project: XCSchema.Project,
|
||||
format: Format = .pbxproj,
|
||||
) {
|
||||
self.project = project
|
||||
self.format = format
|
||||
}
|
||||
|
||||
/// Reads the project from the given `.xcodeproj` path.
|
||||
public init(url: URL) throws {
|
||||
guard url.pathExtension == "xcodeproj" else {
|
||||
throw Errors.notAnXcodeproj(url.path)
|
||||
}
|
||||
let xcprojURL = url.appending(path: "project.xcproj")
|
||||
lazy var pbxprojURL = url.appending(path: "project.pbxproj")
|
||||
if FileManager.default.fileExists(atPath: xcprojURL.path) {
|
||||
let data = try Data(contentsOf: xcprojURL)
|
||||
self.project = try XCSchema.Project(jsonRepresentation: data)
|
||||
self.format = .xcproj
|
||||
} else if FileManager.default.fileExists(atPath: pbxprojURL.path) {
|
||||
let data = try Data(contentsOf: pbxprojURL)
|
||||
self.project = try XCSchema.Project(pbxprojRepresentation: data)
|
||||
self.format = .pbxproj
|
||||
} else {
|
||||
throw Errors.missingProjectFile(url.path)
|
||||
}
|
||||
}
|
||||
|
||||
/// Sets the format in which the project should be serialized.
|
||||
public func withFormat(_ format: Format) -> XcodeProject {
|
||||
var copy = self
|
||||
copy.format = format
|
||||
return copy
|
||||
}
|
||||
|
||||
/// Writes the project to the given `.xcodeproj` path.
|
||||
public func write(to url: URL) throws {
|
||||
try? FileManager.default.createDirectory(at: url, withIntermediateDirectories: true)
|
||||
|
||||
switch format {
|
||||
case .pbxproj:
|
||||
try project
|
||||
.pbxprojRepresentation(name: url.deletingPathExtension().lastPathComponent)
|
||||
.write(to: url.appendingPathComponent("project.pbxproj"))
|
||||
case .xcproj:
|
||||
try project
|
||||
.jsonRepresentation()
|
||||
.write(to: url.appendingPathComponent("project.xcproj"))
|
||||
}
|
||||
|
||||
try XcodeWorkspace(children: [.file(.current)])
|
||||
.write(to: url.appendingPathComponent("project.xcworkspace"))
|
||||
}
|
||||
|
||||
public enum Errors: Error {
|
||||
case notAnXcodeproj(String)
|
||||
case missingProjectFile(String)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,84 @@
|
||||
import Foundation
|
||||
private import XcodeProj
|
||||
|
||||
extension XcodeWorkspace {
|
||||
public init(url: URL) throws {
|
||||
let workspace = try XCWorkspace(pathString: url.path)
|
||||
self.init(workspace.data)
|
||||
}
|
||||
|
||||
public func dataRepresentation() throws -> Data {
|
||||
try xcWorkspaceData.dataRepresentation() ?? Data()
|
||||
}
|
||||
|
||||
public func write(to url: URL) throws {
|
||||
try? FileManager.default.createDirectory(at: url, withIntermediateDirectories: true)
|
||||
try self.dataRepresentation()
|
||||
.write(to: url.appendingPathComponent("contents.xcworkspacedata"))
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Conversion
|
||||
|
||||
extension XcodeWorkspace {
|
||||
fileprivate init(_ xcWorkspaceData: XCWorkspaceData) {
|
||||
self.init(children: xcWorkspaceData.children.map { .init(from: $0) })
|
||||
}
|
||||
|
||||
fileprivate var xcWorkspaceData: XCWorkspaceData {
|
||||
XCWorkspaceData(children: children.map(\.xcWorkspaceDataElement))
|
||||
}
|
||||
}
|
||||
|
||||
extension XcodeWorkspace.Element {
|
||||
fileprivate init(from xcWorkspaceDataElement: XCWorkspaceDataElement) {
|
||||
switch xcWorkspaceDataElement {
|
||||
case .file(let file):
|
||||
self = .file(.init(file.location))
|
||||
case .group(let group):
|
||||
self = .group(.init(group))
|
||||
case .fileSystemSynchronizedGroup(let group):
|
||||
self = .fileSystemSynchronizedGroup(.init(group))
|
||||
}
|
||||
}
|
||||
|
||||
fileprivate var xcWorkspaceDataElement: XCWorkspaceDataElement {
|
||||
switch self {
|
||||
case .file(let location):
|
||||
.file(.init(location: location.xcWorkspaceLocation))
|
||||
case .group(let group):
|
||||
.group(group.xcWorkspaceDataElement)
|
||||
case .fileSystemSynchronizedGroup(let group):
|
||||
.fileSystemSynchronizedGroup(group.xcWorkspaceDataElement)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extension XcodeWorkspace.Location {
|
||||
fileprivate init(_ xcWorkspaceDataElementLocation: XCWorkspaceDataElementLocationType) {
|
||||
self.base = .init(rawValue: xcWorkspaceDataElementLocation.schema)
|
||||
self.path = xcWorkspaceDataElementLocation.path
|
||||
}
|
||||
|
||||
fileprivate var xcWorkspaceLocation: XCWorkspaceDataElementLocationType {
|
||||
.other(base.rawValue, path)
|
||||
}
|
||||
}
|
||||
|
||||
extension XcodeWorkspace.Group {
|
||||
fileprivate init(_ xcWorkspaceDataGroup: XCWorkspaceDataGroup) {
|
||||
self.init(
|
||||
location: .init(xcWorkspaceDataGroup.location),
|
||||
name: xcWorkspaceDataGroup.name,
|
||||
children: xcWorkspaceDataGroup.children.map { .init(from: $0) }
|
||||
)
|
||||
}
|
||||
|
||||
fileprivate var xcWorkspaceDataElement: XCWorkspaceDataGroup {
|
||||
.init(
|
||||
location: self.location.xcWorkspaceLocation,
|
||||
name: name,
|
||||
children: children.map(\.xcWorkspaceDataElement)
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,103 @@
|
||||
import Foundation
|
||||
|
||||
public struct XcodeWorkspace: Hashable, Sendable {
|
||||
public enum Element: Hashable, Sendable {
|
||||
case file(Location)
|
||||
case group(Group)
|
||||
case fileSystemSynchronizedGroup(Group)
|
||||
|
||||
public var location: Location {
|
||||
get {
|
||||
switch self {
|
||||
case let .file(location):
|
||||
location
|
||||
case let .group(group):
|
||||
group.location
|
||||
case let .fileSystemSynchronizedGroup(group):
|
||||
group.location
|
||||
}
|
||||
}
|
||||
set {
|
||||
switch self {
|
||||
case .file:
|
||||
self = .file(newValue)
|
||||
case .group(var group):
|
||||
group.location = newValue
|
||||
self = .group(group)
|
||||
case .fileSystemSynchronizedGroup(var group):
|
||||
group.location = newValue
|
||||
self = .fileSystemSynchronizedGroup(group)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public struct Group: Hashable, Sendable {
|
||||
public var location: Location
|
||||
public var name: String?
|
||||
public var children: [Element]
|
||||
|
||||
public init(location: Location, name: String?, children: [Element]) {
|
||||
self.location = location
|
||||
self.name = name
|
||||
self.children = children
|
||||
}
|
||||
}
|
||||
|
||||
public struct Location: Hashable, Sendable {
|
||||
public struct Base: Hashable, Sendable, RawRepresentable {
|
||||
public var rawValue: String
|
||||
|
||||
public init(rawValue: String) {
|
||||
self.rawValue = rawValue
|
||||
}
|
||||
}
|
||||
|
||||
public var base: Base
|
||||
public var path: String
|
||||
|
||||
public init(base: Base, path: String) {
|
||||
self.base = base
|
||||
self.path = path
|
||||
}
|
||||
}
|
||||
|
||||
public var children: [Element]
|
||||
|
||||
public init(children: [Element]) {
|
||||
self.children = children
|
||||
}
|
||||
}
|
||||
|
||||
extension XcodeWorkspace.Location.Base {
|
||||
/// Absolute path
|
||||
public static let absolute = Self(rawValue: "absolute")
|
||||
/// Relative to container
|
||||
public static let container = Self(rawValue: "container")
|
||||
/// Relative to Developer Directory
|
||||
public static let developer = Self(rawValue: "developer")
|
||||
/// Relative to group
|
||||
public static let group = Self(rawValue: "group")
|
||||
/// Single project workspace in xcodeproj directory
|
||||
public static let current = Self(rawValue: "self")
|
||||
}
|
||||
|
||||
extension XcodeWorkspace.Location {
|
||||
public static var current: Self {
|
||||
Self(base: .current, path: "")
|
||||
}
|
||||
}
|
||||
|
||||
extension XcodeWorkspace.Location: LosslessStringConvertible, CustomStringConvertible {
|
||||
public init?(_ string: String) {
|
||||
guard let colon = string.firstIndex(of: ":") else {
|
||||
return nil
|
||||
}
|
||||
self.base = Base(rawValue: String(string[..<colon]))
|
||||
self.path = String(string[colon...].dropFirst())
|
||||
}
|
||||
|
||||
public var description: String {
|
||||
"\(base.rawValue):\(path)"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
import Foundation
|
||||
import Testing
|
||||
import Crypto
|
||||
import X509
|
||||
import XKit
|
||||
|
||||
// serial number from https://github.com/xtool-org/xtool/issues/305
|
||||
private let leadingZeroSerial: [UInt8] = [
|
||||
0x03, 0x37, 0x42, 0x57, 0x0D, 0x6F, 0x96, 0x84,
|
||||
0xA2, 0x33, 0x11, 0x71, 0x19, 0x56, 0xA0, 0x84,
|
||||
]
|
||||
|
||||
@Test func serialNumberKeepsLeadingZeroNibble() throws {
|
||||
let certificate = try makeCertificate(serialNumber: leadingZeroSerial)
|
||||
#expect(certificate.serialNumber() == "033742570D6F9684A23311711956A084")
|
||||
}
|
||||
|
||||
@Test func serialNumberOmitsDERSignPadding() throws {
|
||||
// the high bit is set, so DER encodes this serial with a leading 0x00 byte
|
||||
var serial = leadingZeroSerial
|
||||
serial[0] = 0x83
|
||||
let certificate = try makeCertificate(serialNumber: serial)
|
||||
#expect(certificate.serialNumber() == "833742570D6F9684A23311711956A084")
|
||||
}
|
||||
|
||||
@Test func hasSerialNumberIgnoresCaseAndLeadingZeros() throws {
|
||||
let certificate = try makeCertificate(serialNumber: leadingZeroSerial)
|
||||
#expect(certificate.hasSerialNumber("033742570D6F9684A23311711956A084"))
|
||||
#expect(certificate.hasSerialNumber("033742570d6f9684a23311711956a084"))
|
||||
#expect(certificate.hasSerialNumber("33742570D6F9684A23311711956A084"))
|
||||
#expect(certificate.hasSerialNumber("0033742570D6F9684A23311711956A084"))
|
||||
#expect(!certificate.hasSerialNumber("133742570D6F9684A23311711956A084"))
|
||||
#expect(!certificate.hasSerialNumber(""))
|
||||
}
|
||||
|
||||
/// Creates a self-signed certificate and round-trips it through DER,
|
||||
/// like the certificates we get from the developer API.
|
||||
private func makeCertificate(serialNumber: [UInt8]) throws -> XKit.Certificate {
|
||||
let key = P256.Signing.PrivateKey()
|
||||
let name = try DistinguishedName {
|
||||
CommonName("xtool tests")
|
||||
}
|
||||
let now = Date()
|
||||
let certificate = try X509.Certificate(
|
||||
version: .v3,
|
||||
serialNumber: .init(bytes: serialNumber),
|
||||
publicKey: .init(key.publicKey),
|
||||
notValidBefore: now,
|
||||
notValidAfter: now + 3600,
|
||||
issuer: name,
|
||||
subject: name,
|
||||
signatureAlgorithm: .ecdsaWithSHA256,
|
||||
extensions: .init(),
|
||||
issuerPrivateKey: .init(key)
|
||||
)
|
||||
return try XKit.Certificate(data: XKit.Certificate(raw: certificate).data())
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user