Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SwiftPM] Use V4 PackageDescription #102

Merged
merged 1 commit into from
Oct 26, 2017
Merged

[SwiftPM] Use V4 PackageDescription #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ matrix:
- os: osx
osx_image: xcode9
script:
- swift --version
- swift build
- SWIFTPM_TEST_ReactiveTask=YES swift test
- swift test
git:
submodules: false
env: JOB=SWIFTPM_DARWIN
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "antitypical/Result" ~> 3.2.1
github "ReactiveCocoa/ReactiveSwift" ~> 2.0
github "ReactiveCocoa/ReactiveSwift" ~> 2.0.1
2 changes: 1 addition & 1 deletion Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
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 "antitypical/Result" "3.2.4"
github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Result
Open in desktop
Submodule Result updated 5 files
+1 −1 .travis.yml
+1 −1 Result.podspec
+1 −1 Result/Info.plist
+2 −0 Result/Result.swift
+1 −1 Tests/ResultTests/Info.plist
18 changes: 18 additions & 0 deletions Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,24 @@
{
"object": {
"pins": [
{
"package": "Nimble",
"repositoryURL": "https://github.com/Quick/Nimble.git",
"state": {
"branch": null,
"revision": "38c9ab0846a3fbec308eb2aa9ef68b10a7434eb4",
"version": "7.0.2"
}
},
{
"package": "Quick",
"repositoryURL": "https://github.com/Quick/Quick.git",
"state": {
"branch": null,
"revision": "0ff81f2c665b4381f526bd656f8708dd52a9ea2f",
"version": "1.2.0"
}
},
{
"package": "ReactiveSwift",
"repositoryURL": "https://github.com/ReactiveCocoa/ReactiveSwift.git",
Expand Down
33 changes: 15 additions & 18 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
import Foundation
// swift-tools-version:4.0
import PackageDescription

var isSwiftPackagerManagerTest: Bool {
return ProcessInfo.processInfo.environment["SWIFTPM_TEST_ReactiveTask"] == "YES"
}

let package = Package(
name: "ReactiveTask",
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", majorVersion: 2),
]
if isSwiftPackagerManagerTest {
deps += [
.Package(url: "https://github.com/Quick/Quick.git", majorVersion: 1, minor: 2),
.Package(url: "https://github.com/Quick/Nimble.git", majorVersion: 7),
]
}
return deps
}()
products: [
.library(name: "ReactiveTask", targets: ["ReactiveTask"]),
],
dependencies: [
.package(url: "https://github.com/antitypical/Result.git", from: "3.2.1"),
.package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", from: "2.0.1"),
.package(url: "https://github.com/Quick/Quick.git", from: "1.2.0"),
.package(url: "https://github.com/Quick/Nimble.git", from: "7.0.2"),
],
targets: [
.target(name: "ReactiveTask", dependencies: ["Result", "ReactiveSwift"], path: "Sources"),
.testTarget(name: "ReactiveTaskTests", dependencies: ["ReactiveTask", "Quick", "Nimble"]),
],
swiftLanguageVersions: [3]
)