Merge pull request #94 from Carthage/swift-3.1

mdiep · web-flow · commit 594f6d753cc8 · 2017-04-29T14:11:03.000-04:00
Xcode 8.3 / SwiftPM 3.1
diff --git a/.Package.test.swift b/.Package.test.swift
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-### https://raw.github.com/github/gitignore/afbff9027d02ccfc680e031f6c295f79ad61662d/Swift.gitignore
+### https://raw.github.com/github/gitignore/c0c1a480a906df0e023f3250cf2ad82f1612be67/Swift.gitignore
 
 # Xcode
 #
@@ -20,9 +20,8 @@ DerivedData/
 xcuserdata/
 
 ## Other
-*.xccheckout
 *.moved-aside
-*.xcuserstate
+*.xccheckout
 *.xcscmblueprint
 
 ## Obj-C/Swift specific
@@ -39,6 +38,7 @@ playground.xcworkspace
 #
 # Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
 # Packages/
+# Package.pins
 .build/
 
 # CocoaPods
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-3.0.2
+3.1
diff --git a/.travis.yml b/.travis.yml
@@ -1,28 +1,22 @@
 language: objective-c
 xcode_workspace: ReactiveTask.xcworkspace
-git:
-  submodules: false
 branches:
   only:
     - master
 matrix:
   include:
     - os: osx
-      osx_image: xcode8.2
+      osx_image: xcode8.3
       xcode_scheme: ReactiveTask
-      before_script:
-        - git submodule update --init --recursive
       script:
         - set -o pipefail && xcodebuild -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "$TRAVIS_XCODE_SCHEME" test | xcpretty
       env: JOB=Xcode8
     - os: osx
-      osx_image: xcode8.2
+      osx_image: xcode8.3
       script:
-        - mv .Package.test.swift Package.swift
         - swift package update
-        - cd Packages/Nimble-* && git checkout 8116a83864ee78339798c3ef425c42f6ca6bf034 && cd ../../
         - swift build
-        - swift test
+        - SWIFTPM_TEST_ReactiveTask=YES swift test
       env: JOB=SWIFTPM_DARWIN
 notifications:
   email: false
diff --git a/Cartfile b/Cartfile
@@ -1,2 +1,2 @@
-github "antitypical/Result" ~> 3.2
+github "antitypical/Result" ~> 3.2.1
 github "ReactiveCocoa/ReactiveSwift" ~> 1.1
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,3 +1,3 @@
 github "jspahrsummers/xcconfigs" "3d9d996"
 github "Quick/Quick" ~> 1.1
-github "Quick/Nimble" "8116a83864ee78339798c3ef425c42f6ca6bf034"
+github "Quick/Nimble" ~> 6.1
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,5 +1,5 @@
-github "Quick/Nimble" "8116a83864ee78339798c3ef425c42f6ca6bf034"
+github "Quick/Nimble" "v6.1.0"
 github "Quick/Quick" "v1.1.0"
 github "ReactiveCocoa/ReactiveSwift" "1.1.0"
-github "antitypical/Result" "3.2.0"
+github "antitypical/Result" "3.2.1"
 github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
@@ -1 +1 @@
-Subproject commit 8116a83864ee78339798c3ef425c42f6ca6bf034
+Subproject commit e3c1a78af33b3fa778207fcc6ba33221838c0788
diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result
@@ -1 +1 @@
-Subproject commit 5db7bc7b4af78d9b78294e1de87c51ae4726e4a2
+Subproject commit 2af7c146071c8d8fb3953f19924ecebf15c88ea7
diff --git a/Package.pins b/Package.pins
@@ -0,0 +1,30 @@
+{
+  "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": "ReactiveSwift",
+      "reason": null,
+      "repositoryURL": "https://github.com/ReactiveCocoa/ReactiveSwift.git",
+      "version": "1.1.1"
+    },
+    {
+      "package": "Result",
+      "reason": null,
+      "repositoryURL": "https://github.com/antitypical/Result.git",
+      "version": "3.2.1"
+    }
+  ],
+  "version": 1
+}
diff --git a/Package.swift b/Package.swift
@@ -1,9 +1,23 @@
+import Foundation
 import PackageDescription
 
+var isSwiftPackagerManagerTest: Bool {
+    return ProcessInfo.processInfo.environment["SWIFTPM_TEST_ReactiveTask"] == "YES"
+}
+
 let package = Package(
     name: "ReactiveTask",
-    dependencies: [
-        .Package(url: "https://github.com/antitypical/Result.git", versions: Version(3, 2, 0)..<Version(3, .max, .max)),
-        .Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", versions: Version(1, 1, 0)..<Version(1, .max, .max)),
-    ]
+    dependencies: {
+        var deps: [Package.Dependency] = [
+            .Package(url: "https://github.com/antitypical/Result.git", versions: Version(3, 2, 1)..<Version(3, .max, .max)),
+            .Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", versions: Version(1, 1, 0)..<Version(1, .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
+    }()
 )

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-github "antitypical/Result" ~> 3.2`
	`1`	`+github "antitypical/Result" ~> 3.2.1`
`2`	`2`	`github "ReactiveCocoa/ReactiveSwift" ~> 1.1`