Merge branch 'master' into feature/outdated

.swift-version

@@ -1 +1 @@
-4.0
+4.0.3

.travis.yml

@@ -12,30 +12,30 @@ matrix:
   include:
     - os: osx
       language: objective-c
-      osx_image: xcode9
+      osx_image: xcode9.2
       script: make test
       env: JOB=CI_BUILD_TEST
     - os: osx
       language: objective-c
-      osx_image: xcode9
+      osx_image: xcode9.2
       script: make package
       env: JOB=CI_BUILD_PACKAGE
     - os: osx
       language: objective-c
-      osx_image: xcode9
+      osx_image: xcode9.2
       script:
         - make swiftpm
         - .build/release/carthage version
       env: JOB=CI_BUILD_SWIFTPM
     - os: osx
       language: objective-c
-      osx_image: xcode9
+      osx_image: xcode9.2
       script:
         - make swiftpm_test
       env: JOB=CI_BUILD_SWIFTPM_TEST
     - os: osx
       language: objective-c
-      osx_image: xcode9
+      osx_image: xcode9.2
       script:
         - brew uninstall carthage
         - HOMEBREW_NO_AUTO_UPDATE=1 brew install bats
@@ -45,7 +45,7 @@ matrix:
         - JOB=INTEGRATION_TESTS
     - os: osx
       language: objective-c
-      osx_image: xcode9
+      osx_image: xcode9.2
       script:
         - brew uninstall carthage
         - HOMEBREW_NO_AUTO_UPDATE=1 brew install bats        

Cartfile

@@ -1,7 +1,7 @@
 github "antitypical/Result" ~> 3.2
-github "Carthage/ReactiveTask" ~> 0.13
+github "Carthage/ReactiveTask" ~> 0.14
 github "Carthage/Commandant" ~> 0.12
 github "jdhealy/PrettyColors" ~> 5.0
-github "ReactiveCocoa/ReactiveSwift" ~> 2.0
-github "mdiep/Tentacle" ~> 0.10
+github "ReactiveCocoa/ReactiveSwift" ~> 3.0
+github "mdiep/Tentacle" ~> 0.11
 github "thoughtbot/Curry" ~> 3.0

Cartfile.resolved

@@ -1,10 +1,10 @@
 github "Carthage/Commandant" "0.12.0"
-github "Carthage/ReactiveTask" "0.13.0"
-github "Quick/Nimble" "v7.0.2"
+github "Carthage/ReactiveTask" "0.14.0"
+github "Quick/Nimble" "v7.0.3"
 github "Quick/Quick" "v1.2.0"
-github "ReactiveCocoa/ReactiveSwift" "2.0.1"
+github "ReactiveCocoa/ReactiveSwift" "3.0.0"
 github "antitypical/Result" "3.2.4"
-github "jdhealy/PrettyColors" "v5.0.0"
+github "jdhealy/PrettyColors" "5.0.1"
 github "jspahrsummers/xcconfigs" "0.9"
-github "mdiep/Tentacle" "0.10.0"
+github "mdiep/Tentacle" "0.11.0"
 github "thoughtbot/Curry" "v3.0.0"

Carthage.xcodeproj/project.pbxproj

@@ -24,6 +24,8 @@
 		67C870081A7A04E100F6647C /* Formatting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67C870071A7A04E100F6647C /* Formatting.swift */; };
 		88ED56D619ECE34900CBF5C4 /* Git.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ED56D519ECE34900CBF5C4 /* Git.swift */; };
 		89A8F1781C24AB3C00C0E75A /* FrameworkExtensionsSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89A8F1771C24AB3C00C0E75A /* FrameworkExtensionsSpec.swift */; };
+		8AC381441FC3AA4A007CF7E8 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8AC381421FC3A900007CF7E8 /* Alamofire.framework */; settings = {ATTRIBUTES = (Required, ); }; };
+		8AC381451FC3AAE4007CF7E8 /* Alamofire.framework in Resources */ = {isa = PBXBuildFile; fileRef = 8AC381421FC3A900007CF7E8 /* Alamofire.framework */; };
 		98400F5E1BD24DFA008C5DDE /* carthage-bash-completion in Copy Scripts */ = {isa = PBXBuildFile; fileRef = 98400F5A1BD24DC5008C5DDE /* carthage-bash-completion */; };
 		98400F5F1BD24DFA008C5DDE /* carthage-zsh-completion in Copy Scripts */ = {isa = PBXBuildFile; fileRef = 98400F5B1BD24DC5008C5DDE /* carthage-zsh-completion */; };
 		A1411ED61EFC1BFD0060461F /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1411ED51EFC1BFD0060461F /* Constants.swift */; };
@@ -185,6 +187,7 @@
 		82ABB0CF1EF7D43800AC2A75 /* .swiftlint.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .swiftlint.yml; sourceTree = "<group>"; };
 		88ED56D519ECE34900CBF5C4 /* Git.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Git.swift; sourceTree = "<group>"; };
 		89A8F1771C24AB3C00C0E75A /* FrameworkExtensionsSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FrameworkExtensionsSpec.swift; sourceTree = "<group>"; };
+		8AC381421FC3A900007CF7E8 /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Alamofire.framework; sourceTree = "<group>"; };
 		98400F5A1BD24DC5008C5DDE /* carthage-bash-completion */ = {isa = PBXFileReference; lastKnownFileType = text; path = "carthage-bash-completion"; sourceTree = "<group>"; };
 		98400F5B1BD24DC5008C5DDE /* carthage-zsh-completion */ = {isa = PBXFileReference; lastKnownFileType = text; path = "carthage-zsh-completion"; sourceTree = "<group>"; };
 		A1411ED51EFC1BFD0060461F /* Constants.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
@@ -303,6 +306,7 @@
 				D01F8A4C19EA28FE00643E7C /* Nimble.framework in Frameworks */,
 				D01F8A4A19EA28FE00643E7C /* Quick.framework in Frameworks */,
 				D0D1217819E87B05005E4BAA /* CarthageKit.framework in Frameworks */,
+				8AC381441FC3AA4A007CF7E8 /* Alamofire.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -351,6 +355,7 @@
 				2190FA961FD5B05F008D8A79 /* OutdatedDependencies */,
 				CD9A779A1EDD7FEB00A77B00 /* BinaryOnly */,
 				CD9A77981EDD7E2000A77B00 /* DuplicateDependencies */,
+				8AC381421FC3A900007CF7E8 /* Alamofire.framework */,
 				3B19041C1E4CFE3900A866AD /* FakeOldObjc.framework */,
 				3B19041D1E4CFE3900A866AD /* FakeOldSwift.framework */,
 				CD09E2881F0E3F1400A0378A /* FakeSwift.framework */,
@@ -702,6 +707,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				8AC381451FC3AAE4007CF7E8 /* Alamofire.framework in Resources */,
 				CD9A779B1EDD7FEB00A77B00 /* BinaryOnly in Resources */,
 				3B19041E1E4CFE4A00A866AD /* FakeOldObjc.framework in Resources */,
 				3B19041F1E4CFE4A00A866AD /* FakeOldSwift.framework in Resources */,
@@ -975,6 +981,7 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(DEVELOPER_FRAMEWORKS_DIR)",
 					"$(inherited)",
+					"$(PROJECT_DIR)/Tests/CarthageKitTests/Resources",
 				);
 				INFOPLIST_FILE = Tests/CarthageKitTests/Info.plist;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
@@ -989,6 +996,7 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(DEVELOPER_FRAMEWORKS_DIR)",
 					"$(inherited)",
+					"$(PROJECT_DIR)/Tests/CarthageKitTests/Resources",
 				);
 				INFOPLIST_FILE = Tests/CarthageKitTests/Info.plist;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
@@ -1037,6 +1045,7 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(DEVELOPER_FRAMEWORKS_DIR)",
 					"$(inherited)",
+					"$(PROJECT_DIR)/Tests/CarthageKitTests/Resources",
 				);
 				INFOPLIST_FILE = Tests/CarthageKitTests/Info.plist;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
@@ -1085,6 +1094,7 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(DEVELOPER_FRAMEWORKS_DIR)",
 					"$(inherited)",
+					"$(PROJECT_DIR)/Tests/CarthageKitTests/Resources",
 				);
 				INFOPLIST_FILE = Tests/CarthageKitTests/Info.plist;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
@@ -1096,6 +1106,10 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = D0D1213419E878CC005E4BAA /* Mac-Application.xcconfig */;
 			buildSettings = {
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Tests/CarthageKitTests/Resources",
+				);
 				INFOPLIST_FILE = Source/carthage/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/. @executable_path/CarthageKit.framework/Versions/Current/Frameworks /Library/Frameworks /Library/Frameworks/CarthageKit.framework/Versions/Current/Frameworks $(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
@@ -1107,6 +1121,10 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = D0D1213419E878CC005E4BAA /* Mac-Application.xcconfig */;
 			buildSettings = {
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Tests/CarthageKitTests/Resources",
+				);
 				INFOPLIST_FILE = Source/carthage/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/. @executable_path/CarthageKit.framework/Versions/Current/Frameworks /Library/Frameworks /Library/Frameworks/CarthageKit.framework/Versions/Current/Frameworks $(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
@@ -1118,6 +1136,10 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = D0D1213419E878CC005E4BAA /* Mac-Application.xcconfig */;
 			buildSettings = {
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Tests/CarthageKitTests/Resources",
+				);
 				INFOPLIST_FILE = Source/carthage/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/. @executable_path/CarthageKit.framework/Versions/Current/Frameworks /Library/Frameworks /Library/Frameworks/CarthageKit.framework/Versions/Current/Frameworks $(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
@@ -1129,6 +1151,10 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = D0D1213419E878CC005E4BAA /* Mac-Application.xcconfig */;
 			buildSettings = {
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Tests/CarthageKitTests/Resources",
+				);
 				INFOPLIST_FILE = Source/carthage/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/. @executable_path/CarthageKit.framework/Versions/Current/Frameworks /Library/Frameworks /Library/Frameworks/CarthageKit.framework/Versions/Current/Frameworks $(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";

Carthage.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildSystemType</key>
+	<string>Latest</string>
+</dict>
+</plist>

Package.resolved

@@ -24,17 +24,17 @@
         "repositoryURL": "https://github.com/Quick/Nimble.git",
         "state": {
           "branch": null,
-          "revision": "38c9ab0846a3fbec308eb2aa9ef68b10a7434eb4",
-          "version": "7.0.2"
+          "revision": "22800b0954c89344bb8c87f8ab93378076716fb7",
+          "version": "7.0.3"
         }
       },
       {
         "package": "PrettyColors",
         "repositoryURL": "https://github.com/jdhealy/PrettyColors.git",
         "state": {
           "branch": null,
-          "revision": "40dba7f0390e6daf855448acbe8762b40a2366cc",
-          "version": "5.0.0"
+          "revision": "1954a28331668a706134dc315fe264b15b74984e",
+          "version": "5.0.1"
         }
       },
       {
@@ -51,17 +51,17 @@
         "repositoryURL": "https://github.com/ReactiveCocoa/ReactiveSwift.git",
         "state": {
           "branch": null,
-          "revision": "b9d5b350a446b85704396ce332a1f9e4960cfc6b",
-          "version": "2.0.1"
+          "revision": "2ec944c43ef9cf6b1380629e3ea483f62a7afaef",
+          "version": "3.0.0"
         }
       },
       {
         "package": "ReactiveTask",
         "repositoryURL": "https://github.com/Carthage/ReactiveTask.git",
         "state": {
           "branch": null,
-          "revision": "c4ac2a770d9991157561084ec7b9a4fe40fed87a",
-          "version": "0.13.0"
+          "revision": "202a5b4a35e7dfc42be0ba1235d18c3c1ce89830",
+          "version": "0.14.0"
         }
       },
       {
@@ -78,8 +78,8 @@
         "repositoryURL": "https://github.com/mdiep/Tentacle.git",
         "state": {
           "branch": null,
-          "revision": "90c57572d15c56d591e671bbe4fc37f7288df060",
-          "version": "0.10.0"
+          "revision": "2ac00b0cbfff50109f11ae4bfb03a03b0a02b4cf",
+          "version": "0.11.0"
         }
       }
     ]

Package.swift

@@ -10,11 +10,11 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/antitypical/Result.git", from: "3.2.1"),
-        .package(url: "https://github.com/Carthage/ReactiveTask.git", from: "0.13.0"),
+        .package(url: "https://github.com/Carthage/ReactiveTask.git", from: "0.14.0"),
         .package(url: "https://github.com/Carthage/Commandant.git", from: "0.12.0"),
         .package(url: "https://github.com/jdhealy/PrettyColors.git", from: "5.0.0"),
-        .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", from: "2.0.0"),
-        .package(url: "https://github.com/mdiep/Tentacle.git", from: "0.10.0"),
+        .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", from: "3.0.0"),
+        .package(url: "https://github.com/mdiep/Tentacle.git", from: "0.11.0"),
         .package(url: "https://github.com/thoughtbot/Curry.git", from: "3.0.0"),
         .package(url: "https://github.com/Quick/Quick.git", from: "1.2.0"),
         .package(url: "https://github.com/Quick/Nimble.git", from: "7.0.2"),

README.md

@@ -145,6 +145,17 @@ or
 carthage update Box Result
 ```
 
+##### Experimental Resolver
+
+A rewrite of the logic for upgrading frameworks was done with the aim of increasing speed and reducing memory usage. It is currently an opt-in feature. It can be used by passing `--new-resolver` to the update command, e.g.,
+
+```
+carthage update --new-resolver Box
+```
+
+If you are experiencing performance problems during updates, please give the new resolver a try
+
+
 ### Nested dependencies
 
 If the framework you want to add to your project has dependencies explicitly listed in a [Cartfile][], Carthage will automatically retrieve them for you. You will then have to **drag them yourself into your project** from the [Carthage/Build] folder.

RELEASE.md

@@ -0,0 +1,46 @@
+# Releasing a New Version of Carthage
+## 1. Create the Release Notes
+Document what’s changed, keeping an eye out for breaking changes that will affect the version number.
+
+Release notes typically follow this pattern:
+
+> **Fixed**
+> * Something was fixed (#pr-number). Thanks @pr-author!
+> 
+> **Added**
+> * Something was added (#pr-number). Thanks @pr-author!
+> 
+> **Improved**
+> * Something was improved (#pr-number). Thanks @pr-author!
+> 
+> Thank you to {authors of PRs that improved code quality} for improvements to the code base! Thank you to {reviewers of PRs} for reviewing pull requests!
+
+Try to call out more important items earlier in the list.
+
+You can use the [compare](https://github.com/Carthage/Carthage/compare) page on GitHub to see what’s changed since the previous release. Typically only the merge commits (those of the form _Merge pull request #2342 from branch-name_) are needed. Click the link to the PR to see what changed.
+
+## 2. Update Version Number
+If the changes in this release are breaking, then increment the minor number (`0.26.0` to `0.27.0`). Otherwise increment the patch number (`0.26.0` to `0.26.1`).
+
+The version number needs to be set in the `CarthageKitVersion` struct and in the `Info.plist`s for both `carthage` and `CarthageKit`.
+
+This commit can be made directly to `master` and then pushed to GitHub.
+
+## 3. Create Draft Release
+Create a [new release](https://github.com/Carthage/Carthage/releases/new) on GitHub. The tag version should always be 3 numbers (i.e. `0.26.0`, not `0.26`). Check _This is a pre-release_ for now.
+
+## 4. Create Installer
+Now that you’ve created the release, do a `git pull`: you need the tag locally when you create the installer.
+
+Run `make package` to create the installer locally. It’s probably a good idea to install it and run `carthage version` to make sure that you’ve picked up the changes.
+
+## 5. Publish Release
+Edit the release you created. Add the `Carthage.pkg` and `CarthageKit.framework` that were created, uncheck _This in a pre-release_, and publish! Congratulations, you’ve published the release! 👏
+
+## 6. Update Homebrew (optional)
+Many people install Carthage with Homebrew. In order for them to upgrade, [the Homebrew formula](https://github.com/Homebrew/homebrew-core/blob/master/Formula/carthage.rb) needs to be updated.
+
+Normally only the tag and the SHA need to be updated in the formula. But if the supported Xcode versions have changed, that will need to be updated as well.
+
+Once you open a PR against the Homebrew repo, it’s typically merged within a few hours.
+

Source/CarthageKit/Algorithms.swift

@@ -91,7 +91,7 @@ public func topologicalSort<Node: Comparable>(_ graph: [Node: Set<Node>], nodes:
 
 /// Returns the set of nodes that the given node in the provided graph has as
 /// its incoming nodes, both directly and transitively.
-private func transitiveIncomingNodes<Node: Equatable>(_ graph: [Node: Set<Node>], node: Node) -> Set<Node> {
+private func transitiveIncomingNodes<Node>(_ graph: [Node: Set<Node>], node: Node) -> Set<Node> {
 	guard let nodes = graph[node] else {
 		return Set()
 	}

Source/CarthageKit/CarthageKitVersion.swift

@@ -2,5 +2,5 @@
 public struct CarthageKitVersion {
 	public let value: SemanticVersion
 
-	public static let current = CarthageKitVersion(value: SemanticVersion(major: 0, minor: 26, patch: 2))
+	public static let current = CarthageKitVersion(value: SemanticVersion(major: 0, minor: 27, patch: 0))
 }

Source/CarthageKit/Constants.swift

@@ -20,7 +20,7 @@ public struct Constants {
 		} else {
 			homePath = ("~/.carthage" as NSString).expandingTildeInPath
 		}
-		return URL(fileURLWithPath: homePath, isDirectory:true)
+		return URL(fileURLWithPath: homePath, isDirectory: true)
 	}()
 
 	/// ~/Library/Caches/org.carthage.CarthageKit/
@@ -33,7 +33,7 @@ public struct Constants {
 			let dependenciesURL = cachesURL.appendingPathComponent(Constants.bundleIdentifier, isDirectory: true)
 			let dependenciesPath = dependenciesURL.absoluteString
 
-			if fileManager.fileExists(atPath: dependenciesPath, isDirectory:nil) {
+			if fileManager.fileExists(atPath: dependenciesPath, isDirectory: nil) {
 				if fileManager.isWritableFile(atPath: dependenciesPath) {
 					return Result(value: dependenciesURL)
 				} else {

Source/CarthageKit/Dependency.swift

@@ -42,7 +42,7 @@ extension Dependency {
 		if urlString.contains(githubHostIdentifier) {
 			let gitbubHostScanner = Scanner(string: urlString)
 
-			gitbubHostScanner.scanUpTo(githubHostIdentifier, into:nil)
+			gitbubHostScanner.scanUpTo(githubHostIdentifier, into: nil)
 			gitbubHostScanner.scanString(githubHostIdentifier, into: nil)
 
 			// find an SCP or URL path separator