refactor(xcassets): extract XCAssetCompiler to xtool-org/AssetKit

Drops in-tree Sources/XCAssetCompiler and its tests; depends on
xtool-org/AssetKit 1.0.0 instead. Packer adapts to the new
CompileResult / appIconBundle API.

Author: bytesoverflow

Package.resolved

@@ -43,6 +43,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/AssetKit", .upToNextMinor(from: "1.0.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"),
@@ -67,7 +68,6 @@ let package = Package(
         .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"),
-        .package(url: "https://github.com/tayloraswift/swift-png", from: "4.5.0"),
 
         // TODO: just depend on tuist/XcodeProj instead
         .package(url: "https://github.com/yonaskolb/XcodeGen", from: "2.45.4"),
@@ -171,27 +171,11 @@ let package = Package(
             name: "PackLib",
             dependencies: [
                 "XUtils",
-                "XCAssetCompiler",
+                .product(name: "AssetKit", package: "AssetKit"),
                 .product(name: "Yams", package: "Yams"),
                 .product(name: "XcodeGenKit", package: "XcodeGen", condition: .when(platforms: [.macOS])),
             ]
         ),
-        .target(
-            name: "XCAssetCompiler",
-            dependencies: [
-                "XUtils",
-                .product(name: "PNG", package: "swift-png"),
-            ]
-        ),
-        .testTarget(
-            name: "XCAssetCompilerTests",
-            dependencies: [
-                "XCAssetCompiler",
-            ],
-            resources: [
-                .copy("Fixtures"),
-            ]
-        ),
         .executableTarget(
             name: "xtool",
             dependencies: [

Package.swift

@@ -1,6 +1,6 @@
 import Foundation
 import XUtils
-import XCAssetCompiler
+import AssetKit
 
 public struct Packer: Sendable {
     public let buildSettings: BuildSettings
@@ -125,19 +125,16 @@ public struct Packer: Sendable {
     ) async throws {
         try? FileManager.default.createDirectory(at: outputURL, withIntermediateDirectories: true)
 
-        let compiled: CompiledCatalog?
+        let compiled: CompileResult?
         if let catalogPath = product.assetCatalogPath {
-            let compiler = XCAssetCompiler(
-                deploymentTarget: product.deploymentTarget,
-                diagnostics: diagnostics
-            )
+            let compiler = XCAssetCompiler(deploymentTarget: product.deploymentTarget)
             compiled = try await compiler.compile(catalog: URL(fileURLWithPath: catalogPath))
         } else {
             compiled = nil
         }
 
         let effectiveIconPath: String?
-        if let compiled, compiled.primaryIconName != nil {
+        if let compiled, compiled.appIconBundle != nil {
             if product.iconPath != nil {
                 await diagnostics.warn(
                     "xtool.yml: iconPath is ignored because the asset catalog supplies an AppIcon."
@@ -208,9 +205,9 @@ public struct Packer: Sendable {
                     try carData.write(to: destURL)
                     try Task.checkCancellation()
                 }
-                for emittedFile in compiled.emittedFiles {
-                    let name = emittedFile.name
-                    let data = emittedFile.data
+                for looseFile in compiled.appIconBundle?.looseFiles ?? [] {
+                    let name = looseFile.name
+                    let data = looseFile.data
                     group.addTask {
                         let destURL = outputURL.appendingPathComponent(name)
                         try data.write(to: destURL)
@@ -230,8 +227,8 @@ public struct Packer: Sendable {
                     info["CFBundleSupportedPlatforms"] = ["iPhoneOS"]
                 }
 
-                if let compiled {
-                    info.merge(compiled.infoPlistAdditions, uniquingKeysWith: { _, new in new })
+                if let bundle = compiled?.appIconBundle {
+                    info.merge(bundle.infoPlistAdditions, uniquingKeysWith: { _, new in new })
                 }
 
                 if let iconPath = effectiveIconPath {