mirror of
https://github.com/xtool-org/xtool.git
synced 2026-11-21 18:55:56 +03:00
Compare commits
23 Commits
hotreload
...
xcode-27-1
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
swiftlint_version: 0.59.1
|
||||
swiftlint_version: 0.65.1
|
||||
disabled_rules:
|
||||
- trailing_comma
|
||||
- nesting
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
# Note: We use 22.04 since AppImage recommends building on the
|
||||
# oldest configuration that you support
|
||||
|
||||
ARG SWIFT_VERSION=6.3.3
|
||||
ARG SWIFT_VERSION=6.4.1
|
||||
|
||||
FROM swift:${SWIFT_VERSION}-jammy AS build-base
|
||||
|
||||
|
||||
@@ -68,7 +68,7 @@ sudo apt-get install usbmuxd
|
||||
|
||||
### Xcode.xip
|
||||
|
||||
Download **Xcode 27** 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_27.0.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)
|
||||
|
||||
+54
-90
@@ -1,13 +1,13 @@
|
||||
{
|
||||
"originHash" : "372e7c63deb9508728c2f792b06935bafc6dd9a5320c5376c7eb9fa2798f3f9c",
|
||||
"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" : "f95c908967e98c68c5ce3fd61a7974e7e869e303",
|
||||
"version" : "1.36.1"
|
||||
"revision" : "4c005f955e83f888d5616e579717a36d2dfc6301",
|
||||
"version" : "1.36.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -37,15 +37,6 @@
|
||||
"version" : "1.2.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "jsonutilities",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/yonaskolb/JSONUtilities.git",
|
||||
"state" : {
|
||||
"revision" : "128d2ffc22467f69569ef8ff971683e2393191a0",
|
||||
"version" : "4.2.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "openapikit",
|
||||
"kind" : "remoteSourceControl",
|
||||
@@ -55,6 +46,15 @@
|
||||
"version" : "6.4.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "opencombine",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/OpenCombine/OpenCombine.git",
|
||||
"state" : {
|
||||
"revision" : "8576f0d579b27020beccbccc3ea6844f3ddfc2c2",
|
||||
"version" : "0.14.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "pathkit",
|
||||
"kind" : "remoteSourceControl",
|
||||
@@ -64,15 +64,6 @@
|
||||
"version" : "1.0.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "rainbow",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/onevcat/Rainbow.git",
|
||||
"state" : {
|
||||
"revision" : "711ca908ca19d16e577d575c8d0a48151a16bb1b",
|
||||
"version" : "4.2.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "spectre",
|
||||
"kind" : "remoteSourceControl",
|
||||
@@ -114,8 +105,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-async-algorithms.git",
|
||||
"state" : {
|
||||
"revision" : "3da39bbc4e687d4192af7c9cf4eab805745a0b9c",
|
||||
"version" : "1.1.5"
|
||||
"revision" : "13713a4ffdee8abd929f92568ee9462a46ae26e0",
|
||||
"version" : "1.1.7"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -150,8 +141,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-collections",
|
||||
"state" : {
|
||||
"revision" : "a0cb0954ecb21e4e31b0070e6ed5674e8556685a",
|
||||
"version" : "1.6.0"
|
||||
"revision" : "35a1edcb8ebd2bfe251d587f0b69e62af28f508c",
|
||||
"version" : "1.7.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -159,8 +150,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-concurrency-extras",
|
||||
"state" : {
|
||||
"revision" : "5fa253428866f2360c3754e88537f700ed2656b5",
|
||||
"version" : "1.4.1"
|
||||
"revision" : "8a4260f7373493435bd21194585c95b72bfdd401",
|
||||
"version" : "1.4.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -168,8 +159,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-configuration.git",
|
||||
"state" : {
|
||||
"revision" : "3533f65d3e36dcdffc91ce34ef4d3c9c1887fd4b",
|
||||
"version" : "1.2.1"
|
||||
"revision" : "8bae88f79dbddec793390c5bf3e2abb4ac2ece42",
|
||||
"version" : "1.2.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -177,8 +168,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-crypto",
|
||||
"state" : {
|
||||
"revision" : "a9d1d5ab8951ada40cafff8c8e2b551dfde4f390",
|
||||
"version" : "5.0.0"
|
||||
"revision" : "c2cbadd7263439d8015189668f96ff5b5be565ce",
|
||||
"version" : "5.0.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -195,8 +186,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-distributed-tracing.git",
|
||||
"state" : {
|
||||
"revision" : "cc504a45f6ce73ce6067837d7ac19fa67b229a56",
|
||||
"version" : "1.5.0"
|
||||
"revision" : "297b5b9c82a5631e3199ce3ec0993a3cfb0fbb84",
|
||||
"version" : "1.7.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -240,8 +231,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/pointfreeco/swift-issue-reporting",
|
||||
"state" : {
|
||||
"revision" : "75b000cea2ca6d7527a57e1b9cc0bdf21a9abe9f",
|
||||
"version" : "2.1.1"
|
||||
"revision" : "b23bb4493c439d3e05152bc167014235ba3d47fc",
|
||||
"version" : "2.1.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -249,8 +240,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-log.git",
|
||||
"state" : {
|
||||
"revision" : "9c6fb14227f55d8f711ce3847dc2f419fb0ecacb",
|
||||
"version" : "1.15.1"
|
||||
"revision" : "4038b6a4f74a1426f47eb1dd5b4bb5628a15d597",
|
||||
"version" : "1.16.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -258,8 +249,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-nio",
|
||||
"state" : {
|
||||
"revision" : "21de5f08c1a166a6dd293d0e587ad977bf8dac5d",
|
||||
"version" : "2.103.0"
|
||||
"revision" : "6db9d9abd92ad7399b8a564cafbb87d3507245fa",
|
||||
"version" : "2.104.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -321,8 +312,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-openapi-generator",
|
||||
"state" : {
|
||||
"revision" : "39d49cf22abab58a07f02bb76808b5d2839b294a",
|
||||
"version" : "1.13.1"
|
||||
"revision" : "164dfbcf1f78e2ddc719ab9d85c50d1157fa8d7d",
|
||||
"version" : "1.14.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -330,8 +321,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-openapi-runtime",
|
||||
"state" : {
|
||||
"revision" : "9e53df53e043b53046a371b31aaf0a1e26eef946",
|
||||
"version" : "1.12.1"
|
||||
"revision" : "ad7a252e215870ea2de9cf8605ff9336b004183a",
|
||||
"version" : "1.13.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -339,8 +330,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/swift-openapi-urlsession",
|
||||
"state" : {
|
||||
"revision" : "08796d36c99ad2318929bfa1d1e40f82194b65cc",
|
||||
"version" : "1.3.1"
|
||||
"revision" : "c97e0f0187d95542b4a254f5bb4dc67f43bf73c9",
|
||||
"version" : "1.4.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -348,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"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -357,8 +348,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/swift-server/swift-service-lifecycle",
|
||||
"state" : {
|
||||
"revision" : "7f9326b0326ff86e3646295ea6e891f68c471c5e",
|
||||
"version" : "2.12.0"
|
||||
"revision" : "a18ee16b8039866fd919bdb4e8e906882d4ecc75",
|
||||
"version" : "2.13.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -366,8 +357,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/swiftlang/swift-subprocess",
|
||||
"state" : {
|
||||
"revision" : "b3937ab85dd32f6e9435914599c1519074769c1a",
|
||||
"version" : "1.0.0"
|
||||
"revision" : "dbe21bd7dfd4ffef8c32588918542a8abfa1b54c",
|
||||
"version" : "1.0.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -388,15 +379,6 @@
|
||||
"version" : "1.8.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swiftcli",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/jakeheis/SwiftCLI.git",
|
||||
"state" : {
|
||||
"revision" : "2e949055d9797c1a6bddcda0e58dada16cc8e970",
|
||||
"version" : "6.0.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swiftymobiledevice",
|
||||
"kind" : "remoteSourceControl",
|
||||
@@ -415,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",
|
||||
@@ -434,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" : "2aad968e4806b8571f6f2bed22ecec00b0322f95",
|
||||
"version" : "0.4.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "xcodegen",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/yonaskolb/XcodeGen",
|
||||
"state" : {
|
||||
"revision" : "8445e778451c7e44237b90281bde622d764b0084",
|
||||
"version" : "2.46.0"
|
||||
"revision" : "c132630aabf40f6d6c3f7bb004595d2e5a28ea42",
|
||||
"version" : "0.1.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -456,8 +420,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/tuist/XcodeProj.git",
|
||||
"state" : {
|
||||
"revision" : "eb001108f64467b0cc7e8cbf90b3b4aaa1822cbb",
|
||||
"version" : "9.14.0"
|
||||
"revision" : "b505c06bb190b9306b29d5d96e3284e139af3cc8",
|
||||
"version" : "9.17.6"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -465,8 +429,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/xtool-org/xtool-core",
|
||||
"state" : {
|
||||
"revision" : "f867f9c2aea16ac78ca14d0d2f948b47db0732b4",
|
||||
"version" : "1.5.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"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+21
-12
@@ -48,10 +48,9 @@ let package = Package(
|
||||
),
|
||||
],
|
||||
dependencies: [
|
||||
.package(url: "https://github.com/xtool-org/xtool-core", .upToNextMinor(from: "1.5.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/xtool-org/xadi", .upToNextMinor(from: "0.4.1")),
|
||||
|
||||
.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"),
|
||||
@@ -62,9 +61,8 @@ let package = Package(
|
||||
.package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.0.0"),
|
||||
.package(url: "https://github.com/apple/swift-openapi-urlsession", from: "1.0.0"),
|
||||
.package(url: "https://github.com/apple/swift-nio", from: "2.77.0"),
|
||||
// v1.7.0 has a crash on old OSes: https://github.com/apple/swift-collections/issues/733.
|
||||
// pin 1.6.0 until 1.7.1 is released.
|
||||
.package(url: "https://github.com/apple/swift-collections", exact: "1.6.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", from: "1.0.0"),
|
||||
@@ -75,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: "6.0.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/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(
|
||||
@@ -123,7 +123,6 @@ let package = Package(
|
||||
"DeveloperAPI",
|
||||
"CXKit",
|
||||
"XUtils",
|
||||
.product(name: "XADI", package: "xadi", condition: .when(platforms: [.linux, .macOS])),
|
||||
.product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
|
||||
.product(name: "Dependencies", package: "swift-dependencies"),
|
||||
.product(name: "SwiftyMobileDevice", package: "SwiftyMobileDevice"),
|
||||
@@ -162,6 +161,9 @@ let package = Package(
|
||||
dependencies: [
|
||||
"XKit",
|
||||
"XToolSupport",
|
||||
"PackLib",
|
||||
.product(name: "Crypto", package: "swift-crypto"),
|
||||
.product(name: "X509", package: "swift-certificates"),
|
||||
],
|
||||
swiftSettings: swiftSettings,
|
||||
),
|
||||
@@ -174,19 +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,
|
||||
),
|
||||
|
||||
@@ -193,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 {
|
||||
@@ -210,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))
|
||||
}
|
||||
@@ -408,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]?
|
||||
|
||||
@@ -1,12 +1,64 @@
|
||||
import Subprocess
|
||||
import Version
|
||||
import XUtils
|
||||
|
||||
public struct SwiftVersion: Sendable {
|
||||
public var version: Version
|
||||
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 {
|
||||
version >= Version(6, 4, 0)
|
||||
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])
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,22 +76,12 @@ extension SwiftVersion {
|
||||
} catch {
|
||||
throw StringError("Failed to obtain Swift version")
|
||||
}
|
||||
var output = outputString?[...] ?? ""
|
||||
if output.hasPrefix("Apple ") {
|
||||
output = output.dropFirst("Apple ".count)
|
||||
}
|
||||
guard output.hasPrefix("Swift version ") else {
|
||||
|
||||
let output = outputString ?? ""
|
||||
guard let version = Self(output) else {
|
||||
throw StringError("Could not parse Swift version: '\(output)'")
|
||||
}
|
||||
output = output.dropFirst("Swift version ".count)
|
||||
guard let space = output.firstIndex(of: " ") else {
|
||||
throw StringError("Could not parse Swift version: '\(output)'")
|
||||
}
|
||||
output = output[..<space]
|
||||
guard let version = Version(tolerant: output) else {
|
||||
throw StringError("Could not parse Swift version: '\(output)'")
|
||||
}
|
||||
return SwiftVersion(version: version)
|
||||
return version
|
||||
}
|
||||
|
||||
public static var current: Self {
|
||||
|
||||
+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 {
|
||||
@@ -179,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)
|
||||
}
|
||||
|
||||
@@ -239,7 +226,7 @@ public struct ADIDataProvider: AnisetteDataProvider {
|
||||
machineID: mid.base64EncodedString(),
|
||||
localUserID: self.localUserID,
|
||||
oneTimePassword: otp.base64EncodedString(),
|
||||
deviceID: self.localUserUID.uuidString
|
||||
deviceInfo: try await deviceInfo(),
|
||||
)
|
||||
}
|
||||
|
||||
@@ -249,11 +236,7 @@ public struct ADIDataProvider: AnisetteDataProvider {
|
||||
}
|
||||
|
||||
private static var providerID: String? {
|
||||
#if os(macOS)
|
||||
return "1"
|
||||
#else
|
||||
return nil
|
||||
#endif
|
||||
"mac-omnisette"
|
||||
}
|
||||
|
||||
public var providerID: String? { Self.providerID }
|
||||
@@ -291,6 +274,13 @@ public struct ADIDataProvider: AnisetteDataProvider {
|
||||
)
|
||||
}
|
||||
|
||||
public func deviceInfo() async throws -> DeviceInfo {
|
||||
DeviceInfo(
|
||||
deviceID: localUserUID.uuidString,
|
||||
clientInfo: try await clientInfo(),
|
||||
)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public struct ADIError: Error, CustomStringConvertible {
|
||||
|
||||
@@ -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 }
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -22,6 +22,8 @@ public protocol AnisetteDataProvider: Sendable {
|
||||
func resetProvisioning() async
|
||||
func provisioningData() -> ProvisioningData?
|
||||
|
||||
func deviceInfo() async throws -> DeviceInfo
|
||||
|
||||
func fetchAnisetteData() async throws -> AnisetteData
|
||||
}
|
||||
|
||||
@@ -54,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
|
||||
@@ -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 {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -66,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,
|
||||
@@ -109,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)")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -76,18 +76,12 @@ struct SDKBuilder {
|
||||
let mode: Mode
|
||||
|
||||
// bump this when the sdk builder logic changes
|
||||
static let sdkEpoch = 3
|
||||
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.3.0"
|
||||
static let oamLibraries: [String] = [
|
||||
"FoundationModelsMacros",
|
||||
"PreviewsMacros",
|
||||
"SwiftUIMacros",
|
||||
]
|
||||
static let oamVersion = "1.4.1"
|
||||
|
||||
static var currentSDKVersion: String {
|
||||
"""
|
||||
@@ -205,6 +199,11 @@ struct SDKBuilder {
|
||||
},
|
||||
"librarian": {
|
||||
"path": "llvm-lib"
|
||||
},
|
||||
"swiftCompiler": {
|
||||
"extraCLIOptions": [
|
||||
"-Xfrontend", "-enable-cross-import-overlays"
|
||||
]
|
||||
}
|
||||
}
|
||||
""".write(
|
||||
@@ -233,22 +232,36 @@ struct SDKBuilder {
|
||||
.write(to: output.appendingPathComponent("darwin-sdk-version.txt"))
|
||||
}
|
||||
|
||||
// swiftlint:disable:next function_body_length
|
||||
private func installToolset(in output: URL) async throws {
|
||||
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\(Self.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
|
||||
@@ -258,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,
|
||||
@@ -273,13 +286,28 @@ 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)
|
||||
}
|
||||
}
|
||||
try await execution.standardInputWriter.finish()
|
||||
}
|
||||
.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)
|
||||
@@ -386,43 +414,41 @@ struct SDKBuilder {
|
||||
}
|
||||
|
||||
private func installMacros(in output: URL) async throws {
|
||||
@Dependency(\.httpClient) var httpClient
|
||||
let url = URL(string: """
|
||||
https://github.com/xtool-org/OpenAppleMacros/releases/download/\
|
||||
v\(Self.oamVersion)/OpenAppleMacrosServer-\(arch.rawValue)
|
||||
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",
|
||||
)
|
||||
|
||||
let (response, body) = try await httpClient.send(HTTPRequest(url: url))
|
||||
guard response.status == 200, let body else { throw Console.Error("Could not fetch toolset") }
|
||||
|
||||
let length: Int64? = switch body.length {
|
||||
case .known(let known): known
|
||||
case .unknown: nil
|
||||
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 outputPath = output.appendingPathComponent("OpenAppleMacrosServer").path
|
||||
do {
|
||||
let handle = try FileDescriptor.open(
|
||||
FilePath(outputPath),
|
||||
.writeOnly,
|
||||
options: .create,
|
||||
permissions: [.ownerReadWriteExecute, .groupReadExecute, .otherReadExecute]
|
||||
)
|
||||
defer { try? handle.close() }
|
||||
|
||||
var written: Int64 = 0
|
||||
for try await chunk in body {
|
||||
try handle.writeAll(chunk)
|
||||
written += Int64(chunk.count)
|
||||
|
||||
if let length {
|
||||
let progress = Int(Double(written) / Double(length) * 100)
|
||||
print("\r[Downloading OpenAppleMacros] \(progress)%", terminator: "")
|
||||
fflush(stdoutSafe)
|
||||
}
|
||||
}
|
||||
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)
|
||||
}
|
||||
print()
|
||||
}
|
||||
|
||||
private static let expectedXcodeChildren = ["Info.plist", "version.plist", "Developer"]
|
||||
@@ -606,27 +632,12 @@ struct SDKBuilder {
|
||||
let hostDir = platformDir.appendingPathComponent("Developer/usr/lib/swift/host")
|
||||
let pluginsDir = hostDir.appendingPathComponent("plugins")
|
||||
|
||||
if platform == "iPhoneSimulator" {
|
||||
// The iPhoneSimulator platform doesn't contain plugins; Xcode seems to be hardcoded
|
||||
// to look at the ones from iPhoneOS.platform. We can symlink the iPhoneOS ones too.
|
||||
try? FileManager.default.createDirectory(at: hostDir, withIntermediateDirectories: true)
|
||||
try? FileManager.default.removeItem(at: pluginsDir)
|
||||
try FileManager.default.createSymbolicLink(
|
||||
atPath: pluginsDir.path,
|
||||
withDestinationPath: "../../../../../../iPhoneOS.platform/Developer/usr/lib/swift/host/plugins"
|
||||
)
|
||||
} else {
|
||||
try? FileManager.default.removeItem(at: pluginsDir)
|
||||
try FileManager.default.createDirectory(at: pluginsDir, withIntermediateDirectories: true)
|
||||
// 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 Self.oamLibraries {
|
||||
let target = pluginsDir.appendingPathComponent("lib\(library).so")
|
||||
try Data().write(to: target)
|
||||
}
|
||||
}
|
||||
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
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import Foundation
|
||||
import XKit
|
||||
import Version
|
||||
import ArgumentParser
|
||||
import Dependencies
|
||||
import PackLib
|
||||
|
||||
@@ -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())
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
import Testing
|
||||
@testable import PackLib
|
||||
|
||||
@Test func cfBundleSupportedPlatformsFollowsBuildTriple() {
|
||||
#expect(Packer.cfBundleSupportedPlatforms(for: "arm64-apple-ios") == ["iPhoneOS"])
|
||||
#expect(Packer.cfBundleSupportedPlatforms(for: "arm64-apple-ios-simulator") == ["iPhoneSimulator"])
|
||||
|
||||
#expect(Packer.cfBundleSupportedPlatforms(for: "arm64-apple-ios17.0") == ["iPhoneOS"])
|
||||
#expect(Packer.cfBundleSupportedPlatforms(for: "arm64-apple-ios17.0-simulator") == ["iPhoneSimulator"])
|
||||
#expect(Packer.cfBundleSupportedPlatforms(for: "x86_64-apple-ios-simulator") == ["iPhoneSimulator"])
|
||||
#expect(Packer.cfBundleSupportedPlatforms(for: "arm64-apple-macosx") == ["MacOSX"])
|
||||
#expect(Packer.cfBundleSupportedPlatforms(for: "x86_64-apple-macosx") == ["MacOSX"])
|
||||
|
||||
#expect(Packer.cfBundleSupportedPlatforms(for: "unknown-triple") == ["iPhoneOS"])
|
||||
}
|
||||
@@ -0,0 +1,86 @@
|
||||
import Testing
|
||||
@testable import PackLib
|
||||
|
||||
@Test(arguments: [
|
||||
("6.2", SwiftVersion(6, 2)),
|
||||
("6.2.0", SwiftVersion(6, 2)),
|
||||
("6.2.1", SwiftVersion(6, 2, 1)),
|
||||
("Swift version 6.2 (swift-6.2-RELEASE)\nTarget: aarch64-unknown-linux-gnu", SwiftVersion(6, 2)),
|
||||
("Swift version 6.2.1 (swift-6.2.1-RELEASE)", SwiftVersion(6, 2, 1)),
|
||||
("Apple Swift version 6.2 (swiftlang-6.2.0.19.9 clang-1700.3.19.1)", SwiftVersion(6, 2)),
|
||||
("Apple Swift version 6.2.1 (swiftlang-6.2.1.4.3 clang-1700.3.19.1)", SwiftVersion(6, 2, 1)),
|
||||
("Swift version 6.4-dev (LLVM abcdef, Swift abcdef)", SwiftVersion(6, 4)),
|
||||
("Apple Swift version 6.4.1-dev (LLVM abcdef, Swift abcdef)", SwiftVersion(6, 4, 1)),
|
||||
("Swift version 6.2 effective-5.10 (swift-6.2-RELEASE)", SwiftVersion(6, 2)),
|
||||
("Swift version 6.2", SwiftVersion(6, 2)),
|
||||
("Apple Swift version 6.2.1", SwiftVersion(6, 2, 1)),
|
||||
("Swift version 6.4-dev", SwiftVersion(6, 4)),
|
||||
("Apple Swift version 6.4.1-dev", SwiftVersion(6, 4, 1)),
|
||||
("Swift version 6.4-dev\n", SwiftVersion(6, 4)),
|
||||
("Swift version 6.4-dev\nTarget: aarch64-unknown-linux-gnu", SwiftVersion(6, 4)),
|
||||
])
|
||||
func testSwiftVersionParsing(string: String, expected: SwiftVersion) {
|
||||
#expect(SwiftVersion(string) == expected)
|
||||
}
|
||||
|
||||
@Test(arguments: [
|
||||
"",
|
||||
"6",
|
||||
"6.2.1.4",
|
||||
"swift version 6.2 (swift-6.2-RELEASE)",
|
||||
"Swift version ",
|
||||
"Swift version 6 (swift-6-RELEASE)",
|
||||
"Swift version 6.2.1.4 (swift-6.2.1.4-RELEASE)",
|
||||
"Swift version six.2 (swift-6.2-RELEASE)",
|
||||
"Swift version 6.two (swift-6.2-RELEASE)",
|
||||
"Swift version 6.2.one (swift-6.2.1-RELEASE)",
|
||||
"Swift version 6.2-beta (swift-6.2-RELEASE)",
|
||||
"Swift version 99999999999999999999.2 (swift-6.2-RELEASE)",
|
||||
])
|
||||
func testSwiftVersionParsingInvalidInput(string: String) {
|
||||
#expect(SwiftVersion(string) == nil)
|
||||
}
|
||||
|
||||
@Test(arguments: [
|
||||
(SwiftVersion(0, 0), "0.0.0"),
|
||||
(SwiftVersion(6, 2), "6.2.0"),
|
||||
(SwiftVersion(6, 2, 1), "6.2.1"),
|
||||
(SwiftVersion(10, 20, 30), "10.20.30"),
|
||||
])
|
||||
func testSwiftVersionStringConversion(version: SwiftVersion, expected: String) {
|
||||
#expect(version.description == expected)
|
||||
#expect(String(version) == expected)
|
||||
#expect(SwiftVersion(version.description) == version)
|
||||
}
|
||||
|
||||
@Test(arguments: [
|
||||
(SwiftVersion(5, 99, 99), SwiftVersion(6, 0, 0)),
|
||||
(SwiftVersion(6, 2, 99), SwiftVersion(6, 3, 0)),
|
||||
(SwiftVersion(6, 2, 0), SwiftVersion(6, 2, 1)),
|
||||
(SwiftVersion(9, 0, 0), SwiftVersion(10, 0, 0)),
|
||||
(SwiftVersion(6, 9, 0), SwiftVersion(6, 10, 0)),
|
||||
(SwiftVersion(6, 2, 9), SwiftVersion(6, 2, 10)),
|
||||
])
|
||||
func testSwiftVersionOrdering(lower: SwiftVersion, higher: SwiftVersion) {
|
||||
#expect(lower < higher)
|
||||
#expect(higher > lower)
|
||||
#expect(lower <= higher)
|
||||
#expect(higher >= lower)
|
||||
#expect(!(higher < lower))
|
||||
#expect(!(lower > higher))
|
||||
#expect(lower != higher)
|
||||
}
|
||||
|
||||
@Test(arguments: [
|
||||
(SwiftVersion(6, 2), SwiftVersion(6, 2, 0)),
|
||||
(SwiftVersion(6, 2, 1), SwiftVersion(6, 2, 1)),
|
||||
])
|
||||
func testSwiftVersionComparisonEquality(lhs: SwiftVersion, rhs: SwiftVersion) {
|
||||
#expect(lhs == rhs)
|
||||
#expect(!(lhs < rhs))
|
||||
#expect(!(rhs < lhs))
|
||||
#expect(!(lhs > rhs))
|
||||
#expect(!(rhs > lhs))
|
||||
#expect(lhs <= rhs)
|
||||
#expect(lhs >= rhs)
|
||||
}
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
base = "Documentation/"
|
||||
publish = "xtool.docc/.docc-build"
|
||||
command = "./build.sh"
|
||||
environment = { SWIFT_VERSION = "6.3" }
|
||||
environment = { SWIFT_VERSION = "6.4.1" }
|
||||
ignore = "git -C .. diff --quiet $CACHED_COMMIT_REF $COMMIT_REF -- Documentation netlify.toml"
|
||||
|
||||
[[redirects]]
|
||||
|
||||
Reference in New Issue
Block a user