Merge branch 'deploy/0.6.2' into productive

Author: fredpi

CHANGELOG.md

@@ -17,6 +17,27 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 ### Security
 - None.
 
+## [0.6.2] - 2019-06-20
+### Added
+- None.
+### Changed
+- None.
+### Deprecated
+- None.
+### Removed
+- None.
+### Fixed
+- Redownload dependencies as a fallback when previously checked out repositories are broken.  
+  Issue: [#27](https://github.com/JamitLabs/Accio/issues/27) | PR: [#40](https://github.com/JamitLabs/Accio/pull/40) | Author: [Frederick Pietschmann](https://github.com/fredpi)
+- Avoid misleading output when building via Carthage.  
+  Issue: [#56](https://github.com/JamitLabs/Accio/issues/56) | PR: [#57](https://github.com/JamitLabs/Accio/pull/57) | Author: [Frederick Pietschmann](https://github.com/fredpi)
+- Warn properly when no schemes can be found.  
+  PR: [#59](https://github.com/JamitLabs/Accio/pull/59) | Author: [Frederick Pietschmann](https://github.com/fredpi)
+- Remove duplicated processing of frameworks referenced by multiple other frameworks.  
+  Issue: [#51](https://github.com/JamitLabs/Accio/issues/51) | PR: [#53](https://github.com/JamitLabs/Accio/pull/53) | Author: [Frederick Pietschmann](https://github.com/fredpi)
+### Security
+- None.
+
 ## [0.6.1] - 2019-04-26
 ### Added
 - Adds several popular GitHub projects for official integration support testing to the Demo project.  

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.0", :revision => "cf48b7b7b1ea716e64eed06c55b36e2e0a24daa5"
+  url "https://github.com/JamitLabs/Accio.git", :tag => "0.6.1", :revision => "6b01bd6458c71eb946402144d6c21e3a855aadac"
   head "https://github.com/JamitLabs/Accio.git"
 
   depends_on :xcode => ["10.2", :build]

Package.resolved

@@ -10,11 +10,11 @@ let package = Package(
         .library(name: "AccioKit", type: .dynamic, targets: ["AccioKit"])
     ],
     dependencies: [
-        .package(url: "https://github.com/Flinesoft/HandySwift.git", .upToNextMajor(from: "2.8.0")),
+        .package(url: "https://github.com/Flinesoft/HandySwift.git", .upToNextMajor(from: "3.0.0")),
         .package(url: "https://github.com/onevcat/Rainbow.git", .upToNextMajor(from: "3.1.4")),
         .package(url: "https://github.com/jakeheis/SwiftCLI.git", .upToNextMajor(from: "5.2.2")),
         .package(url: "https://github.com/kareman/SwiftShell.git", .upToNextMajor(from: "4.1.2")),
-        .package(url: "https://github.com/mrylmz/xcodeproj.git", .branch("master")),
+        .package(url: "https://github.com/tuist/xcodeproj.git", .branch("master")),
     ],
     targets: [
         .target(

Package.swift

@@ -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.1-blue.svg"
-             alt="Version: 0.6.1">
+        <img src="https://img.shields.io/badge/Version-0.6.2-blue.svg"
+             alt="Version: 0.6.2">
     </a>
     <img src="https://img.shields.io/badge/Swift-5.0-FFAC45.svg"
          alt="Swift: 5.0">
@@ -29,6 +29,7 @@
 <p align="center">
     <a href="#installation">Installation</a>
   • <a href="#usage">Usage</a>
+  • <a href="#adding-support-for-accio">Supporting Accio</a>
   • <a href="#contributing">Contributing</a>
   • <a href="#license">License</a>
 </p>
@@ -67,6 +68,14 @@ To **update** it to the latest version, run this instead:
 brew upgrade accio
 ```
 
+### Via [Mint](https://github.com/yonaskolb/Mint):
+
+To **install** Accio or **update** to the latest version, run this command:
+
+```bash
+mint install JamitLabs/Accio
+```
+
 ## Why should I use this?
 
 **TL;DR**: It offers many improvements over Carthage and is targeted towards SwiftPM's integration into Xcode.
@@ -125,8 +134,6 @@ 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.
 
-Please note that you should not provide any test targets with the `-t` parameter of the `init` command. Add them manually to the `Package.swift` using `.testTarget` instead of `.target` since integration of frameworks needs to be done a little differently for test targets. See [this example](https://github.com/JamitLabs/NewProjectTemplate-iOS/blob/stable/Package.swift) manifest file for an always up-to-date real world reference. Alternatively, check the Demo projects [manifest file](https://github.com/JamitLabs/Accio/blob/stable/Demo/Package.swift).
-
 Run `accio init help` to get a list of all available options.
 
 #### Adding Dependencies
@@ -150,7 +157,7 @@ let package = Package(
         .package(url: "https://github.com/Flinesoft/HandyUIKit.git", .upToNextMajor(from: "1.9.1")),
         .package(url: "https://github.com/JamitLabs/MungoHealer.git", .upToNextMajor(from: "0.3.2")),
         .package(url: "https://github.com/SwiftyBeaver/SwiftyBeaver.git", from: "1.6.2"),
-        .package(url: "https://github.com/radex/SwiftyUserDefaults.git", .branch("master")),
+        .package(url: "https://github.com/radex/SwiftyUserDefaults.git", .upToNextMajor(from: "4.0.0")),
     ],
     targets: [
         .target(

README.md

@@ -3,7 +3,7 @@ import Foundation
 import SwiftCLI
 
 // MARK: - CLI
-let cli = CLI(name: "accio", version: "0.6.1", description: "A dependency manager driven by SwiftPM that works for iOS/tvOS/watchOS/macOS projects.")
+let cli = CLI(name: "accio", version: "0.6.2", 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/Accio/main.swift

@@ -34,9 +34,14 @@ extension DependencyInstaller {
                 let frameworkCheckoutPath: String = checkoutsDirUrl.appendingPathComponent(fileName).path
 
                 if try FileManager.default.isDirectory(atPath: frameworkCheckoutPath) {
-                    try bash("git -C '\(frameworkCheckoutPath)' reset HEAD --hard --quiet 2> /dev/null")
-                    try bash("git -C '\(frameworkCheckoutPath)' clean -fd --quiet 2> /dev/null")
-                    try bash("git -C '\(frameworkCheckoutPath)' clean -fdX --quiet 2> /dev/null")
+                    do {
+                        try GitResetService.shared.resetGit(atPath: frameworkCheckoutPath)
+                    }
+                    catch {
+                        // Remove checkout if git reset fails for some reason
+                        // If the checkout is missing, SPM will automatically clone again in the next step
+                        try bash("rm -rf '\(frameworkCheckoutPath)'")
+                    }
                 }
             }
         }

Sources/AccioKit/Commands/Protocols/DependencyInstaller.swift

@@ -5,7 +5,7 @@ enum FrameworkError: Error {
     case noSharedSchemes
 }
 
-struct Framework {
+struct Framework: Equatable {
     let projectName: String
     let libraryName: String
     let projectDirectory: String

Sources/AccioKit/Models/Framework.swift

@@ -12,7 +12,12 @@ final class CachedBuilderService {
     func frameworkProducts(manifest: Manifest, appTarget: AppTarget, dependencyGraph: DependencyGraph, platform: Platform) throws -> [FrameworkProduct] {
         var frameworkProducts: [FrameworkProduct] = []
 
-        for framework in try appTarget.frameworkDependencies(manifest: manifest, dependencyGraph: dependencyGraph).flattenedDeepFirstOrder() {
+        let frameworks = try appTarget.frameworkDependencies(manifest: manifest, dependencyGraph: dependencyGraph).flattenedDeepFirstOrder()
+        let frameworksWithoutDuplicates: [Framework] = frameworks.reduce(into: []) { result, framework in
+            if !result.contains(framework) { result.append(framework) }
+        }
+
+        for framework in frameworksWithoutDuplicates {
             if let cachedFrameworkProduct = try frameworkCachingService.cachedProduct(framework: framework, platform: platform) {
                 frameworkProducts.append(cachedFrameworkProduct)
             } else {
@@ -27,9 +32,7 @@ final class CachedBuilderService {
                     frameworkProducts.append(frameworkProduct)
 
                 case .carthage:
-                    try bash("git -C '\(framework.projectDirectory)' reset HEAD --hard --quiet")
-                    try bash("git -C '\(framework.projectDirectory)' clean -fd --quiet")
-
+                    try GitResetService.shared.resetGit(atPath: framework.projectDirectory, includeUntrackedFiles: false)
                     let frameworkProduct = try carthageBuilderService.build(
                         framework: framework,
                         platform: platform,

Sources/AccioKit/Services/CachedBuilderService.swift

@@ -31,7 +31,12 @@ final class CarthageBuilderService {
             try bash("ln -f -s '\(requiredFrameworkProduct.symbolsFilePath)' '\(productsTargetDirectoryUrl.path)'")
         }
 
+        // remove Cartfile before `carthage build` command as subdependencies have already been built via Accio
+        try bash("rm -rf '\(framework.projectDirectory)/Cartfile'")
+        try bash("rm -rf '\(framework.projectDirectory)/Cartfile.resolved'")
+
         try XcodeProjectSchemeHandlerService.shared.removeUnnecessarySharedSchemes(from: framework, platform: platform)
+
         try bash("/usr/local/bin/carthage build --project-directory '\(framework.projectDirectory)' --platform \(platform.rawValue) --no-skip-current --no-use-binaries")
 
         let frameworkProduct = FrameworkProduct(libraryName: framework.libraryName, platformName: platform.rawValue)
@@ -43,9 +48,7 @@ final class CarthageBuilderService {
 
         // revert any changes to prevent issues when removing checked out dependency
         try bash("rm -rf '\(framework.projectDirectory)/Carthage/Build'")
-        try bash("git -C '\(framework.projectDirectory)' reset HEAD --hard --quiet 2> /dev/null")
-        try bash("git -C '\(framework.projectDirectory)' clean -fd --quiet 2> /dev/null")
-        try bash("git -C '\(framework.projectDirectory)' clean -fdX --quiet 2> /dev/null")
+        try GitResetService.shared.resetGit(atPath: framework.projectDirectory)
 
         guard FileManager.default.fileExists(atPath: frameworkProduct.frameworkDirPath) && FileManager.default.fileExists(atPath: frameworkProduct.symbolsFilePath) else {
             print("Failed to build products to \(platformBuildDir)/\(framework.libraryName).framework(.dSYM).", level: .error)

Sources/AccioKit/Services/CarthageBuilderService.swift

@@ -0,0 +1,16 @@
+import Foundation
+
+final class GitResetService {
+    static let shared = GitResetService()
+
+    private init() { }
+
+    func resetGit(atPath directory: String, includeUntrackedFiles: Bool = true) throws {
+        try bash("git -C '\(directory)' reset HEAD --hard --quiet 2> /dev/null")
+        try bash("git -C '\(directory)' clean -fd --quiet 2> /dev/null")
+
+        if includeUntrackedFiles {
+            try bash("git -C '\(directory)' clean -fdX --quiet 2> /dev/null")
+        }
+    }
+}

Sources/AccioKit/Services/GitResetService.swift

@@ -76,7 +76,7 @@ final class XcodeProjectGeneratorService {
 
     /// Swift 4.2 doesn't support the `platform` parameter in the Package manifest, thus read it from a comment with this method. Also ensure Swift 5 support.
     func platformToVersion(framework: Framework) throws -> [Platform: String] {
-        let platformRegex = Regex(#"\.(iOS|macOS|tvOS|watchOS)\((?:"|.v)(\d+)[\._]?(\d+)?"?\)"#)
+        let platformRegex = try Regex(#"\.(iOS|macOS|tvOS|watchOS)\((?:"|.v)(\d+)[\._]?(\d+)?"?\)"#)
 
         let manifestPath: String = URL(fileURLWithPath: framework.projectDirectory).appendingPathComponent("Package.swift").path
         let manifestContents: String = try String(contentsOfFile: manifestPath)

Sources/AccioKit/Services/XcodeProjectGeneratorService.swift

@@ -157,9 +157,10 @@ final class XcodeProjectIntegrationService {
             print("Adding frameworks \(frameworkNames) to project navigator group '\(platformGroupName)' & linking with target '\(appTarget.targetName)' ...", level: .info)
 
             for frameworkToAdd in frameworksToAdd {
-                let frameworkFileRef = try targetGroup.addNewFile(
+                let frameworkFileRef = try targetGroup.addFile(
                     at: Path(frameworkToAdd.frameworkDirPath),
-                    sourceRoot: Path(workingDirectory)
+                    sourceRoot: Path(workingDirectory),
+                    override: false
                 )
 
                 if let files = frameworksBuildPhase.files, !files.contains(where: { $0.file?.path == frameworkFileRef.path }) {

Sources/AccioKit/Services/XcodeProjectIntegrationService.swift

@@ -26,6 +26,11 @@ final class XcodeProjectSchemeHandlerService {
         let matchingSchemePaths: [String] = librarySchemePaths.filter { expectedSchemeNames.contains($0.fileNameWithoutExtension.lowercased()) }
         let matchingSchemeNames: [String] = matchingSchemePaths.map { $0.fileNameWithoutExtension }
 
+        guard !librarySchemePaths.isEmpty else {
+            print("No shared scheme(s) found; still resuming build.", level: .warning)
+            return
+        }
+
         if !matchingSchemePaths.isEmpty {
             let schemePathsToRemove: [String] = sharedSchemePaths.filter { !matchingSchemePaths.contains($0) }
             print("Found shared scheme(s) \(matchingSchemeNames) matching specified library – removing others: \(schemePathsToRemove.map { $0.fileNameWithoutExtension })", level: .verbose)

Sources/AccioKit/Services/XcodeProjectSchemeHandlerService.swift

@@ -19,7 +19,7 @@ class AppTargetTests: XCTestCase {
                         .package(url: "https://github.com/Flinesoft/HandyUIKit.git", .upToNextMajor(from: "1.9.0")),
                         .package(url: "https://github.com/Flinesoft/Imperio.git", .upToNextMajor(from: "3.0.0")),
                         .package(url: "https://github.com/JamitLabs/MungoHealer.git", .upToNextMajor(from: "0.3.0")),
-                        .package(url: "https://github.com/Moya/Moya.git", .revision("43209d6ac45d244d8be08f4cf6df684b96190616")),
+                        .package(url: "https://github.com/Moya/Moya.git", .upToNextMajor(from: "13.0.1")),
                     ],
                     targets: [
                         .target(

Tests/AccioKitTests/Models/AppTargetTests.swift

@@ -16,7 +16,7 @@ class FrameworkTests: XCTestCase {
                     products: [],
                     dependencies: [
                         .package(url: "https://github.com/Flinesoft/HandySwift.git", .upToNextMajor(from: "2.8.0")),
-                        .package(url: "https://github.com/Moya/Moya.git", .revision("43209d6ac45d244d8be08f4cf6df684b96190616")),
+                        .package(url: "https://github.com/Moya/Moya.git", .upToNextMajor(from: "13.0.1")),
                         .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "4.0.0")),
                     ],
                     targets: [

Tests/AccioKitTests/Models/FrameworkTests.swift

@@ -19,7 +19,7 @@ class ManifestTests: XCTestCase {
                         .package(url: "https://github.com/Flinesoft/HandyUIKit.git", .upToNextMajor(from: "1.9.0")),
                         .package(url: "https://github.com/Flinesoft/Imperio.git", .upToNextMajor(from: "3.0.0")),
                         .package(url: "https://github.com/JamitLabs/MungoHealer.git", .upToNextMajor(from: "0.3.0")),
-                        .package(url: "https://github.com/Moya/Moya.git", .revision("43209d6ac45d244d8be08f4cf6df684b96190616")),
+                        .package(url: "https://github.com/Moya/Moya.git", .upToNextMajor(from: "13.0.1")),
                         .package(url: "https://github.com/Quick/Quick.git", .upToNextMajor(from: "1.0.0")),
                         .package(url: "https://github.com/Quick/Nimble.git", .upToNextMajor(from: "7.0.0")),
                     ],

Tests/AccioKitTests/Models/ManifestTests.swift

@@ -19,7 +19,7 @@ class DependencyResolverServiceTests: XCTestCase {
                         .package(url: "https://github.com/Flinesoft/HandyUIKit.git", .upToNextMajor(from: "1.9.0")),
                         .package(url: "https://github.com/Flinesoft/Imperio.git", .upToNextMajor(from: "3.0.0")),
                         .package(url: "https://github.com/JamitLabs/MungoHealer.git", .upToNextMajor(from: "0.3.0")),
-                        .package(url: "https://github.com/Moya/Moya.git", .revision("43209d6ac45d244d8be08f4cf6df684b96190616")),
+                        .package(url: "https://github.com/Moya/Moya.git", .upToNextMajor(from: "13.0.1")),
                     ],
                     targets: [
                         .target(