Update to ApplePackages

Author: lbr77

.gitignore

@@ -69,6 +69,7 @@
 .serverless/
 .swiftpm
 .tern-port
+.tmp/
 .vscode-test
 .vuepress/dist
 .yarn-integrity

backend-swift/Makefile

@@ -4,13 +4,13 @@ DEVICE_HOST ?=
 THEOS ?= $(HOME)/theos
 THEOS_PACKAGE_SCHEME ?= rootless
 THEOS_PACKAGE_DIR_NAME ?= debs
-TARGET := iphone:clang:latest:13.0
+TARGET := iphone:clang:latest:15.0
 ARCHS := arm64
 
 PACKAGE_NAME := wiki.qaq.unfaird
 EXECUTABLE_NAME := UnfairDaemon
 BUILD_INFO := Sources/UnfairDaemonCore/BuildInfo.swift
-IOS_TARGET := arm64-apple-ios13.0
+IOS_TARGET := arm64-apple-ios15.0
 IOS_BUILD_DIR := .build/ios-release
 ASSPPWEB_DIR ?= ..
 ASSPPWEB_FRONTEND_DIST := $(ASSPPWEB_DIR)/frontend/dist
@@ -21,14 +21,7 @@ LDID := $(THEOS)/bin/ldid
 endif
 SWIFT_STDLIB_TOOL ?= $(shell xcrun --find swift-stdlib-tool 2>/dev/null)
 
-IOS_SWIFT_FLAGS := \
-	-Xswiftc -sdk -Xswiftc "$(IPHONEOS_SDK_PATH)" \
-	-Xswiftc -target -Xswiftc $(IOS_TARGET) \
-	-Xcc -arch -Xcc arm64 \
-	-Xcc --target=$(IOS_TARGET) \
-	-Xcc -isysroot -Xcc "$(IPHONEOS_SDK_PATH)" \
-	-Xcc -mios-version-min=13.0 \
-	-Xcc -miphoneos-version-min=13.0
+IOS_SWIFT_FLAGS := --triple $(IOS_TARGET) --sdk "$(IPHONEOS_SDK_PATH)"
 
 .PHONY: all build release ios-release assppweb-frontend mac-install mac-uninstall generate-build-info clean-package
 

backend-swift/Package.swift

@@ -6,15 +6,16 @@ let package = Package(
     name: "unfaird",
     platforms: [
         .macOS(.v14),
-        .iOS(.v13),
+        .iOS(.v15),
     ],
     products: [
         .executable(name: "UnfairDaemon", targets: ["UnfairDaemon"]),
     ],
     dependencies: [
         .package(name: "unfair-swift", path: "../../unfair"),
+        .package(url: "https://github.com/Lakr233/ApplePackage.git", exact: "1.2.7"),
         .package(url: "https://github.com/swift-server/async-http-client.git", exact: "1.33.1"),
-        .package(url: "https://github.com/apple/swift-argument-parser.git", "1.0.0"..<"1.1.0"),
+        .package(url: "https://github.com/apple/swift-argument-parser.git", "1.3.0"..<"2.0.0"),
         .package(url: "https://github.com/vapor/vapor.git", exact: "4.60.0"),
         .package(url: "https://github.com/weichsel/ZIPFoundation.git", exact: "0.9.19"),
     ],
@@ -24,6 +25,7 @@ let package = Package(
             name: "UnfairDaemonCore",
             dependencies: [
                 .product(name: "AsyncHTTPClient", package: "async-http-client"),
+                .product(name: "ApplePackage", package: "ApplePackage"),
                 .product(name: "Vapor", package: "vapor"),
                 .product(name: "ZIPFoundation", package: "ZIPFoundation"),
             ]