Skip to content

Commit 7ba5cd9

Browse files
committed
Update SwiftPM and Travis Config
1 parent 26f998a commit 7ba5cd9

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.1.2
1+
4.2

.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ branches:
66
matrix:
77
include:
88
- os: osx
9-
osx_image: xcode9.4
9+
osx_image: xcode10.1
1010
xcode_scheme: ReactiveTask
1111
script:
1212
- set -o pipefail && xcodebuild -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "$TRAVIS_XCODE_SCHEME" test | xcpretty
13-
env: JOB=Xcode9.4
13+
env: JOB=Xcode10.1
1414
- os: osx
15-
osx_image: xcode9.4
15+
osx_image: xcode10.1
1616
script:
1717
- swift --version
1818
- swift build
@@ -21,7 +21,7 @@ matrix:
2121
submodules: false
2222
env: JOB=SWIFTPM_DARWIN
2323
- os: osx
24-
osx_image: xcode9.4
24+
osx_image: xcode10.1
2525
script:
2626
- pod repo update
2727
- pod lib lint
@@ -44,4 +44,4 @@ deploy:
4444
on:
4545
repo: Carthage/ReactiveTask
4646
tags: true
47-
condition: $JOB = Xcode9.4
47+
condition: $JOB = Xcode10.1

Package.resolved

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ let package = Package(
77
.library(name: "ReactiveTask", targets: ["ReactiveTask"]),
88
],
99
dependencies: [
10-
.package(url: "https://github.com/antitypical/Result.git", from: "4.0.0"),
11-
.package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", from: "4.0.0"),
12-
.package(url: "https://github.com/Quick/Quick.git", from: "1.3.1"),
13-
.package(url: "https://github.com/Quick/Nimble.git", from: "7.1.3"),
10+
.package(url: "https://github.com/antitypical/Result.git", from: "4.1.0"),
11+
.package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", from: "5.0.0"),
12+
.package(url: "https://github.com/Quick/Quick.git", from: "2.0.0"),
13+
.package(url: "https://github.com/Quick/Nimble.git", from: "8.0.1"),
1414
],
1515
targets: [
1616
.target(name: "ReactiveTask", dependencies: ["Result", "ReactiveSwift"], path: "Sources"),

0 commit comments

Comments
 (0)