Compare commits

..

1 Commits

68 changed files with 659 additions and 1805 deletions
+1 -1
View File
@@ -6,4 +6,4 @@ runs:
- name: Set up Xcode
shell: bash
run: |
sudo xcode-select -s /Applications/Xcode_27.0.0.app
sudo xcode-select -s /Applications/Xcode_26.4.app
+2 -2
View File
@@ -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: xcode-27
runs-on: macos-26
steps:
- name: Checkout
uses: actions/checkout@v6
@@ -39,7 +39,7 @@ jobs:
run: |
swift test
build-ios:
runs-on: xcode-27
runs-on: macos-26
steps:
- name: Checkout
uses: actions/checkout@v6
+1 -2
View File
@@ -36,7 +36,7 @@ jobs:
Linux/packages/xtool-${{ matrix.host.arch }}.AppImage
Linux/packages/xtool-${{ matrix.host.arch }}.AppImage.zsync
build-mac:
runs-on: xcode-27
runs-on: macos-26
permissions:
contents: write
steps:
@@ -57,7 +57,6 @@ 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
-7
View File
@@ -1,7 +0,0 @@
{
"swiftPM": {
"buildSystem": "swiftbuild",
"scratchPath": ".build/index-build"
},
"backgroundIndexing": true
}
+1 -1
View File
@@ -1,4 +1,4 @@
swiftlint_version: 0.65.1
swiftlint_version: 0.59.1
disabled_rules:
- trailing_comma
- nesting
+2 -4
View File
@@ -1,9 +1,7 @@
# Note: We use 22.04 since AppImage recommends building on the
# oldest configuration that you support
ARG SWIFT_VERSION=6.4.0
FROM swift:${SWIFT_VERSION}-jammy AS build-base
FROM swift:6.3-jammy AS build-base
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -104,7 +102,7 @@ RUN swift package resolve
ADD . /xtool
RUN ./Linux/build.sh
FROM swift:${SWIFT_VERSION} AS xtool
FROM swift:6.3 AS xtool
COPY --from=build-xtool /xtool/Linux/packages/xtool-*.AppImage /xtool/xtool.AppImage
RUN (cd /xtool && ./xtool.AppImage --appimage-extract) \
-6
View File
@@ -1,6 +0,0 @@
.DS_Store
.build
.swiftpm
*/xtool
*/.bsp
/out
-29
View File
@@ -1,29 +0,0 @@
// 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"),
]
),
]
)
@@ -1,12 +0,0 @@
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)")
}
}
}
-2
View File
@@ -1,2 +0,0 @@
version: 1
bundleID: sh.xtool.examples.DemoDynamic
-33
View File
@@ -1,33 +0,0 @@
// 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"),
]
)
@@ -1,4 +0,0 @@
import SwiftUI
import ExampleSupport
@main struct DemoApp: ExampleApp {}
@@ -1,51 +0,0 @@
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)
))
}
}
}
@@ -1,11 +0,0 @@
<?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>
-6
View File
@@ -1,6 +0,0 @@
version: 1
bundleID: sh.xtool.examples.DemoExtensions
product: DemoExtensions
extensions:
- product: DemoExtensionsWidget
infoPath: Support/DemoExtensionsWidget-Info.plist
-31
View File
@@ -1,31 +0,0 @@
// 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"),
]
),
]
)
-1
View File
@@ -1 +0,0 @@
Top level resource
@@ -1,34 +0,0 @@
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)")
}
}
@@ -1 +0,0 @@
Bundled resource
-4
View File
@@ -1,4 +0,0 @@
version: 1
bundleID: sh.xtool.examples.DemoResources
resources:
- Resources/top.txt
-28
View File
@@ -1,28 +0,0 @@
// 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",
]
),
]
)
@@ -1,4 +0,0 @@
import ExampleSupport
import SwiftUI
@main struct DemoApp: ExampleApp {}
-2
View File
@@ -1,2 +0,0 @@
version: 1
bundleID: sh.xtool.examples.DemoSimple
-132
View File
@@ -1,132 +0,0 @@
{
"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
}
-30
View File
@@ -1,30 +0,0 @@
// 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"),
],
),
]
)
@@ -1,24 +0,0 @@
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()
}
}
}
@@ -1,31 +0,0 @@
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
}
}
}
}
@@ -1,15 +0,0 @@
import SwiftUI
import ComposableArchitecture
@main
struct DemoTCAApp: App {
private let store = Store(initialState: CounterFeature.State()) {
CounterFeature()
}
var body: some Scene {
WindowGroup {
ContentView(store: store)
}
}
}
-2
View File
@@ -1,2 +0,0 @@
version: 1
bundleID: sh.xtool.examples.DemoTCA
-31
View File
@@ -1,31 +0,0 @@
// 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"),
]
),
]
)
@@ -1,9 +0,0 @@
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)"
}
@@ -1 +0,0 @@
from the dynamic library
@@ -1,25 +0,0 @@
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()
}
}
}
@@ -1,12 +0,0 @@
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)
}
}
}
-14
View File
@@ -1,14 +0,0 @@
# 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
-118
View File
@@ -1,118 +0,0 @@
#!/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
View File
@@ -13,7 +13,7 @@ fi
rm -rf staging/tmp
mkdir -p staging/tmp staging/linuxdeploy
swift build --package-path .. -c release --product xtool
swift build --package-path .. -c release --product xtool --static-swift-stdlib
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' -or -name '*.bundle' -print0 | xargs -0 -I {} cp -a {} "${PWD}/staging/tmp/AppDir/usr/bin/"
find "${bin}"/ -name '*.resources' -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"
+1 -2
View File
@@ -132,8 +132,7 @@ docs-preview:
SWIFTLINT_VERSION = $(shell head -1 .swiftlint.yml | cut -d' ' -f2)
SWIFTLINT_BIN = .tmp/swiftlint/swiftlint-$(SWIFTLINT_VERSION)
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
SWIFTLINT_URL = https://github.com/realm/SwiftLint/releases/download/$(SWIFTLINT_VERSION)/$(if $(IS_MAC),portable_swiftlint,swiftlint_linux).zip
.PHONY: lint
lint: $(SWIFTLINT_BIN)
+116 -89
View File
@@ -1,5 +1,5 @@
{
"originHash" : "7ae7f57a6038e121dec04557563bc2a3412c9e46e473d9c84f3e3ac82be608f9",
"originHash" : "70ed310397f7785149edfd3c75ea1be84b43c694430c1a7d8a48d1da0809d3b5",
"pins" : [
{
"identity" : "aexml",
@@ -15,8 +15,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/swift-server/async-http-client.git",
"state" : {
"revision" : "f95c908967e98c68c5ce3fd61a7974e7e869e303",
"version" : "1.36.1"
"revision" : "3a5b74a58782c3b4c1f0bc75e9b67b10c2494e8f",
"version" : "1.33.1"
}
},
{
@@ -24,8 +24,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/attaswift/BigInt",
"state" : {
"revision" : "63feef7820abb1a8fb08587d7da56bb0b7db8751",
"version" : "6.0.1"
"revision" : "e07e00fa1fd435143a2dcf8b7eec9a7710b2fdfe",
"version" : "5.7.0"
}
},
{
@@ -33,8 +33,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/combine-schedulers",
"state" : {
"revision" : "114354e8c1667a2edc4993700fb9fa4f90157b56",
"version" : "1.2.2"
"revision" : "dcccb979a2183b8df3334237e3dc1ae2b4116a86",
"version" : "1.2.0"
}
},
{
"identity" : "jsonutilities",
"kind" : "remoteSourceControl",
"location" : "https://github.com/yonaskolb/JSONUtilities.git",
"state" : {
"revision" : "128d2ffc22467f69569ef8ff971683e2393191a0",
"version" : "4.2.0"
}
},
{
@@ -42,17 +51,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/mattpolzin/OpenAPIKit",
"state" : {
"revision" : "5b72eb9a6b23b1fec439d9a0bf38f115400421f9",
"version" : "6.4.0"
}
},
{
"identity" : "opencombine",
"kind" : "remoteSourceControl",
"location" : "https://github.com/OpenCombine/OpenCombine.git",
"state" : {
"revision" : "8576f0d579b27020beccbccc3ea6844f3ddfc2c2",
"version" : "0.14.0"
"revision" : "57b6318128e3f901c93f4fbf98d1c1464ec168d3",
"version" : "6.2.0"
}
},
{
@@ -64,6 +64,15 @@
"version" : "1.0.1"
}
},
{
"identity" : "rainbow",
"kind" : "remoteSourceControl",
"location" : "https://github.com/onevcat/Rainbow.git",
"state" : {
"revision" : "cdf146ae671b2624917648b61c908d1244b98ca1",
"version" : "4.2.1"
}
},
{
"identity" : "spectre",
"kind" : "remoteSourceControl",
@@ -85,10 +94,10 @@
{
"identity" : "swift-argument-parser",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-argument-parser.git",
"location" : "https://github.com/apple/swift-argument-parser",
"state" : {
"revision" : "6a52f3251125d74daf04fcbd5e6f08a75d074382",
"version" : "1.8.2"
"revision" : "626b5b7b2f45e1b0b1c6f4a309296d1d21d7311b",
"version" : "1.7.1"
}
},
{
@@ -96,8 +105,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-asn1.git",
"state" : {
"revision" : "3b6410f7dee09eb33cdd26260c5fd47fda19b0e2",
"version" : "1.7.3"
"revision" : "eb50cbd14606a9161cbc5d452f18797c90ef0bab",
"version" : "1.7.0"
}
},
{
@@ -105,8 +114,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-async-algorithms.git",
"state" : {
"revision" : "3da39bbc4e687d4192af7c9cf4eab805745a0b9c",
"version" : "1.1.5"
"revision" : "9d349bcc328ac3c31ce40e746b5882742a0d1272",
"version" : "1.1.3"
}
},
{
@@ -114,8 +123,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-atomics.git",
"state" : {
"revision" : "0442cb5a3f98ab802acb777929fdb446bda11a34",
"version" : "1.3.1"
"revision" : "b601256eab081c0f92f059e12818ac1d4f178ff7",
"version" : "1.3.0"
}
},
{
@@ -123,8 +132,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-certificates",
"state" : {
"revision" : "ff86b924ead66f853b8baf91f3c41926a8f36177",
"version" : "1.21.0"
"revision" : "bde8ca32a096825dfce37467137c903418c1893d",
"version" : "1.19.1"
}
},
{
@@ -132,8 +141,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-clocks",
"state" : {
"revision" : "82440fa0a8b1c381a6d1e8e0fc7bbba53ec63204",
"version" : "1.1.1"
"revision" : "cc46202b53476d64e824e0b6612da09d84ffde8e",
"version" : "1.0.6"
}
},
{
@@ -141,8 +150,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-collections",
"state" : {
"revision" : "a0cb0954ecb21e4e31b0070e6ed5674e8556685a",
"version" : "1.6.0"
"revision" : "fea17c02d767f46b23070fdfdacc28a03a39232a",
"version" : "1.5.1"
}
},
{
@@ -150,8 +159,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-concurrency-extras",
"state" : {
"revision" : "5fa253428866f2360c3754e88537f700ed2656b5",
"version" : "1.4.1"
"revision" : "5a3825302b1a0d744183200915a47b508c828e6f",
"version" : "1.3.2"
}
},
{
@@ -159,8 +168,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-configuration.git",
"state" : {
"revision" : "3533f65d3e36dcdffc91ce34ef4d3c9c1887fd4b",
"version" : "1.2.1"
"revision" : "be76c4ad929eb6c4bcaf3351799f2adf9e6848a9",
"version" : "1.2.0"
}
},
{
@@ -168,8 +177,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-crypto",
"state" : {
"revision" : "a9d1d5ab8951ada40cafff8c8e2b551dfde4f390",
"version" : "5.0.0"
"revision" : "1b6b2e274e85105bfa155183145a1dcfd63331f1",
"version" : "4.5.0"
}
},
{
@@ -177,8 +186,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-dependencies",
"state" : {
"revision" : "b476cc5761057d8d857de063fe7ac8daecf5c06b",
"version" : "1.17.1"
"revision" : "706feb7858a7f6c242879d137b8ee30926aa5b26",
"version" : "1.12.0"
}
},
{
@@ -186,8 +195,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-distributed-tracing.git",
"state" : {
"revision" : "cc504a45f6ce73ce6067837d7ac19fa67b229a56",
"version" : "1.5.0"
"revision" : "dc4030184203ffafbb2ec614352487235d747fe0",
"version" : "1.4.1"
}
},
{
@@ -222,17 +231,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-http-types",
"state" : {
"revision" : "bff4b6903cdc99dda49649dd52f46c11cfd3ed50",
"version" : "1.8.0"
}
},
{
"identity" : "swift-issue-reporting",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-issue-reporting",
"state" : {
"revision" : "75b000cea2ca6d7527a57e1b9cc0bdf21a9abe9f",
"version" : "2.1.1"
"revision" : "45eb0224913ea070ec4fba17291b9e7ecf4749ca",
"version" : "1.5.1"
}
},
{
@@ -240,8 +240,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-log.git",
"state" : {
"revision" : "9c6fb14227f55d8f711ce3847dc2f419fb0ecacb",
"version" : "1.15.1"
"revision" : "5073617dac96330a486245e4c0179cb0a6fd2256",
"version" : "1.12.0"
}
},
{
@@ -249,8 +249,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio",
"state" : {
"revision" : "21de5f08c1a166a6dd293d0e587ad977bf8dac5d",
"version" : "2.103.0"
"revision" : "f71c8d2a5e74a2c6d11a0fbe324774b5d6084237",
"version" : "2.99.0"
}
},
{
@@ -258,8 +258,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-extras.git",
"state" : {
"revision" : "41449336c8ecfadac6b4b5be75f9c3c306e61ced",
"version" : "1.35.1"
"revision" : "5a48717e29f62cb8326d6d42e46b562ca93847a6",
"version" : "1.34.0"
}
},
{
@@ -267,8 +267,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-http2.git",
"state" : {
"revision" : "0f3e54e29c944c2e835ad52159da7d9e1c94ac69",
"version" : "1.46.0"
"revision" : "81cc18264f92cd307ff98430f89372711d4f6fe9",
"version" : "1.43.0"
}
},
{
@@ -276,8 +276,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-ssl.git",
"state" : {
"revision" : "322f3c2a4a21df31c84ca416bf65ee5e9059e440",
"version" : "2.37.5"
"revision" : "3f337058ccd7243c4cac7911477d8ad4c598d4da",
"version" : "2.37.0"
}
},
{
@@ -312,8 +312,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-openapi-generator",
"state" : {
"revision" : "39d49cf22abab58a07f02bb76808b5d2839b294a",
"version" : "1.13.1"
"revision" : "5dd0da1c7da7bac8f0c458a02a76f69031137a80",
"version" : "1.12.1"
}
},
{
@@ -321,8 +321,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-openapi-runtime",
"state" : {
"revision" : "9e53df53e043b53046a371b31aaf0a1e26eef946",
"version" : "1.12.1"
"revision" : "f039fa6d6338aab5164f3d1be16281524c9a8f89",
"version" : "1.11.0"
}
},
{
@@ -330,8 +330,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-openapi-urlsession",
"state" : {
"revision" : "08796d36c99ad2318929bfa1d1e40f82194b65cc",
"version" : "1.3.1"
"revision" : "576a65b4ffb8c12ddad4950dc21eea2ef071bec2",
"version" : "1.3.0"
}
},
{
@@ -348,8 +348,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/swift-server/swift-service-lifecycle",
"state" : {
"revision" : "7f9326b0326ff86e3646295ea6e891f68c471c5e",
"version" : "2.12.0"
"revision" : "9829955b385e5bb88128b73f1b8389e9b9c3191a",
"version" : "2.11.0"
}
},
{
@@ -357,8 +357,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/swiftlang/swift-subprocess",
"state" : {
"revision" : "b3937ab85dd32f6e9435914599c1519074769c1a",
"version" : "1.0.0"
"revision" : "11633673a41f509f8945f23c96c7acd4adafd679",
"version" : "0.5.0"
}
},
{
@@ -366,17 +366,26 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/swiftlang/swift-syntax",
"state" : {
"revision" : "050f1a346fbbac0ca2cfb15a95274f7bd1cf0ccf",
"version" : "604.0.0"
"revision" : "9de99a78f099e59caf2b2beec65a4c45d54b2081",
"version" : "603.0.1"
}
},
{
"identity" : "swift-system",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-system.git",
"location" : "https://github.com/apple/swift-system",
"state" : {
"revision" : "869129b7bf4ecc57b97d0193ad29690ca2134750",
"version" : "1.8.1"
"revision" : "7c6ad0fc39d0763e0b699210e4124afd5041c5df",
"version" : "1.6.4"
}
},
{
"identity" : "swiftcli",
"kind" : "remoteSourceControl",
"location" : "https://github.com/jakeheis/SwiftCLI.git",
"state" : {
"revision" : "2e949055d9797c1a6bddcda0e58dada16cc8e970",
"version" : "6.0.3"
}
},
{
@@ -397,6 +406,15 @@
"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",
@@ -411,17 +429,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/xtool-org/xadi",
"state" : {
"revision" : "3db108d3cafe719a4b2e9d13a9c8c52770e20aa7",
"version" : "0.4.2"
"revision" : "2aad968e4806b8571f6f2bed22ecec00b0322f95",
"version" : "0.4.1"
}
},
{
"identity" : "xcode-project-format",
"identity" : "xcodegen",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/xcode-project-format.git",
"location" : "https://github.com/yonaskolb/XcodeGen",
"state" : {
"revision" : "c132630aabf40f6d6c3f7bb004595d2e5a28ea42",
"version" : "0.1.0"
"revision" : "8d3d3476a69ae3e5d68e1adccc701c410c05eb36",
"version" : "2.45.4"
}
},
{
@@ -429,8 +447,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/tuist/XcodeProj.git",
"state" : {
"revision" : "aeea2e97376cd69fbdd1c7e68664b79a1a641dde",
"version" : "9.17.5"
"revision" : "01bb77000bc8c23a09ea2058f4954612f03cb705",
"version" : "9.10.1"
}
},
{
"identity" : "xctest-dynamic-overlay",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
"state" : {
"revision" : "dfd70507def84cb5fb821278448a262c6ff2bbad",
"version" : "1.9.0"
}
},
{
@@ -456,8 +483,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/xtool-org/zsign",
"state" : {
"revision" : "f6158be9e62a5ce2a53d72b1a6d880880da956c8",
"version" : "1.9.0"
"revision" : "19aab76b3f1388966a3ed4fc11b357f95aafc70b",
"version" : "1.8.0"
}
}
],
+13 -27
View File
@@ -30,8 +30,8 @@ let swiftSettings: [SwiftSetting] = {
let package = Package(
name: "xtool",
platforms: [
.iOS(.v17),
.macOS(.v14),
.iOS(.v16),
.macOS(.v13),
],
products: [
.library(
@@ -50,25 +50,21 @@ 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/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.2")),
.package(url: "https://github.com/xtool-org/zsign", .upToNextMinor(from: "1.8.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"),
.package(url: "https://github.com/apple/swift-certificates", from: "1.0.0"),
.package(url: "https://github.com/apple/swift-crypto", from: "5.0.0"),
.package(url: "https://github.com/apple/swift-crypto", from: "4.5.0"),
.package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"),
.package(url: "https://github.com/apple/swift-openapi-generator", from: "1.6.0"),
.package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.0.0"),
.package(url: "https://github.com/apple/swift-openapi-urlsession", from: "1.0.0"),
.package(url: "https://github.com/apple/swift-nio", from: "2.77.0"),
// 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/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"),
.package(url: "https://github.com/swiftlang/swift-subprocess", .upToNextMinor(from: "0.5.0")),
.package(url: "https://github.com/swift-server/async-http-client.git", from: "1.23.0"),
.package(url: "https://github.com/swift-server/swift-openapi-async-http-client", from: "1.0.0"),
@@ -76,16 +72,14 @@ 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/attaswift/BigInt", from: "5.5.0"),
.package(url: "https://github.com/mxcl/Version", from: "2.1.0"),
.package(url: "https://github.com/jpsim/Yams", from: "5.1.3"),
.package(url: "https://github.com/saagarjha/unxip", from: "3.2.0"),
// NB: this should only be imported from XcodeProjects
.package(url: "https://github.com/tuist/XcodeProj.git", from: "9.17.5"),
// TODO: just depend on tuist/XcodeProj instead
.package(url: "https://github.com/yonaskolb/XcodeGen", from: "2.45.4"),
],
targets: [
.target(
@@ -135,7 +129,7 @@ let package = Package(
.product(name: "ProtoCodable", package: "xtool-core"),
.product(name: "Superutils", package: "xtool-core"),
.product(name: "Crypto", package: "swift-crypto"),
.product(name: "CryptoExtras", package: "swift-crypto"),
.product(name: "_CryptoExtras", package: "swift-crypto"),
.product(name: "X509", package: "swift-certificates"),
.product(name: "BigInt", package: "BigInt"),
.product(name: "HTTPTypes", package: "swift-http-types"),
@@ -165,7 +159,6 @@ let package = Package(
dependencies: [
"XKit",
"XToolSupport",
"PackLib",
],
swiftSettings: swiftSettings,
),
@@ -178,26 +171,19 @@ 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: "XcodeProjectFormat", package: "xcode-project-format"),
.product(name: "XcodeGenKit", package: "XcodeGen", condition: .when(platforms: [.macOS])),
],
swiftSettings: swiftSettings,
),
+2 -2
View File
@@ -79,7 +79,7 @@ public struct BuildSettings: Sendable {
arguments: .init(arguments),
output: .string(limit: .max)
).checkSuccess()
return result.standardOutput.trimmingCharacters(in: .whitespacesAndNewlines)
return result.standardOutput?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
}
private static let _swiftURL = Task {
@@ -137,7 +137,7 @@ public struct BuildSettings: Sendable {
}
return Configuration(
executable: executable,
executable,
arguments: .init(baseArguments + resolvedBaseOptions + arguments),
environment: .inherit.updating(sdkEnvironment),
platformOptions: .withGracefulShutDown,
+1 -21
View File
@@ -193,7 +193,7 @@ public struct Packer: Sendable {
if product.type == .application {
info["UIRequiredDeviceCapabilities"] = ["arm64"]
info["LSRequiresIPhoneOS"] = true
info["CFBundleSupportedPlatforms"] = Packer.cfBundleSupportedPlatforms(for: buildSettings.triple)
info["CFBundleSupportedPlatforms"] = ["iPhoneOS"]
}
if let iconPath = product.iconPath {
@@ -210,26 +210,6 @@ 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 {
-5
View File
@@ -137,10 +137,6 @@ 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))
}
@@ -412,7 +408,6 @@ 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]?
+18 -60
View File
@@ -1,64 +1,12 @@
import Subprocess
import Version
import XUtils
public struct SwiftVersion: Sendable, Comparable, Hashable {
public var major: Int
public var minor: Int
public var patch: Int
public struct SwiftVersion: Sendable {
public var version: Version
public init(_ major: Int, _ minor: Int, _ patch: Int = 0) {
self.major = major
self.minor = minor
self.patch = patch
}
public static func < (lhs: Self, rhs: Self) -> Bool {
lhs.tuple < rhs.tuple
}
fileprivate var tuple: (Int, Int, Int) {
(major, minor, patch)
}
}
extension SwiftVersion {
public var supportsSwiftBuild: Bool {
self >= SwiftVersion(6, 4)
}
}
extension SwiftVersion: LosslessStringConvertible, CustomStringConvertible {
public var description: String {
"\(major).\(minor).\(patch)"
}
public init?(_ description: String) {
// inverse of https://github.com/swiftlang/swift/blob/896191b38/lib/Basic/Version.cpp#L266
var output = description[...]
if output.hasPrefix("Apple ") {
output = output.dropFirst("Apple ".count)
}
if output.hasPrefix("Swift version ") {
output = output.dropFirst("Swift version ".count)
output = output.prefix { !$0.isWhitespace }
}
let isDev = output.hasSuffix("-dev")
if isDev { output = output.dropLast("-dev".count) }
let parts = output.split(separator: ".")
var numericParts = parts.compactMap { Int($0) }
guard parts.count == numericParts.count else {
return nil
}
switch numericParts.count {
case 2: numericParts.append(0)
case 3: break
default: return nil
}
self.init(numericParts[0], numericParts[1], numericParts[2])
version >= Version(6, 4, 0)
}
}
@@ -76,12 +24,22 @@ extension SwiftVersion {
} catch {
throw StringError("Failed to obtain Swift version")
}
let output = outputString ?? ""
guard let version = Self(output) else {
var output = outputString?[...] ?? ""
if output.hasPrefix("Apple ") {
output = output.dropFirst("Apple ".count)
}
guard output.hasPrefix("Swift version ") else {
throw StringError("Could not parse Swift version: '\(output)'")
}
return version
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)
}
public static var current: Self {
+126 -254
View File
@@ -1,5 +1,10 @@
#if os(macOS)
import Foundation
import XcodeProjects
import PathKit
import Version
import ProjectSpec
import XcodeGenKit
import XcodeProj
public struct XcodePacker {
public var plan: Plan
@@ -9,284 +14,151 @@ public struct XcodePacker {
}
// swiftlint:disable:next function_body_length
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)
public func createProject() async throws -> URL {
let xtoolDir: Path = "xtool"
let fromProjectToRoot = "../.."
let projectDir: Path = xtoolDir + ".xtool-tmp"
try? xtoolDir.delete()
try projectDir.mkpath()
let emptyText = Data("// leave this file empty".utf8)
let products = plan.allProducts
let targetIDs = products.map {
XCSchema.ObjectID("xtool:\($0.product)")
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 sourcePhase = XCSchema.BuildPhase.sources(.init(objectID: nil, name: nil))
let frameworksPhase = XCSchema.BuildPhase.frameworks(.init(objectID: nil, name: nil))
var groups: [XCSchema.Reference] = []
var productFiles: [XCSchema.Reference] = []
var targets: [XCSchema.Target] = []
let emptyText = Data("""
// leave this file empty
""".utf8)
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"))
let targets = try plan.allProducts.map { product in
let productDir = projectDir + product.product
try productDir.mkpath()
let emptyFile = productDir + "empty.c"
try emptyFile.write(emptyText)
let infoPath = productDir + "Info.plist"
var plist = product.infoPlist
let families = (plist.removeValue(forKey: "UIDeviceFamily") as? [Int]) ?? [1, 2]
plist["CFBundleExecutable"] = product.targetName
plist["CFBundleName"] = product.targetName
plist["CFBundleDisplayName"] = product.product
if let iconPath = product.iconPath {
plist["CFBundleIconFile"] = URL(fileURLWithPath: iconPath).deletingPathExtension().lastPathComponent
}
let encodedPlist = try PropertyListSerialization.data(fromPropertyList: plist, format: .xml, options: 0)
try encodedPlist.write(to: productDir.appendingPathComponent("Info.plist"))
try infoPath.write(encodedPlist)
var buildSettings: [String: XCSchema.BuildSetting] = [
var buildSettings: [String: BuildSetting] = [
"PRODUCT_BUNDLE_IDENTIFIER": .string(product.bundleID),
"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"]),
"TARGETED_DEVICE_FAMILY": .string(families.map { "\($0)" }.joined(separator: ",")),
]
if product.type == .appExtension {
buildSettings["APPLICATION_EXTENSION_API_ONLY"] = .string("YES")
buildSettings["LD_RUNPATH_SEARCH_PATHS"] = .array([
"$(inherited)", "@executable_path/Frameworks", "@executable_path/../../Frameworks",
])
buildSettings["APPLICATION_EXTENSION_API_ONLY"] = true
}
if let entitlementsPath = product.entitlementsPath {
let path = (entitlementsPath as NSString).isAbsolutePath
? entitlementsPath
: (fromProjectToRoot as NSString).appendingPathComponent(entitlementsPath)
buildSettings["CODE_SIGN_ENTITLEMENTS"] = .string(path)
buildSettings["CODE_SIGN_ENTITLEMENTS"] = .string((fromProjectToRoot + Path(entitlementsPath)).string)
}
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
),
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), [])
let additionalDependencies: [Dependency] = if product.type == .application {
plan.extensions.map {
Dependency(
type: .target,
reference: $0.targetName
)
}
: []
targets.append(.native(XCSchema.CommonTargetProperties(
} else {
[]
}
return Target(
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 schema = XCSchema.Project(
objectID: nil,
rootGroupDebugID: nil,
configurationListDebugID: nil,
topLevelReferences: groups + [
.group(XCSchema.Group(
objectID: nil,
name: "Products",
path: "",
includeInIndex: nil,
children: productFiles,
))
],
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: [],
)
let project = XcodeProject(project: schema)
let projectURL = projectDir.appending(path: "\(plan.app.product).xcodeproj")
try project.write(to: projectURL)
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
}
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)
}
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)
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",
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
),
properties: buildFileProperties(),
)],
))
],
dependencies: [
Dependency(
type: .package(products: [product.product]),
reference: "RootPackage"
),
] + additionalDependencies,
info: Plist(
path: try infoPath.relativePath(from: projectDir).string,
attributes: [:]
)
)
}
}
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,
),
let project = Project(
name: plan.app.targetName,
targets: targets,
packages: [
"RootPackage": .local(
path: fromProjectToRoot.string,
group: nil,
excludeFromProject: false
),
],
options: SpecOptions(
localPackagesGroup: ""
)
)
// TODO: Handle plan.resources of type .root
// TODO: Handle plan.iconPath
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)
}
try xcodeProject.write(path: Path(xcodeproj.lastComponent))
}
do {
let current = Path.current
Path.current = xcworkspace.parent()
defer { Path.current = current }
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 xcworkspace.url
}
}
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
@@ -249,7 +249,11 @@ public struct ADIDataProvider: AnisetteDataProvider {
}
private static var providerID: String? {
"2"
#if os(macOS)
return "1"
#else
return nil
#endif
}
public var providerID: String? { Self.providerID }
@@ -21,7 +21,7 @@ public struct DeviceInfo: Codable, Sendable {
var clientString: String {
"""
<Pixel 7> <Android;14;UQ1A.240205.002> <com.apple.AuthKit/1 (com.apple.akd/1.0)>
<\(modelID)> <macOS;27.0;26A5378j> <com.apple.AuthKit/1 (com.apple.akd/1.0)>
"""
}
@@ -0,0 +1,256 @@
//
// 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
@@ -8,7 +8,7 @@
import Foundation
import Crypto
import CryptoExtras
import _CryptoExtras
import BigInt
struct SRPClient {
@@ -35,13 +35,11 @@ private struct Client: HTTPClientProtocol {
}
private static let tlsConfiguration: TLSConfiguration = {
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)
}
// 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)
var tlsConfiguration: TLSConfiguration = .makeClientConfiguration()
tlsConfiguration.additionalTrustRoots = [.certificates(appleRoots)]
tlsConfiguration.additionalTrustRoots = [.certificates([appleRootCA])]
if ProcessInfo.processInfo.environment["XTL_DISABLE_TLS_VALIDATION"] == "1" {
tlsConfiguration.certificateVerification = .none
}
@@ -138,17 +136,6 @@ 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
@@ -179,59 +166,4 @@ 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 -1
View File
@@ -9,7 +9,7 @@
import Foundation
import Crypto
import X509
import CryptoExtras
import _CryptoExtras
public struct PrivateKey: Codable, Sendable {
// pem encoded
-6
View File
@@ -76,12 +76,6 @@ struct AuthOperation {
}
private func logInWithPassword() async throws -> AuthToken {
print("""
Heads up:
This works by emulating a Pixel phone/Windows PC to interact with Apple services;
consider using a secondary Apple ID. Credentials are only ever sent to Apple.
""")
let username = try await Console.promptRequired("Apple ID: ", existing: username)
let password: String
+1 -1
View File
@@ -23,7 +23,7 @@ struct DevBSPCommand: AsyncParsableCommand {
)
try await Subprocess.run(
settings.buildServerInvocation(),
input: .currentStandardInput,
input: .standardInput,
output: .currentStandardOutput,
error: .currentStandardError,
)
+5 -3
View File
@@ -66,9 +66,11 @@ 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,
@@ -107,12 +109,12 @@ struct PackOperation {
struct DevXcodeCommand: AsyncParsableCommand {
static let configuration = CommandConfiguration(
commandName: "generate-xcode-project",
abstract: "Generate Xcode project"
abstract: "Generate Xcode project",
discussion: "This option does nothing on Linux"
)
func run() async throws {
let result = try await PackOperation(xcode: true).run()
print("Wrote to \(result.path)")
try await PackOperation(xcode: true).run()
}
}
+3 -35
View File
@@ -76,7 +76,7 @@ struct SDKBuilder {
let mode: Mode
// bump this when the sdk builder logic changes
static let sdkEpoch = 3
static let sdkEpoch = 2
// tag from https://github.com/xtool-org/darwin-tools-linux-llvm
static let darwinToolsVersion = "1.1.0"
@@ -425,8 +425,6 @@ struct SDKBuilder {
print()
}
private static let expectedXcodeChildren = ["Info.plist", "version.plist", "Developer"]
// swiftlint:disable:next cyclomatic_complexity function_body_length
private func installDeveloper(in output: URL) async throws -> URL {
let dev = output.appendingPathComponent("Developer")
@@ -460,25 +458,19 @@ struct SDKBuilder {
wanted = try await extractXIP(inputPath: inputPath, outDir: output.path)
appDir = expectedAppDir
cleanupStageDir = nil
try cleanUpXcode(appDir)
case (.xip, .update):
throw Console.Error("Can't update with xip input")
case (.app(let appPath), .buildSlim):
case (.app(let appPath), .buildSlim), (.app(let appPath), .update):
appDir = URL(fileURLWithPath: appPath)
wanted = nil
cleanupStageDir = nil
case (.app(let appPath), .update):
appDir = URL(fileURLWithPath: appPath)
wanted = nil
cleanupStageDir = nil
try cleanUpXcode(appDir)
case (.app(let appPath), .buildNormal):
let source = URL(fileURLWithPath: appPath)
let sourceContentsDir = source.appendingPathComponent("Contents")
let expectedContentsDir = expectedAppDir.appendingPathComponent("Contents")
try FileManager.default.createDirectory(at: expectedContentsDir, withIntermediateDirectories: true)
print("[Copying Xcode.app] This might take a minute...")
for child in Self.expectedXcodeChildren {
for child in ["Info.plist", "version.plist", "Developer"] {
let expectedFile = expectedContentsDir.appendingPathComponent(child)
let sourceFile = sourceContentsDir.appendingPathComponent(child)
guard FileManager.default.fileExists(atPath: sourceFile.path) else {
@@ -638,30 +630,6 @@ struct SDKBuilder {
return dev
}
/// Removes unneeded files from a copy of Xcode.app that's owned by xtool.
///
/// This is conservative: we keep anything that we expect _might_ be necessary
/// even in a future update of xtool, so that SDK self-updates work. We only
/// delete files that we're relatively confident won't be needed.
///
/// - Important: ONLY call this if we own appDir, lest we delete files from the user's Xcode.
private func cleanUpXcode(_ appDir: URL) throws {
let contentsDir = appDir.appendingPathComponent("Contents")
let contents = try FileManager.default.contentsOfDirectory(
at: contentsDir,
includingPropertiesForKeys: nil
)
let expectedChildren = Set(Self.expectedXcodeChildren)
let missingChildren = expectedChildren.subtracting(contents.map(\.lastPathComponent))
guard missingChildren.isEmpty else {
let missing = missingChildren.sorted().joined(separator: ", ")
throw Console.Error("Unrecognized xip layout: missing \(missing)")
}
for child in contents where !expectedChildren.contains(child.lastPathComponent) {
try FileManager.default.removeItem(at: child)
}
}
private func extractXIP(inputPath: String, outDir: String) async throws -> Int {
// unxip doesn't like cooperative cancellation atm so shield it.
// if the user does a ^C during unxip, we'll just wait until extraction
+1
View File
@@ -1,5 +1,6 @@
import Foundation
import XKit
import Version
import ArgumentParser
import Dependencies
import PackLib
+1 -1
View File
@@ -43,7 +43,7 @@ extension FileManager {
do {
try result.checkSuccess()
} catch {
print("Error copying \(srcURL.path) to \(dstURL.path): \(result.standardError)")
print("Error copying \(srcURL.path) to \(dstURL.path): \(result.standardError ?? "unknown")")
throw error
}
return
@@ -1,17 +0,0 @@
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)
}
}
-78
View File
@@ -1,78 +0,0 @@
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)
}
}
@@ -1,84 +0,0 @@
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)
)
}
}
-103
View File
@@ -1,103 +0,0 @@
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)"
}
}
-15
View File
@@ -1,15 +0,0 @@
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"])
}
+7 -6
View File
@@ -24,12 +24,13 @@ enum TestXcode {
return URL(filePath: xcode)
}
#if os(macOS)
let output = try await Subprocess.run(
.path("/usr/bin/xcode-select"),
arguments: ["-p"],
output: .string(limit: .max),
).standardOutput.trimmingCharacters(in: .whitespacesAndNewlines)
if output.hasSuffix(".app/Contents/Developer") {
if
let output = try await Subprocess.run(
.path("/usr/bin/xcode-select"),
arguments: ["-p"],
output: .string(limit: .max, encoding: UTF8.self),
).standardOutput?.trimmingCharacters(in: .whitespacesAndNewlines),
output.hasSuffix(".app/Contents/Developer") {
return URL(filePath: output).deletingLastPathComponent().deletingLastPathComponent()
}
#endif
-86
View File
@@ -1,86 +0,0 @@
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
View File
@@ -1 +1 @@
4.0.7
3.4.3
+84 -109
View File
@@ -8,8 +8,8 @@ GEM
artifactory (3.0.17)
atomos (0.1.3)
aws-eventstream (1.4.0)
aws-partitions (1.1287.0)
aws-sdk-core (3.257.0)
aws-partitions (1.1249.0)
aws-sdk-core (3.247.0)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.992.0)
aws-sigv4 (~> 1.9)
@@ -17,12 +17,11 @@ GEM
bigdecimal
jmespath (~> 1, >= 1.6.1)
logger
rexml (~> 3.4, >= 3.4.2)
aws-sdk-kms (1.132.0)
aws-sdk-core (~> 3, >= 3.256.0)
aws-sdk-kms (1.125.0)
aws-sdk-core (~> 3, >= 3.247.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.232.1)
aws-sdk-core (~> 3, >= 3.256.0)
aws-sdk-s3 (1.222.0)
aws-sdk-core (~> 3, >= 3.247.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.12.1)
@@ -30,75 +29,81 @@ GEM
babosa (1.0.4)
base64 (0.3.0)
benchmark (0.5.0)
bigdecimal (4.1.3)
cgi (0.5.2)
bigdecimal (4.1.2)
claide (1.1.0)
colored (1.2)
colored2 (3.1.2)
commander (4.6.0)
highline (~> 2.0.0)
csv (3.3.6)
csv (3.3.5)
declarative (0.0.20)
digest-crc (0.7.0)
rake (>= 12.0.0, < 14.0.0)
domain_name (0.6.20260907)
domain_name (0.6.20240107)
dotenv (2.8.1)
emoji_regex (3.2.3)
erb (6.0.7)
excon (1.7.1)
logger
faraday (2.14.4)
faraday-net_http (>= 2.0, < 3.5)
json
logger
excon (0.112.0)
faraday (1.10.5)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
faraday-httpclient (~> 1.0)
faraday-multipart (~> 1.0)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.0)
faraday-patron (~> 1.0)
faraday-rack (~> 1.0)
faraday-retry (~> 1.0)
ruby2_keywords (>= 0.0.4)
faraday-cookie_jar (0.0.8)
faraday (>= 0.8.0)
http-cookie (>= 1.0.0)
faraday-follow_redirects (0.5.0)
faraday (>= 1, < 3)
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.1)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-multipart (1.2.0)
multipart-post (~> 2.0)
faraday-net_http (3.4.4)
net-http (~> 0.5)
faraday-retry (2.4.0)
faraday (~> 2.0)
faraday-net_http (1.0.2)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.4)
faraday_middleware (1.2.1)
faraday (~> 1.0)
fastimage (2.4.1)
fastlane (2.240.1)
fastlane (2.234.0)
CFPropertyList (>= 2.3, < 5.0.0)
abbrev (~> 0.1)
addressable (>= 2.9.0, < 3.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
aws-sdk-s3 (~> 1.197)
babosa (>= 1.0.3, < 2.0.0)
base64 (~> 0.2)
benchmark (>= 0.1.0)
bundler (>= 2.4.0, < 5.0.0)
cgi (~> 0.4)
bundler (>= 1.17.3, < 5.0.0)
colored (~> 1.2)
commander (~> 4.6)
csv (~> 3.3)
dotenv (>= 2.1.1, < 3.0.0)
emoji_regex (>= 0.1, < 4.0)
excon (>= 0.71.0, < 2.0.0)
faraday (~> 2.7)
faraday-cookie_jar (~> 0.0.8)
faraday-follow_redirects (~> 0.3)
faraday-multipart (~> 1.0)
faraday-retry (~> 2.0)
excon (>= 0.71.0, < 1.0.0)
faraday (~> 1.0)
faraday-cookie_jar (~> 0.0.6)
faraday_middleware (~> 1.0)
fastimage (>= 2.1.0, < 3.0.0)
fastlane-sirp (>= 1.1.0)
gh_inspector (>= 1.1.2, < 2.0.0)
google-apis-androidpublisher_v3 (~> 0.99)
google-apis-androidpublisher_v3 (~> 0.3)
google-apis-playcustomapp_v1 (~> 0.1)
google-cloud-env (>= 1.6.0, < 2.4.0)
google-cloud-env (>= 1.6.0, <= 2.1.1)
google-cloud-storage (~> 1.31)
highline (~> 2.0)
irb (>= 1.8)
http-cookie (~> 1.0.5)
json (< 3.0.0)
jwt (>= 2.10.3, < 4)
jwt (>= 2.1.0, < 3)
logger (>= 1.6, < 2.0)
mini_magick (>= 4.9.4, < 5.0.0)
multi_json (~> 1.12)
multipart-post (>= 2.0.0, < 3.0.0)
mutex_m (~> 0.3)
naturally (~> 2.2)
@@ -106,11 +111,11 @@ GEM
optparse (>= 0.1.1, < 1.0.0)
ostruct (>= 0.1.0)
plist (>= 3.1.0, < 4.0.0)
rubyzip (>= 3.4.0, < 4.0.0)
security (~> 0.3)
rubyzip (>= 2.0.0, < 3.0.0)
security (= 0.1.5)
simctl (~> 1.6.3)
terminal-notifier (>= 2.0.0, < 3.0.0)
terminal-table (~> 4)
terminal-table (~> 3)
tty-screen (>= 0.6.3, < 1.0.0)
tty-spinner (>= 0.8.0, < 1.0.0)
word_wrap (~> 1.0.0)
@@ -122,31 +127,29 @@ GEM
fastlane-plugin-brew (~> 0.1.1)
fastlane-sirp (1.1.0)
gh_inspector (1.1.3)
google-apis-androidpublisher_v3 (0.108.0)
google-apis-androidpublisher_v3 (0.100.0)
google-apis-core (>= 0.15.0, < 2.a)
google-apis-core (1.2.5)
addressable (~> 2.9)
faraday (~> 2.13)
faraday-follow_redirects (~> 0.3)
googleauth (~> 1.14)
mini_mime (~> 1.1)
multi_json (~> 1.11)
google-apis-core (0.18.0)
addressable (~> 2.5, >= 2.5.1)
googleauth (~> 1.9)
httpclient (>= 2.8.3, < 3.a)
mini_mime (~> 1.0)
mutex_m
representable (~> 3.0)
retriable (>= 3.1, < 5.0)
google-apis-iamcredentials_v1 (0.28.0)
retriable (>= 2.0, < 4.a)
google-apis-iamcredentials_v1 (0.27.0)
google-apis-core (>= 0.15.0, < 2.a)
google-apis-playcustomapp_v1 (0.18.0)
google-apis-playcustomapp_v1 (0.17.0)
google-apis-core (>= 0.15.0, < 2.a)
google-apis-storage_v1 (0.67.0)
google-apis-storage_v1 (0.62.0)
google-apis-core (>= 0.15.0, < 2.a)
google-cloud-core (1.9.0)
google-cloud-core (1.8.0)
google-cloud-env (>= 1.0, < 3.a)
google-cloud-errors (~> 1.0)
google-cloud-env (2.3.1)
base64 (~> 0.2)
google-cloud-env (2.1.1)
faraday (>= 1.0, < 3.a)
google-cloud-errors (1.7.0)
google-cloud-storage (1.62.0)
google-cloud-errors (1.6.0)
google-cloud-storage (1.60.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
google-apis-core (>= 0.18, < 2)
@@ -155,100 +158,72 @@ GEM
google-cloud-core (~> 1.6)
googleauth (~> 1.9)
mini_mime (~> 1.0)
google-logging-utils (0.2.0)
googleauth (1.17.4)
googleauth (1.11.2)
faraday (>= 1.0, < 3.a)
google-cloud-env (~> 2.2)
google-logging-utils (~> 0.1)
jwt (>= 1.4, < 4.0)
google-cloud-env (~> 2.1)
jwt (>= 1.4, < 3.0)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
pstore (~> 0.1)
signet (>= 0.16, < 2.a)
highline (2.0.3)
http-cookie (1.1.6)
http-cookie (1.0.8)
domain_name (~> 0.5)
io-console (0.9.4)
irb (1.18.0)
pp (>= 0.6.0)
prism (>= 1.3.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
httpclient (2.9.0)
mutex_m
jmespath (1.6.2)
json (2.21.2)
jwt (3.3.0)
json (2.19.5)
jwt (2.10.2)
base64
logger (1.7.0)
mini_magick (4.13.2)
mini_mime (1.1.5)
multi_json (1.21.2)
multi_json (1.21.1)
multipart-post (2.4.1)
mutex_m (0.3.0)
nanaimo (0.4.0)
naturally (2.3.0)
net-http (0.9.1)
uri (>= 0.11.1)
nkf (0.3.0)
nkf (0.2.0)
optparse (0.8.1)
os (1.1.4)
ostruct (0.6.3)
plist (3.7.2)
pp (0.6.4)
prettyprint
prettyprint (0.2.0)
prism (1.9.0)
pstore (0.2.1)
public_suffix (7.0.5)
rake (13.4.2)
rbs (4.2.0)
logger
prism (>= 1.6.0)
tsort
rdoc (8.0.0)
erb
prism (>= 1.6.0)
rbs (>= 4.0.0)
tsort
reline (0.7.0)
io-console (~> 0.5)
representable (3.2.0)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (4.2.0)
retriable (3.4.1)
rexml (3.4.4)
rouge (3.28.0)
rubyzip (3.7.0)
security (0.3.0)
signet (0.22.0)
ruby2_keywords (0.0.5)
rubyzip (2.4.1)
security (0.1.5)
signet (0.21.0)
addressable (~> 2.8)
faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 4.0)
multi_json (~> 1.10)
simctl (1.6.10)
CFPropertyList
naturally
terminal-notifier (2.0.0)
terminal-table (4.0.0)
unicode-display_width (>= 1.1.1, < 4)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
trailblazer-option (0.1.2)
tsort (0.2.0)
tty-cursor (0.7.1)
tty-screen (0.8.2)
tty-spinner (0.9.3)
tty-cursor (~> 0.7)
uber (0.1.0)
unicode-display_width (3.3.0)
unicode-emoji (~> 4.3)
unicode-emoji (4.3.0)
uri (1.1.1)
unicode-display_width (2.6.0)
word_wrap (1.0.0)
xcodeproj (1.28.1)
xcodeproj (1.27.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
base64
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.4.0)
nkf
rexml (>= 3.3.6, < 4.0)
xcpretty (0.4.1)
rouge (~> 3.28.0)
@@ -264,4 +239,4 @@ DEPENDENCIES
fastlane-plugin-xcodegen
BUNDLED WITH
4.0.20
2.6.7
+1 -1
View File
@@ -11,7 +11,7 @@ targets:
XToolMac:
type: application
platform: macOS
deploymentTarget: "14.0"
deploymentTarget: "13.0"
sources:
- path: XToolMac
- path: Resources/xtool
+1 -1
View File
@@ -5,7 +5,7 @@
base = "Documentation/"
publish = "xtool.docc/.docc-build"
command = "./build.sh"
environment = { SWIFT_VERSION = "6.4.0" }
environment = { SWIFT_VERSION = "6.3" }
ignore = "git -C .. diff --quiet $CACHED_COMMIT_REF $COMMIT_REF -- Documentation netlify.toml"
[[redirects]]