Skip to content

xadi: use Swift Package #258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
kabiroberai wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

xadi: use Swift Package #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6df896
xadi: use Swift Package
kabiroberai Sep 11, 2026
65679cc
Support xadi on macOS
kabiroberai Sep 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,23 +66,9 @@ RUN cd libimobiledevice \
&& make install DESTDIR=/prefix


FROM build-base AS build-xadi

RUN mkdir -p /prefix/usr/lib

RUN curl -fsS https://dlang.org/install.sh | bash -s ldc

ADD https://github.com/xtool-org/xadi.git#main /xadi

RUN cd xadi \
&& /bin/bash -c 'source $(/root/dlang/install.sh ldc -a) && dub build --build=release' \
&& cp -r bin/libxadi.so /prefix/usr/lib/libxadi.so


FROM build-base AS build-xtool-base

COPY --from=build-limd /prefix/usr /usr
COPY --from=build-xadi /prefix/usr /usr

WORKDIR /xtool

Expand Down
11 changes: 10 additions & 1 deletion Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ let package = Package(
.package(url: "https://github.com/xtool-org/xtool-core", .upToNextMinor(from: "1.4.0")),
.package(url: "https://github.com/xtool-org/SwiftyMobileDevice", .upToNextMinor(from: "1.5.0")),
.package(url: "https://github.com/xtool-org/zsign", .upToNextMinor(from: "1.7.0")),
.package(url: "https://github.com/xtool-org/xadi", .upToNextMinor(from: "0.2.0")),

.package(url: "https://github.com/apple/swift-system", from: "1.4.0"),
.package(url: "https://github.com/apple/swift-http-types", from: "1.3.1"),
Expand Down Expand Up @@ -81,7 +82,6 @@ let package = Package(
.package(url: "https://github.com/yonaskolb/XcodeGen", from: "2.45.4"),
],
targets: [
.systemLibrary(name: "XADI"),
.target(
name: "CXKit",
dependencies: [
Expand Down Expand Up @@ -120,7 +120,7 @@ let package = Package(
"DeveloperAPI",
"CXKit",
"XUtils",
.byName(name: "XADI", condition: .when(platforms: [.linux])),
.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"),
Expand Down
4 changes: 0 additions & 4 deletions Sources/XADI/module.modulemap
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions Sources/XADI/xadi.h
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Sources/XKit/GrandSlam/Anisette/ADIDataProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ private struct UnimplementedRawADIProvider: RawADIProvider {
private enum RawADIProviderDependencyKey: DependencyKey {
static let testValue: RawADIProvider = UnimplementedRawADIProvider()
static let liveValue: RawADIProvider = {
#if os(Linux)
#if canImport(XADI)
return XADIProvider()
#else
return OmnisetteADIProvider()
Expand Down
2 changes: 1 addition & 1 deletion Sources/XKit/GrandSlam/Anisette/XADIProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if os(Linux)
#if canImport(XADI)

import Foundation
import XADI
Expand Down