Merge branch 'deploy/0.6.5' into productive

Author: fredpi

CHANGELOG.md

@@ -17,6 +17,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 ### Security
 - None.
 
+## [0.6.5] - 2019-09-11
+### Fixed
+- Improve compatibility with rare "non-standard" Package.swift configurations  
+Issue: [#79](https://github.com/JamitLabs/Accio/issues/79) | PR: [#80](https://github.com/JamitLabs/Accio/pull/80) | Author: [Frederick Pietschmann](https://github.com/fredpi)
+
 ## [0.6.4] - 2019-09-01
 ### Fixed
 - Adjusted the bundle version fallback to support both macOS and iOS frameworks

Formula/accio.rb

@@ -1,7 +1,7 @@
 class Accio < Formula
   desc "Dependency manager driven by SwiftPM for iOS/macOS/tvOS/watchOS"
   homepage "https://github.com/JamitLabs/Accio"
-  url "https://github.com/JamitLabs/Accio.git", :tag => "0.6.3", :revision => "f480812e044486cb3ed890e67e3fd32700e7deea"
+  url "https://github.com/JamitLabs/Accio.git", :tag => "0.6.4", :revision => "ae4f670312457f2bc8d8fc6b902bbdcd1b97db5a"
   head "https://github.com/JamitLabs/Accio.git"
 
   depends_on :xcode => ["10.2", :build]

README.md

@@ -13,8 +13,8 @@
              alt="Codebeat Badge">
     </a>
     <a href="https://github.com/JamitLabs/Accio/releases">
-        <img src="https://img.shields.io/badge/Version-0.6.4-blue.svg"
-             alt="Version: 0.6.4">
+        <img src="https://img.shields.io/badge/Version-0.6.5-blue.svg"
+             alt="Version: 0.6.5">
     </a>
     <img src="https://img.shields.io/badge/Swift-5.0-FFAC45.svg"
          alt="Swift: 5.0">
@@ -133,7 +133,7 @@ To configure Accio in a new project, simply run the `init` command and provide b
 accio init -p "XcodeProjectName" -t "AppTargetName"
 ```
 
-This step will create a template `Package.swift` file and set some `.gitignore` entries to keep your repository clean. Please note that if your source code files aren't placed within directories named after the targets, you will need to explicitly set the `path` parameters within the targets in the `Package.swift` file to the correct paths. Also note that the specified `path` must be a directory recursively containing at least one Swift file – but mixing with other languages like (Objective-)C(++) is not supported, so they shouldn't be within the specified directory. The files in there will not be built, they just need to exist in order for SwifPM to work properly, so you could point this anywhere Swift-only code.
+This step will create a template `Package.swift` file and set some `.gitignore` entries to keep your repository clean. Please note that if your source code files aren't placed within directories named after the targets, you will need to explicitly set the `path` parameters within the targets in the `Package.swift` file to the correct paths. Also note that the specified `path` must be a directory recursively containing at least one Swift file – but mixing with other languages like (Objective-)C(++) is not supported, so they shouldn't be within the specified directory. The files in there will not be built, they just need to exist in order for SwiftPM to work properly, so you could point this anywhere Swift-only code.
 
 Run `accio init help` to get a list of all available options.
 

Sources/Accio/main.swift

@@ -3,7 +3,7 @@ import Foundation
 import SwiftCLI
 
 // MARK: - CLI
-let cli = CLI(name: "accio", version: "0.6.4", description: "A dependency manager driven by SwiftPM that works for iOS/tvOS/watchOS/macOS projects.")
+let cli = CLI(name: "accio", version: "0.6.5", description: "A dependency manager driven by SwiftPM that works for iOS/tvOS/watchOS/macOS projects.")
 
 cli.commands = [InitCommand(), InstallCommand(), UpdateCommand(), CleanCommand(), ClearCacheCommand(), SetSharedCacheCommand()]
 cli.globalOptions.append(contentsOf: GlobalOptions.all)

Sources/AccioKit/Models/Manifest.swift

@@ -7,8 +7,8 @@ enum ManifestError: Error {
 class Manifest: Decodable {
     // MARK: - Sub Types
     struct Target: Decodable {
-        struct Dependency: Decodable {
-            let byName: [String]
+        struct Dependency {
+            let names: [String]
         }
 
         let name: String
@@ -50,7 +50,7 @@ extension Manifest {
                 }
             }
 
-            return AppTarget(projectName: name, targetName: $0.name, dependentLibraryNames: $0.dependencies.flatMap { $0.byName }, targetType: targetType!)
+            return AppTarget(projectName: name, targetName: $0.name, dependentLibraryNames: $0.dependencies.flatMap { $0.names }, targetType: targetType!)
         }
     }
 
@@ -63,15 +63,38 @@ extension Manifest {
         }
 
         let productsTargets: [Target] = targets.filter { product.targets.contains($0.name) }
-        let dependencyTargetNames: [String] = Array(Set(productsTargets.flatMap { $0.dependencies.flatMap { $0.byName } })).sorted()
+        let dependencyNames: [String] = Array(Set(productsTargets.flatMap { $0.dependencies.flatMap { $0.names } })).sorted()
 
         let projectTargetNames: [String] = targets.map { $0.name }
         let projectProductNames: [String] = products.map { $0.name }
 
-        let dependencyInternalLibraryNames: [String] = dependencyTargetNames.filter { projectProductNames.contains($0) }
-        let dependencyExternalLibraryNames: [String] = dependencyTargetNames.filter { !projectTargetNames.contains($0) }
+        let dependencyInternalLibraryNames: [String] = dependencyNames.filter { projectProductNames.contains($0) }
+        let dependencyExternalLibraryNames: [String] = dependencyNames.filter { !projectTargetNames.contains($0) }
 
         let libraryNames: [String] = dependencyInternalLibraryNames + dependencyExternalLibraryNames
         return try libraryNames.map { try dependencyGraph.framework(libraryName: $0) }
     }
 }
+
+extension Manifest.Target.Dependency: Decodable {
+    enum ManifestTargetDependencyParsingError: Error { case error }
+    enum CodingKeys: String, CodingKey {
+        case byName
+        case target
+        case product
+    }
+
+    init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+
+        if let byName = try container.decodeIfPresent([String?].self, forKey: .byName) {
+            names = byName.compactMap { $0 }
+        } else if let target = try container.decodeIfPresent([String?].self, forKey: .target) {
+            names = target.compactMap { $0 }
+        } else if let product = try container.decodeIfPresent([String?].self, forKey: .product) {
+            names = product.compactMap { $0 }
+        } else {
+            throw ManifestTargetDependencyParsingError.error
+        }
+    }
+}