Skip to content

Commit a6cc1d0

Browse files
authored
Merge pull request #711 from ReactiveCocoa/update-quick-and-nimble
Update Quick to 2.0.0 and Nimble to 8.0.0
2 parents aa9e36b + 595a1ba commit a6cc1d0

File tree

9 files changed

+24
-20
lines changed

9 files changed

+24
-20
lines changed

.travis.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ aliases:
6868
matrix:
6969
include:
7070
- <<: *xcode
71-
# - <<: *xcode
72-
# osx_image: xcode10.2
71+
- <<: *xcode
72+
osx_image: xcode10.2
7373
# - <<: *xcode
7474
# osx_image: xcode10.2
7575
# env: XCODE_ARGS="SWIFT_VERSION=5.0"
@@ -83,10 +83,10 @@ matrix:
8383
env:
8484
- JOB=SwiftPM
8585
- SWIFT_VERSION=4.2.3
86-
# - <<: *swiftpm_linux
87-
# env:
88-
# - JOB=SwiftPM
89-
# - SWIFT_VERSION=5.0-DEVELOPMENT-SNAPSHOT-2019-02-28-a
86+
- <<: *swiftpm_linux
87+
env:
88+
- JOB=SwiftPM
89+
- SWIFT_VERSION=5.0-DEVELOPMENT-SNAPSHOT-2019-02-28-a
9090
- stage: carthage
9191
script: carthage build --cache-builds --no-skip-current
9292
- stage: deploy

Cartfile.private

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
github "jspahrsummers/xcconfigs" == 0.12
2-
github "Quick/Quick" ~> 1.3.4
3-
github "Quick/Nimble" ~> 7.3.3
2+
github "Quick/Quick" ~> 2.0.0
3+
github "Quick/Nimble" ~> 8.0.0

Cartfile.resolved

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
github "Quick/Nimble" "v7.3.3"
2-
github "Quick/Quick" "v1.3.4"
1+
github "Quick/Nimble" "v8.0.0"
2+
github "Quick/Quick" "v2.0.0"
33
github "antitypical/Result" "4.1.0"
44
github "jspahrsummers/xcconfigs" "0.12"

Carthage/Checkouts/Nimble

Submodule Nimble updated 97 files

Carthage/Checkouts/Quick

Submodule Quick updated 48 files

Package.resolved

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

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ let package = Package(
88
],
99
dependencies: [
1010
.package(url: "https://github.com/antitypical/Result.git", from: "4.1.0"),
11-
.package(url: "https://github.com/Quick/Quick.git", from: "1.3.4"),
12-
.package(url: "https://github.com/Quick/Nimble.git", from: "7.3.3"),
11+
.package(url: "https://github.com/Quick/Quick.git", from: "2.0.0"),
12+
.package(url: "https://github.com/Quick/Nimble.git", from: "8.0.0"),
1313
],
1414
targets: [
1515
.target(name: "ReactiveSwift", dependencies: ["Result"], path: "Sources"),

[email protected]

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ let package = Package(
88
],
99
dependencies: [
1010
.package(url: "https://github.com/antitypical/Result.git", from: "4.1.0"),
11-
.package(url: "https://github.com/Quick/Quick.git", from: "1.3.4"),
12-
.package(url: "https://github.com/Quick/Nimble.git", from: "7.3.3"),
11+
.package(url: "https://github.com/Quick/Quick.git", from: "2.0.0"),
12+
.package(url: "https://github.com/Quick/Nimble.git", from: "8.0.0"),
1313
],
1414
targets: [
1515
.target(name: "ReactiveSwift", dependencies: ["Result"], path: "Sources"),

ReactiveSwift.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1338,6 +1338,7 @@
13381338
buildSettings = {
13391339
INFOPLIST_FILE = Tests/ReactiveSwiftTests/Info.plist;
13401340
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
1341+
MACOSX_DEPLOYMENT_TARGET = 10.10;
13411342
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
13421343
};
13431344
name = Debug;
@@ -1348,6 +1349,7 @@
13481349
buildSettings = {
13491350
INFOPLIST_FILE = Tests/ReactiveSwiftTests/Info.plist;
13501351
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
1352+
MACOSX_DEPLOYMENT_TARGET = 10.10;
13511353
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
13521354
};
13531355
name = Release;
@@ -1433,6 +1435,7 @@
14331435
buildSettings = {
14341436
INFOPLIST_FILE = Tests/ReactiveSwiftTests/Info.plist;
14351437
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
1438+
MACOSX_DEPLOYMENT_TARGET = 10.10;
14361439
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
14371440
};
14381441
name = Profile;
@@ -1496,6 +1499,7 @@
14961499
buildSettings = {
14971500
INFOPLIST_FILE = Tests/ReactiveSwiftTests/Info.plist;
14981501
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
1502+
MACOSX_DEPLOYMENT_TARGET = 10.10;
14991503
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
15001504
};
15011505
name = Test;

0 commit comments

Comments
 (0)