Merge branch 'master' into project-format

Author: yonaskolb

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
     name: Xcode ${{ matrix.xcode }}
     strategy:
       matrix:
-        xcode: ["16.0", "16.3"]
+        xcode: ["16.4", "26.2"]
     env:
       DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
     steps:

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Next Version
 
+- Adds an `explicitFolders` property to `TargetSource` that is passed through to `PBXFileSystemSynchronizedRootGroup`, to turn entire subfolders into Resources. #1596 @macguru
+- Allow synced folders to be sorted using `groupOrdering`. #1596 @macguru
+- Fixed synced folders ignoring `createIntermediateGroups=YES` and always beging created at the root level. #1596 @macguru
+- Fix membership exceptions not working for nested synced folders with intermediate groups enabled. #1596 @macguru
+
 ## 2.44.1
 
 ### Fixed

Docs/ProjectSpec.md

@@ -527,6 +527,7 @@ A source can be provided via a string (the path) or an object of the form:
 - [ ] **compilerFlags**: **[String]** or **String** - A list of compilerFlags to add to files under this specific path provided as a list or a space delimited string. Defaults to empty.
 - [ ] **excludes**: **[String]** - A list of [global patterns](https://en.wikipedia.org/wiki/Glob_(programming)) representing the files to exclude. These rules are relative to `path` and _not the directory where `project.yml` resides_. XcodeGen uses Bash 4's Glob behaviors where globstar (**) is enabled.
 - [ ] **includes**: **[String]** - A list of global patterns in the same format as `excludes` representing the files to include. These rules are relative to `path` and _not the directory where `project.yml` resides_. If **excludes** is present and file conflicts with **includes**, **excludes** will override the **includes** behavior.
+- [ ] **explicitFolders**: **[String]** - Only valid for `syncedFolder` type. A list of global patterns in the same format as `excludes` to child folders that Xcode should treat as folder references.
 - [ ] **destinationFilters**: **[[Supported Destinations](#supported-destinations)]** - List of supported platform destinations the files should filter to. Defaults to all supported destinations.
 - [ ] **inferDestinationFiltersByPath**: **Bool** - This is a convenience filter that helps you to filter the files if their paths match these patterns `**/<supportedDestination>/*` or `*_<supportedDestination>.swift`. Note, if you use `destinationFilters` this flag will be ignored.
 - [ ] **createIntermediateGroups**: **Bool** - This overrides the value in [Options](#options).

Package.resolved

@@ -4,7 +4,7 @@ import PackageDescription
 
 let package = Package(
     name: "XcodeGen",
-    platforms: [.macOS(.v10_13)],
+    platforms: [.macOS(.v11)],
     products: [
         .executable(name: "xcodegen", targets: ["XcodeGen"]),
         .library(name: "XcodeGenKit", targets: ["XcodeGenKit"]),
@@ -16,10 +16,10 @@ let package = Package(
         .package(url: "https://github.com/yonaskolb/JSONUtilities.git", from: "4.2.0"),
         .package(url: "https://github.com/kylef/Spectre.git", from: "0.9.2"),
         .package(url: "https://github.com/onevcat/Rainbow.git", from: "4.0.0"),
-        .package(url: "https://github.com/tuist/XcodeProj.git", exact: "8.27.7"),
+        .package(url: "https://github.com/tuist/XcodeProj.git", exact: "9.10.1"),
         .package(url: "https://github.com/jakeheis/SwiftCLI.git", from: "6.0.3"),
         .package(url: "https://github.com/mxcl/Version", from: "2.0.0"),
-        .package(url: "https://github.com/freddi-kit/ArtifactBundleGen", exact: "0.0.6")
+        .package(url: "https://github.com/freddi-kit/ArtifactBundleGen", exact: "0.0.8")
     ],
     targets: [
         .executableTarget(name: "XcodeGen", dependencies: [

Package.swift

@@ -56,6 +56,6 @@ extension Target {
 private extension BuildSettings {
 
     var machOType: String? {
-        self["MACH_O_TYPE"] as? String
+        self["MACH_O_TYPE"]?.stringValue
     }
 }

Sources/ProjectSpec/Linkage.swift

@@ -15,23 +15,17 @@ public struct Settings: Equatable, JSONObjectConvertible, CustomStringConvertibl
         self.groups = groups
     }
 
-    public init(dictionary: [String: Any]) {
-        buildSettings = dictionary
-        configSettings = [:]
-        groups = []
-    }
-
-    public static let empty: Settings = Settings(dictionary: [:])
+    public static let empty: Settings = Settings(buildSettings: [:])
 
     public init(jsonDictionary: JSONDictionary) throws {
         if jsonDictionary["configs"] != nil || jsonDictionary["groups"] != nil || jsonDictionary["base"] != nil {
             groups = jsonDictionary.json(atKeyPath: "groups") ?? jsonDictionary.json(atKeyPath: "presets") ?? []
             let buildSettingsDictionary: JSONDictionary = jsonDictionary.json(atKeyPath: "base") ?? [:]
-            buildSettings = buildSettingsDictionary
+            buildSettings = buildSettingsDictionary.mapValues { BuildSetting(any: $0) }
 
             self.configSettings = try Self.extractValidConfigs(from: jsonDictionary)
         } else {
-            buildSettings = jsonDictionary
+            buildSettings = jsonDictionary.mapValues { BuildSetting(any: $0) }
             configSettings = [:]
             groups = []
         }
@@ -58,7 +52,7 @@ public struct Settings: Equatable, JSONObjectConvertible, CustomStringConvertibl
     }
 
     public static func == (lhs: Settings, rhs: Settings) -> Bool {
-        NSDictionary(dictionary: lhs.buildSettings).isEqual(to: rhs.buildSettings) &&
+        lhs.buildSettings == rhs.buildSettings &&
             lhs.configSettings == rhs.configSettings &&
             lhs.groups == rhs.groups
     }
@@ -96,14 +90,14 @@ public struct Settings: Equatable, JSONObjectConvertible, CustomStringConvertibl
 
 extension Settings: ExpressibleByDictionaryLiteral {
 
-    public init(dictionaryLiteral elements: (String, Any)...) {
-        var dictionary: [String: Any] = [:]
-        elements.forEach { dictionary[$0.0] = $0.1 }
-        self.init(dictionary: dictionary)
+    public init(dictionaryLiteral elements: (String, BuildSetting)...) {
+        var buildSettings: BuildSettings = [:]
+        elements.forEach { buildSettings[$0.0] = $0.1 }
+        self.init(buildSettings: buildSettings)
     }
 }
 
-extension Dictionary where Key == String, Value: Any {
+extension Dictionary where Key == String {
 
     public func merged(_ dictionary: [Key: Value]) -> [Key: Value] {
         var mergedDictionary = self
@@ -116,26 +110,56 @@ extension Dictionary where Key == String, Value: Any {
             self[key] = value
         }
     }
-
-    public func equals(_ dictionary: BuildSettings) -> Bool {
-        NSDictionary(dictionary: self).isEqual(to: dictionary)
-    }
 }
 
 public func += (lhs: inout BuildSettings, rhs: BuildSettings?) {
     guard let rhs = rhs else { return }
     lhs.merge(rhs)
 }
 
+extension BuildSetting {
+
+    public init(any value: Any) {
+        if let array = value as? [String] {
+            self = .array(array)
+        } else if let bool = value as? Bool {
+            self = .init(booleanLiteral: bool)
+        } else {
+            self = .string("\(value)")
+        }
+    }
+
+    public func toAny() -> Any {
+        switch self {
+        case let .string(value): return value
+        case let .array(value): return value
+        }
+    }
+}
+
+extension ProjectAttribute {
+
+    public init(any value: Any) {
+        if let array = value as? [String] {
+            self = .array(array)
+        } else if let object = value as? PBXObject {
+            self = .targetReference(object)
+        } else {
+            self = .string("\(value)")
+        }
+    }
+}
+
 extension Settings: JSONEncodable {
     public func toJSONValue() -> Any {
+        let anySettings = buildSettings.mapValues { $0.toAny() }
         if groups.count > 0 || configSettings.count > 0 {
             return [
-                "base": buildSettings,
+                "base": anySettings,
                 "groups": groups,
                 "configs": configSettings.mapValues { $0.toJSONValue() },
             ] as [String : Any]
         }
-        return buildSettings
+        return anySettings
     }
 }

Sources/ProjectSpec/Settings.swift

@@ -16,6 +16,7 @@ public struct TargetSource: Equatable {
     public var compilerFlags: [String]
     public var excludes: [String]
     public var includes: [String]
+    public var explicitFolders: [String]
     public var type: SourceType?
     public var optional: Bool
     public var buildPhase: BuildPhaseSpec?
@@ -47,6 +48,7 @@ public struct TargetSource: Equatable {
         compilerFlags: [String] = [],
         excludes: [String] = [],
         includes: [String] = [],
+        explicitFolders: [String] = [],
         type: SourceType? = nil,
         optional: Bool = optionalDefault,
         buildPhase: BuildPhaseSpec? = nil,
@@ -63,6 +65,7 @@ public struct TargetSource: Equatable {
         self.compilerFlags = compilerFlags
         self.excludes = excludes
         self.includes = includes
+        self.explicitFolders = explicitFolders
         self.type = type
         self.optional = optional
         self.buildPhase = buildPhase
@@ -106,6 +109,7 @@ extension TargetSource: JSONObjectConvertible {
         headerVisibility = jsonDictionary.json(atKeyPath: "headerVisibility")
         excludes = jsonDictionary.json(atKeyPath: "excludes") ?? []
         includes = jsonDictionary.json(atKeyPath: "includes") ?? []
+        explicitFolders = jsonDictionary.json(atKeyPath: "explicitFolders") ?? []
         type = jsonDictionary.json(atKeyPath: "type")
         optional = jsonDictionary.json(atKeyPath: "optional") ?? TargetSource.optionalDefault
 
@@ -133,6 +137,7 @@ extension TargetSource: JSONEncodable {
             "compilerFlags": compilerFlags,
             "excludes": excludes,
             "includes": includes,
+            "explicitFolders": explicitFolders,
             "name": name,
             "group": group,
             "headerVisibility": headerVisibility?.rawValue,