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.

Support entitlements with XcodePacker (#88)

Kabir Oberai693e60faef9f
diff --git a/Sources/PackLib/Planner.swift b/Sources/PackLib/Planner.swift
index ccfdb59..ae87063 100644
--- a/Sources/PackLib/Planner.swift
+++ b/Sources/PackLib/Planner.swift
@@ -153,7 +153,8 @@ public struct Planner: Sendable {
bundleID: bundleID,
infoPlist: infoPlist,
resources: resources,
- iconPath: self.schema.base.iconPath
+ iconPath: self.schema.base.iconPath,
+ entitlementsPath: self.schema.base.entitlementsPath
)
}
@@ -217,6 +218,7 @@ public struct Plan: Sendable {
public var infoPlist: [String: any Sendable]
public var resources: [Resource]
public var iconPath: String?
+ public var entitlementsPath: String?
}
public enum Resource: Codable, Sendable {
diff --git a/Sources/PackLib/XcodePacker.swift b/Sources/PackLib/XcodePacker.swift
index 1a56d28..80bb1b5 100644
--- a/Sources/PackLib/XcodePacker.swift
+++ b/Sources/PackLib/XcodePacker.swift
@@ -42,6 +42,15 @@ public struct XcodePacker {
throw StringError("Could not parse deployment target '\(plan.deploymentTarget)'")
}
+ var buildSettings: [String: Any] = [
+ "PRODUCT_BUNDLE_IDENTIFIER": plan.bundleID,
+ "TARGETED_DEVICE_FAMILY": families.map { "\($0)" }.joined(separator: ","),
+ ]
+
+ if let entitlementsPath = plan.entitlementsPath {
+ buildSettings["CODE_SIGN_ENTITLEMENTS"] = fromProjectToRoot + Path(entitlementsPath)
+ }
+
let project = Project(
name: plan.product,
targets: [
@@ -50,10 +59,7 @@ public struct XcodePacker {
type: .application,
platform: .iOS,
deploymentTarget: deploymentTarget,
- settings: Settings(buildSettings: [
- "PRODUCT_BUNDLE_IDENTIFIER": plan.bundleID,
- "TARGETED_DEVICE_FAMILY": families.map { "\($0)" }.joined(separator: ","),
- ]),
+ settings: Settings(buildSettings: buildSettings),
sources: [
TargetSource(path: (fromProjectToRoot + emptyFile).string),
],
diff --git a/Sources/XToolSupport/DevCommand.swift b/Sources/XToolSupport/DevCommand.swift
index f5e4cf5..4a8c685 100644
--- a/Sources/XToolSupport/DevCommand.swift
+++ b/Sources/XToolSupport/DevCommand.swift
@@ -64,7 +64,7 @@ struct PackOperation {
)
let bundle = try await packer.pack()
- if let entitlementsPath = schema.base.entitlementsPath {
+ if let entitlementsPath = plan.entitlementsPath {
let data = try await Data(reading: URL(fileURLWithPath: entitlementsPath))
let decoder = PropertyListDecoder()
let entitlements = try decoder.decode(Entitlements.self, from: data)