Skip to content

armgit / xtool

Public Imported from GitHub
0

Cross-platform Xcode replacement. Build and deploy iOS apps with SwiftPM on Linux, Windows, macOS.

Bump Swift version, dependencies (#166)

Kabir Oberai430cbd144b1c
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ee605cd..8577da8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,17 +22,18 @@ jobs:
uses: actions/checkout@v4
- name: Build
run: |
- docker compose run --build --rm xtool swift build --product xtool
+ docker compose run --build --rm xtool bash -c \
+ "swift build --product xtool && .build/debug/xtool --help"
build-macos:
- runs-on: macos-15
+ runs-on: macos-26
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Build
run: |
- swift build --product xtool
+ swift build --product xtool && .build/debug/xtool --help
build-ios:
- runs-on: macos-15
+ runs-on: macos-26
steps:
- name: Checkout
uses: actions/checkout@v4
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 747a5fe..e90c21d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,7 +32,7 @@ jobs:
Linux/packages/xtool-${{ matrix.host.arch }}.AppImage
Linux/packages/xtool-${{ matrix.host.arch }}.AppImage.zsync
build-mac:
- runs-on: macos-15
+ runs-on: macos-26
permissions:
contents: write
steps:
diff --git a/Dockerfile b/Dockerfile
index fc36703..c1c68d9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
# Note: We use 22.04 since AppImage recommends building on the
# oldest configuration that you support
-FROM swift:6.1-jammy AS build-base
+FROM swift:6.2-jammy AS build-base
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
diff --git a/Documentation/xtool.docc/Installation-Linux.md b/Documentation/xtool.docc/Installation-Linux.md
index a75469f..88cc8ba 100644
--- a/Documentation/xtool.docc/Installation-Linux.md
+++ b/Documentation/xtool.docc/Installation-Linux.md
@@ -16,14 +16,14 @@ Once you install WSL, you'll also need to set up USB passthrough. See Microsoft'
### Swift
-Install the Swift 6.1 toolchain for your Linux distribution from <https://swift.org/install/linux>.
+Install the Swift 6.2 toolchain for your Linux distribution from <https://swift.org/install/linux>.
After following the steps there, confirm that Swift is installed correctly:
```bash
swift --version
# should say something like:
-# Swift version 6.1 (swift-6.1-RELEASE)
+# Swift version 6.2 (swift-6.2-RELEASE)
```
### usbmuxd
@@ -62,7 +62,7 @@ sudo apt-get install usbmuxd
### Xcode.xip
-Download **Xcode 16.3** from <https://developer.apple.com/services-account/download?path=/Developer_Tools/Xcode_16.3/Xcode_16.3.xip>. Note the path where `Xcode_16.3.xip` is saved.
+Download **Xcode 26** from <https://download.developer.apple.com/Developer_Tools/Xcode_26.0.1/Xcode_26.0.1_Apple_silicon.xip>. Note the path where `Xcode_26.0.1_Apple_silicon.xip` is saved.
> Note:
>
diff --git a/Package.resolved b/Package.resolved
index d945df0..a3710bb 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -1,13 +1,13 @@
{
- "originHash" : "30ba8b3b894def5b779d979643d77deb698479066658be3b18dad2fb6a193579",
+ "originHash" : "de0ee1f4006f7db9e9d699d71226e89e1a5004a7a72dc088c0d3967f0c8ae38c",
"pins" : [
{
"identity" : "aexml",
"kind" : "remoteSourceControl",
"location" : "https://github.com/tadija/AEXML.git",
"state" : {
- "revision" : "38f7d00b23ecd891e1ee656fa6aeebd6ba04ecc3",
- "version" : "4.6.1"
+ "revision" : "db806756c989760b35108146381535aec231092b",
+ "version" : "4.7.0"
}
},
{
@@ -15,8 +15,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/swift-server/async-http-client.git",
"state" : {
- "revision" : "333f51104b75d1a5b94cb3b99e4c58a3b442c9f7",
- "version" : "1.25.2"
+ "revision" : "7dc119c7edf3c23f52638faadb89182861dee853",
+ "version" : "1.28.0"
}
},
{
@@ -24,8 +24,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/attaswift/BigInt",
"state" : {
- "revision" : "114343a705df4725dfe7ab8a2a326b8883cfd79c",
- "version" : "5.5.1"
+ "revision" : "e07e00fa1fd435143a2dcf8b7eec9a7710b2fdfe",
+ "version" : "5.7.0"
}
},
{
@@ -51,8 +51,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/mattpolzin/OpenAPIKit",
"state" : {
- "revision" : "da7d3a5ddff0dd8e5e9fdb5585d186d645bcc21b",
- "version" : "3.5.0"
+ "revision" : "c1dcd65ccbcc1f3e132293ff2338c72c49a9026d",
+ "version" : "3.8.0"
}
},
{
@@ -69,8 +69,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/onevcat/Rainbow.git",
"state" : {
- "revision" : "0c627a4f8a39ef37eadec1ceec02e4a7f55561ac",
- "version" : "4.1.0"
+ "revision" : "16da5c62dd737258c6df2e8c430f8a3202f655a7",
+ "version" : "4.2.0"
}
},
{
@@ -96,8 +96,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-argument-parser",
"state" : {
- "revision" : "41982a3656a71c768319979febd796c6fd111d5c",
- "version" : "1.5.0"
+ "revision" : "309a47b2b1d9b5e991f36961c983ecec72275be3",
+ "version" : "1.6.1"
}
},
{
@@ -105,8 +105,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-asn1.git",
"state" : {
- "revision" : "a54383ada6cecde007d374f58f864e29370ba5c3",
- "version" : "1.3.2"
+ "revision" : "f70225981241859eb4aa1a18a75531d26637c8cc",
+ "version" : "1.4.0"
+ }
+ },
+ {
+ "identity" : "swift-async-algorithms",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/apple/swift-async-algorithms.git",
+ "state" : {
+ "revision" : "042e1c4d9d19748c9c228f8d4ebc97bb1e339b0b",
+ "version" : "1.0.4"
}
},
{
@@ -114,8 +123,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-atomics.git",
"state" : {
- "revision" : "cd142fd2f64be2100422d658e7411e39489da985",
- "version" : "1.2.0"
+ "revision" : "b601256eab081c0f92f059e12818ac1d4f178ff7",
+ "version" : "1.3.0"
}
},
{
@@ -123,8 +132,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-certificates",
"state" : {
- "revision" : "999fd70c7803da89f3904d635a6815a2a7cd7585",
- "version" : "1.10.0"
+ "revision" : "4b092f15164144c24554e0a75e080a960c5190a6",
+ "version" : "1.14.0"
}
},
{
@@ -139,10 +148,10 @@
{
"identity" : "swift-collections",
"kind" : "remoteSourceControl",
- "location" : "https://github.com/apple/swift-collections.git",
+ "location" : "https://github.com/apple/swift-collections",
"state" : {
- "revision" : "671108c96644956dddcd89dd59c203dcdb36cec7",
- "version" : "1.1.4"
+ "revision" : "8c0c0a8b49e080e54e5e328cc552821ff07cd341",
+ "version" : "1.2.1"
}
},
{
@@ -150,8 +159,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-concurrency-extras",
"state" : {
- "revision" : "82a4ae7170d98d8538ec77238b7eb8e7199ef2e8",
- "version" : "1.3.1"
+ "revision" : "5a3825302b1a0d744183200915a47b508c828e6f",
+ "version" : "1.3.2"
}
},
{
@@ -159,8 +168,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-crypto",
"state" : {
- "revision" : "e8d6eba1fef23ae5b359c46b03f7d94be2f41fed",
- "version" : "3.12.3"
+ "revision" : "95ba0316a9b733e92bb6b071255ff46263bbe7dc",
+ "version" : "3.15.1"
}
},
{
@@ -168,8 +177,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-dependencies",
"state" : {
- "revision" : "4c90d6b2b9bf0911af87b103bb40f41771891596",
- "version" : "1.9.2"
+ "revision" : "a10f9feeb214bc72b5337b6ef6d5a029360db4cc",
+ "version" : "1.10.0"
}
},
{
@@ -177,8 +186,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-docc-plugin",
"state" : {
- "revision" : "85e4bb4e1cd62cec64a4b8e769dcefdf0c5b9d64",
- "version" : "1.4.3"
+ "revision" : "3e4f133a77e644a5812911a0513aeb7288b07d06",
+ "version" : "1.4.5"
}
},
{
@@ -195,8 +204,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-http-structured-headers.git",
"state" : {
- "revision" : "f280fc7676b9940ff2c6598642751ea333c6544f",
- "version" : "1.2.2"
+ "revision" : "1625f271afb04375bf48737a5572613248d0e7a0",
+ "version" : "1.4.0"
}
},
{
@@ -213,8 +222,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-log.git",
"state" : {
- "revision" : "3d8596ed08bd13520157f0355e35caed215ffbfa",
- "version" : "1.6.3"
+ "revision" : "ce592ae52f982c847a4efc0dd881cc9eb32d29f2",
+ "version" : "1.6.4"
}
},
{
@@ -222,8 +231,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio",
"state" : {
- "revision" : "0f54d58bb5db9e064f332e8524150de379d1e51c",
- "version" : "2.82.1"
+ "revision" : "a18bddb0acf7a40d982b2f128ce73ce4ee31f352",
+ "version" : "2.86.2"
}
},
{
@@ -231,8 +240,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-extras.git",
"state" : {
- "revision" : "f1f6f772198bee35d99dd145f1513d8581a54f2c",
- "version" : "1.26.0"
+ "revision" : "a55c3dd3a81d035af8a20ce5718889c0dcab073d",
+ "version" : "1.29.0"
}
},
{
@@ -240,8 +249,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-http2.git",
"state" : {
- "revision" : "4281466512f63d1bd530e33f4aa6993ee7864be0",
- "version" : "1.36.0"
+ "revision" : "5e9e99ec96c53bc2c18ddd10c1e25a3cd97c55e5",
+ "version" : "1.38.0"
}
},
{
@@ -249,8 +258,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-ssl.git",
"state" : {
- "revision" : "6df102a39c8da5fdc2eae29a0f63546d660866fc",
- "version" : "2.30.0"
+ "revision" : "b2b043a8810ab6d51b3ff4df17f057d87ef1ec7c",
+ "version" : "2.34.1"
}
},
{
@@ -258,8 +267,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-transport-services.git",
"state" : {
- "revision" : "cd1e89816d345d2523b11c55654570acd5cd4c56",
- "version" : "1.24.0"
+ "revision" : "e645014baea2ec1c2db564410c51a656cf47c923",
+ "version" : "1.25.1"
}
},
{
@@ -267,8 +276,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-numerics.git",
"state" : {
- "revision" : "e0ec0f5f3af6f3e4d5e7a19d2af26b481acb6ba8",
- "version" : "1.0.3"
+ "revision" : "0c0290ff6b24942dadb83a929ffaaa1481df04a2",
+ "version" : "1.1.1"
}
},
{
@@ -285,8 +294,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-openapi-generator",
"state" : {
- "revision" : "02cab48b66b4b412013827c2938adaf0eb67dc8d",
- "version" : "1.7.2"
+ "revision" : "d74223cc5595a8165181c4d9579243c932e5cd07",
+ "version" : "1.10.3"
}
},
{
@@ -294,8 +303,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-openapi-runtime",
"state" : {
- "revision" : "8f33cc5dfe81169fb167da73584b9c72c3e8bc23",
- "version" : "1.8.2"
+ "revision" : "7722cf8eac05c1f1b5b05895b04cfcc29576d9be",
+ "version" : "1.8.3"
}
},
{
@@ -307,13 +316,22 @@
"version" : "1.1.0"
}
},
+ {
+ "identity" : "swift-service-lifecycle",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/swift-server/swift-service-lifecycle.git",
+ "state" : {
+ "revision" : "e7187309187695115033536e8fc9b2eb87fd956d",
+ "version" : "2.8.0"
+ }
+ },
{
"identity" : "swift-syntax",
"kind" : "remoteSourceControl",
"location" : "https://github.com/swiftlang/swift-syntax",
"state" : {
- "revision" : "f99ae8aa18f0cf0d53481901f88a0991dc3bd4a2",
- "version" : "601.0.1"
+ "revision" : "4799286537280063c85a32f09884cfbca301b1a1",
+ "version" : "602.0.0"
}
},
{
@@ -321,8 +339,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-system",
"state" : {
- "revision" : "a34201439c74b53f0fd71ef11741af7e7caf01e1",
- "version" : "1.4.2"
+ "revision" : "395a77f0aa927f0ff73941d7ac35f2b46d47c9db",
+ "version" : "1.6.3"
}
},
{
@@ -357,8 +375,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/mxcl/Version",
"state" : {
- "revision" : "303a0f916772545e1e8667d3104f83be708a723c",
- "version" : "2.1.0"
+ "revision" : "67ce582bb9de70e1eb2ee41fd71aad3b5f86d97b",
+ "version" : "2.2.0"
}
},
{
@@ -366,8 +384,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/vapor/websocket-kit.git",
"state" : {
- "revision" : "014ccd52891b8c098d7e1033d5e72ed76fef7a86",
- "version" : "2.16.0"
+ "revision" : "8666c92dbbb3c8eefc8008c9c8dcf50bfd302167",
+ "version" : "2.16.1"
}
},
{
@@ -375,8 +393,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/yonaskolb/XcodeGen",
"state" : {
- "revision" : "7193eb447a6f60061f069e07bc1efd32d73c0e19",
- "version" : "2.43.0"
+ "revision" : "21ac9944b0ab546a07422dbed86f33dd2ebd76f8",
+ "version" : "2.44.1"
}
},
{
@@ -384,8 +402,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/tuist/XcodeProj.git",
"state" : {
- "revision" : "dc3b87a4e69f9cd06c6cb16199f5d0472e57ef6b",
- "version" : "8.24.3"
+ "revision" : "b1caa062d4aaab3e3d2bed5fe0ac5f8ce9bf84f4",
+ "version" : "8.27.7"
}
},
{
@@ -393,8 +411,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
"state" : {
- "revision" : "39de59b2d47f7ef3ca88a039dff3084688fe27f4",
- "version" : "1.5.2"
+ "revision" : "b2ed9eabefe56202ee4939dd9fc46b6241c88317",
+ "version" : "1.6.1"
}
},
{
@@ -411,8 +429,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/jpsim/Yams",
"state" : {
- "revision" : "b4b8042411dc7bbb696300a34a4bf3ba1b7ad19b",
- "version" : "5.3.1"
+ "revision" : "3d6871d5b4a5cd519adf233fbb576e0a2af71c17",
+ "version" : "5.4.0"
}
},
{
diff --git a/macOS/.gitignore b/macOS/.gitignore
index 3a09e37..6f1777e 100644
--- a/macOS/.gitignore
+++ b/macOS/.gitignore
@@ -1,4 +1,8 @@
-/XToolMac.xcodeproj
+/XToolMac.xcodeproj/*
+!/XToolMac.xcodeproj/project.xcworkspace
+/XToolMac.xcodeproj/project.xcworkspace/*
+!/XToolMac.xcodeproj/project.xcworkspace/xcshareddata
+
Private*.xcconfig
/fastlane/README.md
diff --git a/macOS/XToolMac.xcodeproj/project.xcworkspace/xcshareddata/Package.resolved b/macOS/XToolMac.xcodeproj/project.xcworkspace/xcshareddata/Package.resolved
new file mode 120000
index 0000000..7eb0d60
--- /dev/null
+++ b/macOS/XToolMac.xcodeproj/project.xcworkspace/xcshareddata/Package.resolved
@@ -0,0 +1 @@
+../../../../Package.resolved
\ No newline at end of file
diff --git a/netlify.toml b/netlify.toml
index f56a64a..c363f59 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -5,7 +5,7 @@
base = "Documentation/"
publish = "xtool.docc/.docc-build"
command = "./build.sh"
- environment = { SWIFT_VERSION = "6.1" }
+ environment = { SWIFT_VERSION = "6.2" }
ignore = "git -C .. diff --quiet $CACHED_COMMIT_REF $COMMIT_REF -- Documentation netlify.toml"
[[redirects]]