Merge branch 'main' into feat/default-configuration-settings

Author: pepicrft

.all-contributorsrc

@@ -60,6 +60,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "alexmx",
+      "name": "Alex Maimescu",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1628901?v=4",
+      "profile": "https://github.com/alexmx",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.mise.toml

@@ -1,5 +1,5 @@
 [tools]
-tuist = "4.50.1"
+tuist = "4.50.2"
 swiftlint = "0.54.0"
 swiftformat = "0.53.3"
 "git-cliff" = "2.6.1"

CHANGELOG.md

@@ -5,6 +5,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.11.0] - 2025-05-20
+### Details
+#### Feat
+- Add support for defining Info.plist files using a variable by @alexmx in [#184](https://github.com/tuist/XcodeGraph/pull/184)
+
+## New Contributors
+* @alexmx made their first contribution in [#184](https://github.com/tuist/XcodeGraph/pull/184)
+## [1.10.14] - 2025-05-20
+### Details
+#### Chore
+- Update dependency tuist/filesystem to from: "0.9.2" by @renovate[bot] in [#199](https://github.com/tuist/XcodeGraph/pull/199)
+
+## [1.10.13] - 2025-05-20
+### Details
+#### Chore
+- Update dependency tuist to v4.50.2 by @renovate[bot] in [#198](https://github.com/tuist/XcodeGraph/pull/198)
+
 ## [1.10.12] - 2025-05-19
 ### Details
 #### Chore
@@ -796,6 +813,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## New Contributors
 * @darrarski made their first contribution
+[1.11.0]: https://github.com/tuist/XcodeGraph/compare/1.10.14..1.11.0
+[1.10.14]: https://github.com/tuist/XcodeGraph/compare/1.10.13..1.10.14
+[1.10.13]: https://github.com/tuist/XcodeGraph/compare/1.10.12..1.10.13
 [1.10.12]: https://github.com/tuist/XcodeGraph/compare/1.10.11..1.10.12
 [1.10.11]: https://github.com/tuist/XcodeGraph/compare/1.10.10..1.10.11
 [1.10.10]: https://github.com/tuist/XcodeGraph/compare/1.10.9..1.10.10

Package.swift

@@ -82,7 +82,7 @@ let package = Package(
         .package(url: "https://github.com/tuist/Path.git", .upToNextMajor(from: "0.3.8")),
         .package(url: "https://github.com/tuist/XcodeProj", .upToNextMajor(from: "9.4.1")),
         .package(url: "https://github.com/tuist/Command.git", from: "0.13.0"),
-        .package(url: "https://github.com/tuist/FileSystem.git", .upToNextMajor(from: "0.9.1")),
+        .package(url: "https://github.com/tuist/FileSystem.git", .upToNextMajor(from: "0.9.2")),
         .package(url: "https://github.com/apple/swift-service-context", .upToNextMajor(from: "1.2.0")),
         .package(url: "https://github.com/Kolos65/Mockable.git", .upToNextMajor(from: "0.3.2")),
         .package(url: "https://github.com/p-x9/MachOKit", .upToNextMajor(from: "0.32.0")),

README.md

@@ -1,6 +1,6 @@
 # ፨ XcodeGraph
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-6-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-7-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 XcodeGraph is a Swift Package that contains data structures to model an Xcode projects graph.
@@ -61,6 +61,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/rgnns"><img src="https://avatars.githubusercontent.com/u/811827?v=4?s=100" width="100px;" alt="Gabriel Liévano"/><br /><sub><b>Gabriel Liévano</b></sub></a><br /><a href="https://github.com/tuist/XcodeGraph/commits?author=rgnns" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/fila95"><img src="https://avatars.githubusercontent.com/u/7265334?v=4?s=100" width="100px;" alt="Giovanni Filaferro"/><br /><sub><b>Giovanni Filaferro</b></sub></a><br /><a href="https://github.com/tuist/XcodeGraph/commits?author=fila95" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Garfeild"><img src="https://avatars.githubusercontent.com/u/12799?v=4?s=100" width="100px;" alt="Anton Kolchunov"/><br /><sub><b>Anton Kolchunov</b></sub></a><br /><a href="https://github.com/tuist/XcodeGraph/commits?author=Garfeild" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/alexmx"><img src="https://avatars.githubusercontent.com/u/1628901?v=4?s=100" width="100px;" alt="Alex Maimescu"/><br /><sub><b>Alex Maimescu</b></sub></a><br /><a href="https://github.com/tuist/XcodeGraph/commits?author=alexmx" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

Sources/XcodeGraph/Models/Plist.swift

@@ -103,6 +103,9 @@ public enum InfoPlist: Equatable, Codable, Sendable {
     // User defined dictionary of keys/values for an info.plist file.
     case dictionary([String: Plist.Value], configuration: BuildConfiguration? = nil)
 
+    // A user defined xcconfig variable map to .entitlements file
+    case variable(String, configuration: BuildConfiguration? = nil)
+
     // User defined dictionary of keys/values for an info.plist file extending the default set of keys/values
     // for the target type.
     case extendingDefault(with: [String: Plist.Value], configuration: BuildConfiguration? = nil)
@@ -123,7 +126,12 @@ public enum InfoPlist: Equatable, Codable, Sendable {
 
 extension InfoPlist: ExpressibleByStringLiteral {
     public init(stringLiteral value: String) {
-        self = .file(path: try! AbsolutePath(validating: value)) // swiftlint:disable:this force_try
+        let regexPattern = #"^\$\((.+)\)|^\$\{(.+)\}"#
+        if let _ = value.range(of: regexPattern, options: .regularExpression) {
+            self = .variable(value)
+        } else {
+            self = .file(path: try! AbsolutePath(validating: value)) // swiftlint:disable:this force_try
+        }
     }
 }
 

Tests/XcodeGraphTests/Models/InfoPlistTests.swift

@@ -41,4 +41,14 @@ final class InfoPlistTests: XCTestCase {
         // Then
         XCTAssertEqual(subject.path, try AbsolutePath(validating: "/path/Info.list"))
     }
+
+    func test_expressive_by_string_literal_using_build_variable() {
+        // Given
+        let subject1: InfoPlist = "$(CONFIGURATION)/Info.list"
+        let subject2: InfoPlist = "${CONFIGURATION}/Info.list"
+
+        // Then
+        XCTAssertEqual(subject1, .variable("$(CONFIGURATION)/Info.list", configuration: nil))
+        XCTAssertEqual(subject2, .variable("${CONFIGURATION}/Info.list", configuration: nil))
+    }
 }