Xcode 8.3 / SwiftPM 3.1

.swift-version

@@ -1 +1 @@
-3.0.2
+3.1

.travis.yml

@@ -1,11 +1,7 @@
 xcode_workspace: Commandant.xcworkspace
-git:
-  submodules: false
 branches:
   only:
     - master
-before_install:
-  - git submodule update --init --recursive
 script: placeholder # workaround for https://github.com/travis-ci/travis-ci/issues/4681
 matrix:
   exclude:
@@ -14,25 +10,19 @@ matrix:
     - script: set -o pipefail && xcodebuild -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "$TRAVIS_XCODE_SCHEME" test | xcpretty
       xcode_scheme: Commandant
       os: osx
-      osx_image: xcode8.2
+      osx_image: xcode8.3
       language: objective-c
       env: JOB=Xcode8
     - script:
-        - mv .Package.test.swift Package.swift
-        - swift package update
-        - cd Packages/Nimble-* && git checkout 8116a83864ee78339798c3ef425c42f6ca6bf034 && cd ../../
-        - SWIFT_GIT=`xcrun --find git` swift build
-        - swift test
+        - swift build
+        - SWIFTPM_TEST_Commandant=YES swift test
       os: osx
-      osx_image: xcode8.2
+      osx_image: xcode8.3
       language: objective-c
       env: JOB=SPM
     - script:
-        - mv .Package.test.swift Package.swift
-        - swift package update
-        - cd Packages/Nimble-* && git checkout 8116a83864ee78339798c3ef425c42f6ca6bf034 && cd ../../
         - swift build
-        - swift test
+        - SWIFTPM_TEST_Commandant=YES swift test
       env: JOB=Linux
       sudo: required
       dist: trusty

Cartfile.private

@@ -1,3 +1,3 @@
 github "jspahrsummers/xcconfigs" ~> 0.9
 github "Quick/Quick" ~> 1.1
-github "Quick/Nimble" "8116a83864ee78339798c3ef425c42f6ca6bf034"
+github "Quick/Nimble" ~> 6.1

Cartfile.resolved

@@ -1,4 +1,4 @@
-github "Quick/Nimble" "8116a83864ee78339798c3ef425c42f6ca6bf034"
+github "Quick/Nimble" "v6.1.0"
 github "Quick/Quick" "v1.1.0"
 github "antitypical/Result" "3.2.1"
 github "jspahrsummers/xcconfigs" "0.9"

Package.pins

@@ -0,0 +1,24 @@
+{
+  "autoPin": true,
+  "pins": [
+    {
+      "package": "Nimble",
+      "reason": null,
+      "repositoryURL": "https://github.com/Quick/Nimble.git",
+      "version": "6.1.0"
+    },
+    {
+      "package": "Quick",
+      "reason": null,
+      "repositoryURL": "https://github.com/Quick/Quick.git",
+      "version": "1.1.0"
+    },
+    {
+      "package": "Result",
+      "reason": null,
+      "repositoryURL": "https://github.com/antitypical/Result.git",
+      "version": "3.2.1"
+    }
+  ],
+  "version": 1
+}

Package.swift

@@ -1,8 +1,22 @@
+import Foundation
 import PackageDescription
 
+var isSwiftPackagerManagerTest: Bool {
+    return ProcessInfo.processInfo.environment["SWIFTPM_TEST_Commandant"] == "YES"
+}
+
 let package = Package(
     name: "Commandant",
-    dependencies: [
-        .Package(url: "https://github.com/antitypical/Result.git", versions: Version(3, 2, 1)..<Version(3, .max, .max)),
-    ]
+    dependencies: {
+        var deps: [Package.Dependency] = [
+            .Package(url: "https://github.com/antitypical/Result.git", versions: Version(3, 2, 1)..<Version(3, .max, .max)),
+        ]
+        if isSwiftPackagerManagerTest {
+            deps += [
+                .Package(url: "https://github.com/Quick/Quick.git", majorVersion: 1, minor: 1),
+                .Package(url: "https://github.com/Quick/Nimble.git", majorVersion: 6, minor: 1),
+            ]
+        }
+        return deps
+    }()
 )

Tests/CommandantTests/OptionSpec.swift

@@ -190,6 +190,6 @@ func ==<T: Equatable>(lhs: [T]?, rhs: [T]?) -> Bool {
 
 extension TestOptions: CustomStringConvertible {
 	var description: String {
-		return "{ intValue: \(intValue), stringValue: \(stringValue), stringsArray: \(stringsArray), optionalStringsArray: \(optionalStringsArray), optionalStringValue: \(optionalStringValue), optionalFilename: \(optionalFilename), requiredName: \(requiredName), enabled: \(enabled), force: \(force), glob: \(glob), arguments: \(arguments) }"
+		return "{ intValue: \(intValue), stringValue: \(stringValue), stringsArray: \(stringsArray), optionalStringsArray: \(String(describing: optionalStringsArray)), optionalStringValue: \(String(describing: optionalStringValue)), optionalFilename: \(optionalFilename), requiredName: \(requiredName), enabled: \(enabled), force: \(force), glob: \(glob), arguments: \(arguments) }"
 	}
 }