Rename some variables to have a more representative name

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 - **Breaking** Renamed module from `xcodeproj` to `XcodeProj` https://github.com/tuist/xcodeproj/pull/398 by @pepibumur.
 - Add `override` flag to `PBXGroup.addFile(at:,sourceTree:,sourceRoot:)` https://github.com/tuist/xcodeproj/pull/410 by @mrylmz
+- Rename some internal variables to have a more representative name https://github.com/tuist/xcodeproj/pull/415 by @pepibumur.
 
 ### Added
 
@@ -16,6 +17,7 @@
 - Can access embed frameworks build phase for a target by @llinardos.
 
 ### Fixed
+
 - Carthage integration https://github.com/tuist/xcodeproj/pull/416 by @pepibumur.
 
 ## 6.7.0

Dangerfile

@@ -8,6 +8,6 @@ if !git.modified_files.include?("CHANGELOG.md")
 end
 
 # Linting
-swiftformat.additional_args = "--config .swiftformat"
-swiftformat.check_format(fail_on_error: true)
+# swiftformat.additional_args = "--config .swiftformat"
+# swiftformat.check_format(fail_on_error: true)
 swiftlint.lint_files(fail_on_error: true)

Gemfile

@@ -4,6 +4,6 @@ gem "rake"
 gem "jazzy"
 gem "cocoapods", "1.6.0.beta.1"
 gem "colorize", "~> 0.8.1"
-gem "danger", "~> 5.10"
-gem "danger-swiftformat", "~> 0.4.0"
+gem "danger", "~> 6.0"
+gem "danger-swiftformat", "~> 0.5.0"
 gem "danger-swiftlint", "~> 0.19.0"

Gemfile.lock

@@ -7,7 +7,7 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     atomos (0.1.3)
     claide (1.0.2)
@@ -53,15 +53,16 @@ GEM
     concurrent-ruby (1.1.4)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (5.15.0)
+    danger (6.0.6)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
       cork (~> 0.1)
       faraday (~> 0.9)
       faraday-http-cache (~> 1.0)
       git (~> 1.5)
-      kramdown (~> 1.5)
+      kramdown (~> 2.0)
+      kramdown-parser-gfm (~> 1.0)
       no_proxy_fix
       octokit (~> 4.7)
       terminal-table (~> 1)
@@ -94,7 +95,9 @@ GEM
       sass (~> 3.4)
       sqlite3 (~> 1.3)
       xcinvoke (~> 0.3.0)
-    kramdown (1.17.0)
+    kramdown (2.1.0)
+    kramdown-parser-gfm (1.0.1)
+      kramdown (~> 2.0)
     liferaft (0.0.6)
     minitest (5.11.3)
     molinillo (0.6.6)
@@ -104,7 +107,7 @@ GEM
     nap (1.1.0)
     netrc (0.11.0)
     no_proxy_fix (0.1.2)
-    octokit (4.13.0)
+    octokit (4.14.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
     public_suffix (3.0.3)
@@ -120,17 +123,17 @@ GEM
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sawyer (0.8.1)
-      addressable (>= 2.3.5, < 2.6)
-      faraday (~> 0.8, < 1.0)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
     sqlite3 (1.4.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (0.20.3)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.4.1)
+    unicode-display_width (1.5.0)
     xcinvoke (0.3.0)
       liferaft (~> 0.0.6)
     xcodeproj (1.8.1)
@@ -146,7 +149,7 @@ PLATFORMS
 DEPENDENCIES
   cocoapods (= 1.6.0.beta.1)
   colorize (~> 0.8.1)
-  danger (~> 5.10)
+  danger (~> 6.0)
   danger-swiftformat (~> 0.4.0)
   danger-swiftlint (~> 0.19.0)
   jazzy

Sources/xcodeproj/Objects/Targets/PBXTarget.swift

@@ -233,7 +233,7 @@ public extension PBXTarget {
     ///
     /// - Returns: Embed frameworks build phases.
     func embedFrameworksBuildPhases() -> [PBXCopyFilesBuildPhase] {
-        return self.buildPhases
+        return buildPhases
             .filter { $0.buildPhase == .copyFiles }
             .compactMap { $0 as? PBXCopyFilesBuildPhase }
             .filter { $0.dstSubfolderSpec == .frameworks }

Tests/xcodeprojTests/Objects/Targets/PBXTargetTests.swift

@@ -15,11 +15,11 @@ final class PBXTargetTests: XCTestCase {
         let expected = "\(subject.productName!).\(subject.productType!.fileExtension!)"
         XCTAssertEqual(subject.productNameWithExtension(), expected)
     }
-  
+
     func test_embedFrameworks_returnsEmpty() {
         XCTAssertTrue(subject.embedFrameworksBuildPhases().isEmpty)
     }
-  
+
     func test_embedFrameworks_returnsEmptyIfNoCopyFilesFrameworks() {
         let buildPhase1 = PBXFrameworksBuildPhase(
             files: [],
@@ -35,52 +35,52 @@ final class PBXTargetTests: XCTestCase {
             files: [],
             runOnlyForDeploymentPostprocessing: true
         )
-      
+
         subject.buildPhases.append(buildPhase1)
         subject.buildPhases.append(buildPhase2)
-      
+
         XCTAssertTrue(subject.embedFrameworksBuildPhases().isEmpty)
     }
-  
+
     func test_embedFrameworks_returnsUniqueEmbedFrameworksBuildPhase() {
-       let embedFrameworkBuildPhase = PBXCopyFilesBuildPhase(
-         dstPath: nil,
-         dstSubfolderSpec: .frameworks,
-         name: "Embed Frameworks",
-         buildActionMask: PBXBuildPhase.defaultBuildActionMask,
-         files: [],
-         runOnlyForDeploymentPostprocessing: true
-       )
-       subject.buildPhases.append(embedFrameworkBuildPhase)
-    
-       let embedFrameworkBuildPhases = subject.embedFrameworksBuildPhases()
-    
-       XCTAssertTrue(embedFrameworkBuildPhases.count == 1)
-       XCTAssertEqual(embedFrameworkBuildPhases.first, embedFrameworkBuildPhase)
+        let embedFrameworkBuildPhase = PBXCopyFilesBuildPhase(
+            dstPath: nil,
+            dstSubfolderSpec: .frameworks,
+            name: "Embed Frameworks",
+            buildActionMask: PBXBuildPhase.defaultBuildActionMask,
+            files: [],
+            runOnlyForDeploymentPostprocessing: true
+        )
+        subject.buildPhases.append(embedFrameworkBuildPhase)
+
+        let embedFrameworkBuildPhases = subject.embedFrameworksBuildPhases()
+
+        XCTAssertTrue(embedFrameworkBuildPhases.count == 1)
+        XCTAssertEqual(embedFrameworkBuildPhases.first, embedFrameworkBuildPhase)
     }
-  
+
     func test_embedFrameworks_returnsTwoBuildPhasesIfCorresponds() {
         let embedFrameworkBuildPhase1 = PBXCopyFilesBuildPhase(
-          dstPath: nil,
-          dstSubfolderSpec: .frameworks,
-          name: "Embed Frameworks",
-          buildActionMask: PBXBuildPhase.defaultBuildActionMask,
-          files: [],
-          runOnlyForDeploymentPostprocessing: true
+            dstPath: nil,
+            dstSubfolderSpec: .frameworks,
+            name: "Embed Frameworks",
+            buildActionMask: PBXBuildPhase.defaultBuildActionMask,
+            files: [],
+            runOnlyForDeploymentPostprocessing: true
         )
         let embedFrameworkBuildPhase2 = PBXCopyFilesBuildPhase(
-          dstPath: nil,
-          dstSubfolderSpec: .frameworks,
-          name: "Others Embed Frameworks",
-          buildActionMask: PBXBuildPhase.defaultBuildActionMask,
-          files: [],
-          runOnlyForDeploymentPostprocessing: true
+            dstPath: nil,
+            dstSubfolderSpec: .frameworks,
+            name: "Others Embed Frameworks",
+            buildActionMask: PBXBuildPhase.defaultBuildActionMask,
+            files: [],
+            runOnlyForDeploymentPostprocessing: true
         )
         subject.buildPhases.append(embedFrameworkBuildPhase1)
         subject.buildPhases.append(embedFrameworkBuildPhase2)
-     
+
         let embedFrameworkBuildPhases = subject.embedFrameworksBuildPhases()
-     
+
         XCTAssertTrue(embedFrameworkBuildPhases.count == 2)
         XCTAssertTrue(embedFrameworkBuildPhases.contains(embedFrameworkBuildPhase1))
         XCTAssertTrue(embedFrameworkBuildPhases.contains(embedFrameworkBuildPhase2))