Skip to content

Commit 27a7254

Browse files
authored
Merge pull request ReactiveCocoa#156 from jakovi89/swift-4.2
Updated Quick and Nimble (Swift 4.2+ support)
2 parents b62aa6f + 327bdb7 commit 27a7254

File tree

6 files changed

+13
-8
lines changed

6 files changed

+13
-8
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode10
2+
osx_image: xcode10.2
33
before_install: true
44
install: true
55
branches:

Cartfile.private

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
github "jspahrsummers/xcconfigs" "3d9d996"
2-
github "Quick/Quick" ~> 1.2
3-
github "Quick/Nimble" ~> 7.0.2
2+
github "Quick/Quick" ~> 2.0
3+
github "Quick/Nimble" ~> 8.0.0

Cartfile.resolved

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
github "Quick/Nimble" "v7.3.1"
2-
github "Quick/Quick" "v1.2.0"
1+
github "Quick/Nimble" "v8.0.1"
2+
github "Quick/Quick" "v2.0.0"
33
github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"

Carthage/Checkouts/Nimble

Submodule Nimble updated 97 files

Carthage/Checkouts/Quick

Submodule Quick updated 87 files

ReactiveObjC.xcodeproj/project.pbxproj

+6-1
Original file line numberDiff line numberDiff line change
@@ -1988,6 +1988,7 @@
19881988
developmentRegion = English;
19891989
hasScannedForEncodings = 0;
19901990
knownRegions = (
1991+
English,
19911992
en,
19921993
);
19931994
mainGroup = D04725E019E49ED7006002AA;
@@ -2905,6 +2906,7 @@
29052906
"$(inherited)",
29062907
);
29072908
INFOPLIST_FILE = ReactiveObjCTests/Info.plist;
2909+
MACOSX_DEPLOYMENT_TARGET = 10.10;
29082910
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
29092911
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
29102912
SWIFT_VERSION = 4.2;
@@ -2922,6 +2924,7 @@
29222924
"$(inherited)",
29232925
);
29242926
INFOPLIST_FILE = ReactiveObjCTests/Info.plist;
2927+
MACOSX_DEPLOYMENT_TARGET = 10.10;
29252928
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
29262929
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
29272930
SWIFT_VERSION = 4.2;
@@ -3037,6 +3040,7 @@
30373040
"$(inherited)",
30383041
);
30393042
INFOPLIST_FILE = ReactiveObjCTests/Info.plist;
3043+
MACOSX_DEPLOYMENT_TARGET = 10.10;
30403044
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
30413045
SWIFT_VERSION = 4.2;
30423046
};
@@ -3078,7 +3082,7 @@
30783082
CODE_SIGNING_REQUIRED = NO;
30793083
CURRENT_PROJECT_VERSION = 1;
30803084
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
3081-
MACOSX_DEPLOYMENT_TARGET = 10.9;
3085+
MACOSX_DEPLOYMENT_TARGET = 10.10;
30823086
PRODUCT_BUNDLE_IDENTIFIER = "org.reactivecocoa.$(PRODUCT_NAME:rfc1034identifier)-Tests";
30833087
PRODUCT_NAME = "$(PROJECT_NAME)";
30843088
TVOS_DEPLOYMENT_TARGET = 9.0;
@@ -3120,6 +3124,7 @@
31203124
"$(inherited)",
31213125
);
31223126
INFOPLIST_FILE = ReactiveObjCTests/Info.plist;
3127+
MACOSX_DEPLOYMENT_TARGET = 10.10;
31233128
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
31243129
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
31253130
SWIFT_VERSION = 4.2;

0 commit comments

Comments
 (0)