Merge branch 'master' into ResolverPerformance

.swift-version

@@ -1 +1 @@
-3.1
+4.0

.swiftlint.yml

@@ -13,18 +13,26 @@ opt_in_rules:
 - operator_usage_whitespace
 - redundant_nil_coalescing
 - switch_case_on_newline
+- unneeded_parentheses_in_closure_argument
+- vertical_parameter_alignment_on_call
 
 disabled_rules:
-- vertical_parameter_alignment
 - redundant_string_enum_value
+- superfluous_disable_command
 
 included:
 - Source
 
 excluded:
 - Carthage
 
-line_length: 160
+line_length:
+  warning: 160
+  ignores_comments: true
+  ignores_function_declarations: true
+
+file_length:
+  ignore_comment_only_lines: true
 
 file_header:
   required_pattern: ''
@@ -39,12 +47,6 @@ custom_rules:
     name: "Closing Brace Whitespace"
     message: "Empty line required after closing curly braces if code with same indentation follows."
     severity: warning
-  closure_params_parantheses:
-    included: ".*.swift"
-    regex: '\{\s*\([^):]+\)\s*in'
-    name: "Unnecessary Closure Params Parantheses"
-    message: "Don't use parantheses around non-typed parameters in a closure."
-    severity: warning
   if_as_guard:
     included: ".*.swift"
     regex: '\n *if [^\{]+\{\s*(?:return|break|continue)[^\n]*\n *\}(?! *else)'

.travis.yml

@@ -12,32 +12,30 @@ matrix:
   include:
     - os: osx
       language: objective-c
-      osx_image: xcode8.3
+      osx_image: xcode9
       script: make test
       env: JOB=CI_BUILD_TEST
     - os: osx
       language: objective-c
-      osx_image: xcode8.3
+      osx_image: xcode9
       script: make package
       env: JOB=CI_BUILD_PACKAGE
     - os: osx
       language: objective-c
-      osx_image: xcode8.3
+      osx_image: xcode9
       script:
         - make swiftpm
         - .build/release/carthage version
       env: JOB=CI_BUILD_SWIFTPM
     - os: osx
       language: objective-c
-      osx_image: xcode8.3
+      osx_image: xcode9
       script:
-        - SWIFTPM_TEST_Carthage=YES swift package fetch
-        - SWIFTPM_TEST_Carthage=YES swift package edit Quick --revision 2d56373ed47146fd1f23a5f549f40f254346141f
         - make swiftpm_test
       env: JOB=CI_BUILD_SWIFTPM_TEST
     - os: osx
       language: objective-c
-      osx_image: xcode8.3
+      osx_image: xcode9
       script:
         - brew uninstall carthage
         - HOMEBREW_NO_AUTO_UPDATE=1 brew install bats
@@ -47,7 +45,7 @@ matrix:
         - JOB=INTEGRATION_TESTS
     - os: osx
       language: objective-c
-      osx_image: xcode8.3
+      osx_image: xcode9
       script:
         - brew uninstall carthage
         - HOMEBREW_NO_AUTO_UPDATE=1 brew install bats        

Cartfile

@@ -3,6 +3,6 @@ github "Carthage/ReactiveTask" ~> 0.13
 github "Carthage/Commandant" ~> 0.12
 github "jdhealy/PrettyColors" ~> 5.0
 github "ReactiveCocoa/ReactiveSwift" ~> 2.0
-github "mdiep/Tentacle" ~> 0.8
+github "mdiep/Tentacle" ~> 0.9
 github "thoughtbot/Argo" ~> 4.1
 github "thoughtbot/Runes" ~> 4.0.1

Cartfile.private

@@ -1,3 +1,3 @@
-github "Quick/Quick" "master"
-github "Quick/Nimble" ~> 7.0.1
+github "Quick/Quick" ~> 1.2
+github "Quick/Nimble" ~> 7.0.2
 github "jspahrsummers/xcconfigs" ~> 0.9

Cartfile.resolved

@@ -1,12 +1,12 @@
 github "Carthage/Commandant" "0.12.0"
 github "Carthage/ReactiveTask" "0.13.0"
-github "Quick/Nimble" "v7.0.1"
-github "Quick/Quick" "2d56373ed47146fd1f23a5f549f40f254346141f"
-github "ReactiveCocoa/ReactiveSwift" "2.0.0"
+github "Quick/Nimble" "v7.0.2"
+github "Quick/Quick" "v1.2.0"
+github "ReactiveCocoa/ReactiveSwift" "2.0.1"
 github "antitypical/Result" "3.2.3"
 github "jdhealy/PrettyColors" "v5.0.0"
 github "jspahrsummers/xcconfigs" "0.9"
-github "mdiep/Tentacle" "0.8.0"
+github "mdiep/Tentacle" "0.9.0"
 github "thoughtbot/Argo" "v4.1.2"
 github "thoughtbot/Curry" "v3.0.0"
 github "thoughtbot/Runes" "v4.1.0"

Carthage.xcodeproj/project.pbxproj

@@ -54,6 +54,7 @@
 		CDB099241E6DC2D40030B4A8 /* ScannableError.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDB099231E6DC2D40030B4A8 /* ScannableError.swift */; };
 		CDBE654C1F4BF0040060D94E /* Submodule.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDBE654B1F4BF0040060D94E /* Submodule.swift */; };
 		CDCE1CC41C170E8A00B2ED88 /* TestResolvedCartfile.resolved in Resources */ = {isa = PBXBuildFile; fileRef = CDCE1CC21C170E8100B2ED88 /* TestResolvedCartfile.resolved */; };
+		CDD7CF791F75ED88000E0EA5 /* Dependency.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDD7CF781F75ED88000E0EA5 /* Dependency.swift */; };
 		CDE559291E12263A00ED7F5F /* BuildSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDE559281E12263A00ED7F5F /* BuildSettings.swift */; };
 		CDF94D951E71144300200486 /* DuplicateDependency.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDF94D941E71144300200486 /* DuplicateDependency.swift */; };
 		CDF9D3711CF1E54200DF5A6F /* BuildOptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDF9D3701CF1E54200DF5A6F /* BuildOptions.swift */; };
@@ -216,6 +217,7 @@
 		CDB099231E6DC2D40030B4A8 /* ScannableError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScannableError.swift; sourceTree = "<group>"; };
 		CDBE654B1F4BF0040060D94E /* Submodule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Submodule.swift; sourceTree = "<group>"; };
 		CDCE1CC21C170E8100B2ED88 /* TestResolvedCartfile.resolved */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TestResolvedCartfile.resolved; sourceTree = "<group>"; };
+		CDD7CF781F75ED88000E0EA5 /* Dependency.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dependency.swift; sourceTree = "<group>"; };
 		CDE559281E12263A00ED7F5F /* BuildSettings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BuildSettings.swift; sourceTree = "<group>"; };
 		CDF94D941E71144300200486 /* DuplicateDependency.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DuplicateDependency.swift; sourceTree = "<group>"; };
 		CDF9D3701CF1E54200DF5A6F /* BuildOptions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BuildOptions.swift; sourceTree = "<group>"; };
@@ -498,6 +500,7 @@
 				D0D1218F19E88A15005E4BAA /* Cartfile.swift */,
 				CD43D9D91F41640E00CD60F6 /* CarthageKitVersion.swift */,
 				A1411ED51EFC1BFD0060461F /* Constants.swift */,
+				CDD7CF781F75ED88000E0EA5 /* Dependency.swift */,
 				CDF94D941E71144300200486 /* DuplicateDependency.swift */,
 				D0AAAB4919FAEDB4007B24B3 /* Errors.swift */,
 				D074EDC41A049283001DE082 /* FrameworkExtensions.swift */,
@@ -659,7 +662,7 @@
 			attributes = {
 				LastSwiftMigration = 0700;
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0820;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = Carthage;
 				TargetAttributes = {
 					D0D1216C19E87B05005E4BAA = {
@@ -816,6 +819,7 @@
 				D0AAAB4A19FAEDB4007B24B3 /* Errors.swift in Sources */,
 				D0DE89441A0F2D9B0030A3EC /* Scannable.swift in Sources */,
 				F162F3421D63D8A900809D7E /* VersionFile.swift in Sources */,
+				CDD7CF791F75ED88000E0EA5 /* Dependency.swift in Sources */,
 				BF7A1A0B1E3A7AE9008CBCC5 /* BinaryProject.swift in Sources */,
 				D01D82D71A10160700F0DD94 /* Resolver.swift in Sources */,
 				CDB099241E6DC2D40030B4A8 /* ScannableError.swift in Sources */,
@@ -906,25 +910,35 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = D0D1212619E878CC005E4BAA /* Debug.xcconfig */;
 			buildSettings = {
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				ONLY_ACTIVE_ARCH = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
 		D0D1211E19E87861005E4BAA /* Release */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = D0D1212819E878CC005E4BAA /* Release.xcconfig */;
 			buildSettings = {
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -994,11 +1008,16 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = D0D1212719E878CC005E4BAA /* Profile.xcconfig */;
 			buildSettings = {
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Profile;
 		};
@@ -1037,11 +1056,16 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = D0D1212919E878CC005E4BAA /* Test.xcconfig */;
 			buildSettings = {
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Test;
 		};

Carthage.xcodeproj/xcshareddata/xcschemes/CarthageKit.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -40,6 +40,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -69,6 +70,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

Carthage.xcodeproj/xcshareddata/xcschemes/carthage.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -62,9 +63,10 @@
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

Documentation/StaticFrameworks.md

@@ -1,7 +1,7 @@
 # Build static frameworks to speed up your app’s launch times
 Carthage supports building static frameworks in place of dynamic frameworks when used in concert with Keith Smiley’s `ld.py` script, published [here](https://github.com/keith/swift-staticlibs/blob/master/ld.py). If you have many dynamic frameworks, you may have noticed that your application's launch times can be quite slow relative to other applications. To mitigate this, Apple suggests that you embed [at most six dynamic frameworks](https://developer.apple.com/videos/play/wwdc2016/406/?time=1794) into your applications. Unfortunately, Xcode has not supported building static Swift frameworks out of the box since Apple made that recommendation, so it is a bit tricky to follow this advice. The goal of this guide is to show you how to reduce the number of embedded dynamic frameworks in your application with some simple wrappers around Carthage.
 
-Since you’re going to be rebuilding dynamic frameworks as static frameworks, make sure that when you perform a `carthage checkout`,  `carthage bootstrap`, or `carthage update` from this point forward, you are supplying the `--no-use-binaries` flag to `carthage`. This will ensure that Carthage doesn’t download prebuilt dyamic frameworks and place them into your `Carthage/Build` directory, since you won’t be needing them anyways.
+Since you’re going to be rebuilding dynamic frameworks as static frameworks, make sure that when you perform a `carthage checkout`,  `carthage bootstrap`, or `carthage update` from this point forward, you are supplying the `--no-use-binaries` flag to `carthage`. This will ensure that Carthage doesn’t download prebuilt dynamic frameworks and place them into your `Carthage/Build` directory, since you won’t be needing them anyways.
 
 To build static frameworks with Carthage, we suggest wrapping invocations of `carthage build` with a script that looks something like this:
 

IntegrationTests/update.bats

@@ -4,8 +4,8 @@ setup() {
     cd $BATS_TMPDIR
     rm -rf UpdateTest
     mkdir UpdateTest && cd UpdateTest
-    echo 'github "antitypical/Result" == 3.1' > Cartfile
-    echo 'github "Quick/Nimble" == 6.0.1' > Cartfile.private
+    echo 'github "antitypical/Result" == 3.2.3' > Cartfile
+    echo 'github "Quick/Nimble" == 7.0.1' > Cartfile.private
 }
 
 teardown() {

Makefile

@@ -96,11 +96,11 @@ swiftpm:
 
 swiftpm_test:
 	$(RM_SAFELY) ./.build/debug/CarthagePackageTests.xctest
-	SWIFTPM_TEST_Carthage=YES swift test --specifier "" # Make SwiftPM just build the test bundle without running it
+	swift build --build-tests
 	$(CP) -R Tests/CarthageKitTests/Resources ./.build/debug/CarthagePackageTests.xctest/Contents
 	$(CP) Tests/CarthageKitTests/fixtures/CartfilePrivateOnly.zip ./.build/debug/CarthagePackageTests.xctest/Contents/Resources
 	script/copy-fixtures ./.build/debug/CarthagePackageTests.xctest/Contents/Resources
-	SWIFTPM_TEST_Carthage=YES swift test --skip-build
+	swift test --skip-build
 
 swiftpm_install: swiftpm
 	$(MKDIR) "$(PREFIX)/bin"