Skip to content

Commit f376db7

Browse files
mdiepmdiep
authored
Merge pull request #55 from jakovi89/swift-4.2
Updated Quick, Nimble and ReactiveObjc for swift 4.2 support
2 parents 07511fd + c303ad3 commit f376db7

File tree

11 files changed

+109
-29
lines changed

11 files changed

+109
-29
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: xcode9.4
2+
osx_image: xcode10.2
33
before_install: true
44
install: true
55
branches:

‎Cartfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "ReactiveCocoa/ReactiveObjC" ~> 3.1.0
2-
github "ReactiveCocoa/ReactiveSwift" ~> 4.0.0
1+
github "ReactiveCocoa/ReactiveObjC" ~> 3.1.1
2+
github "ReactiveCocoa/ReactiveSwift" ~> 5.0.0

‎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.3
3-
github "Quick/Nimble" ~> 7.1.3
2+
github "Quick/Quick" ~> 2.0
3+
github "Quick/Nimble" ~> 8.0.0

‎Cartfile.resolved

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
github "Quick/Nimble" "v7.1.3"
2-
github "Quick/Quick" "v1.3.1"
3-
github "ReactiveCocoa/ReactiveObjC" "3.1.0"
4-
github "ReactiveCocoa/ReactiveSwift" "4.0.0"
5-
github "antitypical/Result" "4.0.0"
1+
github "Quick/Nimble" "v8.0.1"
2+
github "Quick/Quick" "v2.0.0"
3+
github "ReactiveCocoa/ReactiveObjC" "3.1.1"
4+
github "ReactiveCocoa/ReactiveSwift" "5.0.1"
5+
github "antitypical/Result" "4.1.0"
66
github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"

‎Carthage/Checkouts/Nimble

Submodule Nimble updated 100 files

‎Carthage/Checkouts/Quick

Submodule Quick updated 49 files

‎Carthage/Checkouts/ReactiveObjC

‎Carthage/Checkouts/ReactiveSwift

Submodule ReactiveSwift updated 37 files

‎Carthage/Checkouts/Result

‎ReactiveObjCBridge.xcodeproj/project.pbxproj

+41-12
Original file line numberDiff line numberDiff line change
@@ -623,31 +623,31 @@
623623
ORGANIZATIONNAME = GitHub;
624624
TargetAttributes = {
625625
57A4D1AF1BA13D7A00F7D4B1 = {
626-
LastSwiftMigration = 0830;
626+
LastSwiftMigration = 1010;
627627
};
628628
7DFBED021CDB8C9500EE435B = {
629629
CreatedOnToolsVersion = 7.3.1;
630-
LastSwiftMigration = 0800;
630+
LastSwiftMigration = 1010;
631631
};
632632
A9B315531B3940610001CB9C = {
633633
CreatedOnToolsVersion = 7.0;
634-
LastSwiftMigration = 0830;
634+
LastSwiftMigration = 1010;
635635
};
636636
D04725E919E49ED7006002AA = {
637637
CreatedOnToolsVersion = 6.1;
638-
LastSwiftMigration = 0830;
638+
LastSwiftMigration = 1010;
639639
};
640640
D04725F419E49ED7006002AA = {
641641
CreatedOnToolsVersion = 6.1;
642-
LastSwiftMigration = 0800;
642+
LastSwiftMigration = 1010;
643643
};
644644
D047260B19E49F82006002AA = {
645645
CreatedOnToolsVersion = 6.1;
646-
LastSwiftMigration = 0830;
646+
LastSwiftMigration = 1010;
647647
};
648648
D047261519E49F82006002AA = {
649649
CreatedOnToolsVersion = 6.1;
650-
LastSwiftMigration = 0800;
650+
LastSwiftMigration = 1010;
651651
};
652652
};
653653
};
@@ -656,6 +656,7 @@
656656
developmentRegion = English;
657657
hasScannedForEncodings = 0;
658658
knownRegions = (
659+
English,
659660
en,
660661
);
661662
mainGroup = D04725E019E49ED7006002AA;
@@ -828,6 +829,7 @@
828829
);
829830
INFOPLIST_FILE = ReactiveObjCBridge/Info.plist;
830831
MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap";
832+
SWIFT_VERSION = 4.2;
831833
};
832834
name = Debug;
833835
};
@@ -848,6 +850,7 @@
848850
);
849851
INFOPLIST_FILE = ReactiveObjCBridge/Info.plist;
850852
MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap";
853+
SWIFT_VERSION = 4.2;
851854
};
852855
name = Test;
853856
};
@@ -868,6 +871,7 @@
868871
);
869872
INFOPLIST_FILE = ReactiveObjCBridge/Info.plist;
870873
MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap";
874+
SWIFT_VERSION = 4.2;
871875
};
872876
name = Release;
873877
};
@@ -888,6 +892,7 @@
888892
);
889893
INFOPLIST_FILE = ReactiveObjCBridge/Info.plist;
890894
MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap";
895+
SWIFT_VERSION = 4.2;
891896
};
892897
name = Profile;
893898
};
@@ -903,6 +908,7 @@
903908
);
904909
INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist;
905910
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
911+
SWIFT_VERSION = 4.2;
906912
};
907913
name = Debug;
908914
};
@@ -918,6 +924,7 @@
918924
);
919925
INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist;
920926
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
927+
SWIFT_VERSION = 4.2;
921928
};
922929
name = Test;
923930
};
@@ -933,6 +940,7 @@
933940
);
934941
INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist;
935942
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
943+
SWIFT_VERSION = 4.2;
936944
};
937945
name = Release;
938946
};
@@ -948,6 +956,7 @@
948956
);
949957
INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist;
950958
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
959+
SWIFT_VERSION = 4.2;
951960
};
952961
name = Profile;
953962
};
@@ -968,6 +977,7 @@
968977
);
969978
INFOPLIST_FILE = ReactiveObjCBridge/Info.plist;
970979
MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap";
980+
SWIFT_VERSION = 4.2;
971981
};
972982
name = Debug;
973983
};
@@ -988,6 +998,7 @@
988998
);
989999
INFOPLIST_FILE = ReactiveObjCBridge/Info.plist;
9901000
MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap";
1001+
SWIFT_VERSION = 4.2;
9911002
};
9921003
name = Test;
9931004
};
@@ -1008,6 +1019,7 @@
10081019
);
10091020
INFOPLIST_FILE = ReactiveObjCBridge/Info.plist;
10101021
MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap";
1022+
SWIFT_VERSION = 4.2;
10111023
};
10121024
name = Release;
10131025
};
@@ -1028,6 +1040,7 @@
10281040
);
10291041
INFOPLIST_FILE = ReactiveObjCBridge/Info.plist;
10301042
MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap";
1043+
SWIFT_VERSION = 4.2;
10311044
};
10321045
name = Profile;
10331046
};
@@ -1047,7 +1060,7 @@
10471060
MACOSX_DEPLOYMENT_TARGET = 10.9;
10481061
PRODUCT_BUNDLE_IDENTIFIER = "org.reactivecocoa.$(PRODUCT_NAME:rfc1034identifier)";
10491062
PRODUCT_NAME = "$(PROJECT_NAME)";
1050-
SWIFT_VERSION = 4.0;
1063+
SWIFT_VERSION = 4.2;
10511064
TVOS_DEPLOYMENT_TARGET = 9.0;
10521065
VERSIONING_SYSTEM = "apple-generic";
10531066
VERSION_INFO_PREFIX = "";
@@ -1072,7 +1085,7 @@
10721085
PRODUCT_BUNDLE_IDENTIFIER = "org.reactivecocoa.$(PRODUCT_NAME:rfc1034identifier)";
10731086
PRODUCT_NAME = "$(PROJECT_NAME)";
10741087
SWIFT_COMPILATION_MODE = wholemodule;
1075-
SWIFT_VERSION = 4.0;
1088+
SWIFT_VERSION = 4.2;
10761089
TVOS_DEPLOYMENT_TARGET = 9.0;
10771090
VERSIONING_SYSTEM = "apple-generic";
10781091
VERSION_INFO_PREFIX = "";
@@ -1093,6 +1106,7 @@
10931106
FRAMEWORK_VERSION = A;
10941107
INFOPLIST_FILE = ReactiveObjCBridge/Info.plist;
10951108
MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap";
1109+
SWIFT_VERSION = 4.2;
10961110
};
10971111
name = Debug;
10981112
};
@@ -1109,6 +1123,7 @@
11091123
FRAMEWORK_VERSION = A;
11101124
INFOPLIST_FILE = ReactiveObjCBridge/Info.plist;
11111125
MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap";
1126+
SWIFT_VERSION = 4.2;
11121127
};
11131128
name = Release;
11141129
};
@@ -1124,6 +1139,7 @@
11241139
INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist;
11251140
MACOSX_DEPLOYMENT_TARGET = 10.10;
11261141
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
1142+
SWIFT_VERSION = 4.2;
11271143
};
11281144
name = Debug;
11291145
};
@@ -1139,6 +1155,7 @@
11391155
INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist;
11401156
MACOSX_DEPLOYMENT_TARGET = 10.10;
11411157
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
1158+
SWIFT_VERSION = 4.2;
11421159
};
11431160
name = Release;
11441161
};
@@ -1155,6 +1172,7 @@
11551172
);
11561173
INFOPLIST_FILE = ReactiveObjCBridge/Info.plist;
11571174
MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap";
1175+
SWIFT_VERSION = 4.2;
11581176
};
11591177
name = Debug;
11601178
};
@@ -1171,6 +1189,7 @@
11711189
);
11721190
INFOPLIST_FILE = ReactiveObjCBridge/Info.plist;
11731191
MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap";
1192+
SWIFT_VERSION = 4.2;
11741193
};
11751194
name = Release;
11761195
};
@@ -1185,6 +1204,7 @@
11851204
);
11861205
INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist;
11871206
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
1207+
SWIFT_VERSION = 4.2;
11881208
};
11891209
name = Debug;
11901210
};
@@ -1199,6 +1219,7 @@
11991219
);
12001220
INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist;
12011221
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
1222+
SWIFT_VERSION = 4.2;
12021223
};
12031224
name = Release;
12041225
};
@@ -1217,7 +1238,7 @@
12171238
MACOSX_DEPLOYMENT_TARGET = 10.9;
12181239
PRODUCT_BUNDLE_IDENTIFIER = "org.reactivecocoa.$(PRODUCT_NAME:rfc1034identifier)";
12191240
PRODUCT_NAME = "$(PROJECT_NAME)";
1220-
SWIFT_VERSION = 4.0;
1241+
SWIFT_VERSION = 4.2;
12211242
TVOS_DEPLOYMENT_TARGET = 9.0;
12221243
VERSIONING_SYSTEM = "apple-generic";
12231244
VERSION_INFO_PREFIX = "";
@@ -1238,6 +1259,7 @@
12381259
FRAMEWORK_VERSION = A;
12391260
INFOPLIST_FILE = ReactiveObjCBridge/Info.plist;
12401261
MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap";
1262+
SWIFT_VERSION = 4.2;
12411263
};
12421264
name = Profile;
12431265
};
@@ -1253,6 +1275,7 @@
12531275
INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist;
12541276
MACOSX_DEPLOYMENT_TARGET = 10.10;
12551277
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
1278+
SWIFT_VERSION = 4.2;
12561279
};
12571280
name = Profile;
12581281
};
@@ -1269,6 +1292,7 @@
12691292
);
12701293
INFOPLIST_FILE = ReactiveObjCBridge/Info.plist;
12711294
MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap";
1295+
SWIFT_VERSION = 4.2;
12721296
};
12731297
name = Profile;
12741298
};
@@ -1283,6 +1307,7 @@
12831307
);
12841308
INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist;
12851309
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
1310+
SWIFT_VERSION = 4.2;
12861311
};
12871312
name = Profile;
12881313
};
@@ -1298,10 +1323,10 @@
12981323
CODE_SIGNING_REQUIRED = NO;
12991324
CURRENT_PROJECT_VERSION = 1;
13001325
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1301-
MACOSX_DEPLOYMENT_TARGET = 10.9;
1326+
MACOSX_DEPLOYMENT_TARGET = 10.10;
13021327
PRODUCT_BUNDLE_IDENTIFIER = "org.reactivecocoa.$(PRODUCT_NAME:rfc1034identifier)-Tests";
13031328
PRODUCT_NAME = "$(PROJECT_NAME)";
1304-
SWIFT_VERSION = 4.0;
1329+
SWIFT_VERSION = 4.2;
13051330
TVOS_DEPLOYMENT_TARGET = 9.0;
13061331
VERSIONING_SYSTEM = "apple-generic";
13071332
VERSION_INFO_PREFIX = "";
@@ -1322,6 +1347,7 @@
13221347
FRAMEWORK_VERSION = A;
13231348
INFOPLIST_FILE = ReactiveObjCBridge/Info.plist;
13241349
MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap";
1350+
SWIFT_VERSION = 4.2;
13251351
};
13261352
name = Test;
13271353
};
@@ -1337,6 +1363,7 @@
13371363
INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist;
13381364
MACOSX_DEPLOYMENT_TARGET = 10.10;
13391365
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
1366+
SWIFT_VERSION = 4.2;
13401367
};
13411368
name = Test;
13421369
};
@@ -1353,6 +1380,7 @@
13531380
);
13541381
INFOPLIST_FILE = ReactiveObjCBridge/Info.plist;
13551382
MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap";
1383+
SWIFT_VERSION = 4.2;
13561384
};
13571385
name = Test;
13581386
};
@@ -1367,6 +1395,7 @@
13671395
);
13681396
INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist;
13691397
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
1398+
SWIFT_VERSION = 4.2;
13701399
};
13711400
name = Test;
13721401
};

0 commit comments

Comments
 (0)