Skip to content

Commit 23bbc4b

Browse files
tristanhimmelmantristanhimmelman
authored
Merge pull request #259 from tristanhimmelman/swift-4.2
- renamed OSX target to macOS
2 parents 3146eb8 + bfb21ba commit 23bbc4b

File tree

12 files changed

+73
-62
lines changed

12 files changed

+73
-62
lines changed

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[submodule "Carthage/Checkouts/ObjectMapper"]
22
path = Carthage/Checkouts/ObjectMapper
3-
url = https://github.com/Hearst-DD/ObjectMapper.git
3+
url = https://github.com/tristanhimmelman/ObjectMapper.git
44
[submodule "Carthage/Checkouts/Alamofire"]
55
path = Carthage/Checkouts/Alamofire
66
url = https://github.com/Alamofire/Alamofire.git

‎.swift-version‎

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

‎AlamofireObjectMapper.podspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ Pod::Spec.new do |s|
1313
s.watchos.deployment_target = '2.0'
1414
s.tvos.deployment_target = '9.0'
1515

16-
s.swift_version = '4.0'
16+
s.swift_version = '4.2'
1717

1818
s.requires_arc = true
1919
s.source_files = 'AlamofireObjectMapper/**/*.swift'
20-
s.dependency 'Alamofire', '~> 4.1'
21-
s.dependency 'ObjectMapper', '~> 3.3'
20+
s.dependency 'Alamofire', '~> 4.7'
21+
s.dependency 'ObjectMapper', '~> 3.4'
2222
end

‎AlamofireObjectMapper.xcodeproj/project.pbxproj‎

Lines changed: 50 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@
3232
/* End PBXBuildFile section */
3333

3434
/* Begin PBXContainerItemProxy section */
35+
6A20983B219CDEA5009AB4DF /* PBXContainerItemProxy */ = {
36+
isa = PBXContainerItemProxy;
37+
containerPortal = E89A900C1D6F5F520023C364 /* ObjectMapper.xcodeproj */;
38+
proxyType = 2;
39+
remoteGlobalIDString = DBB9B41F2142A25100078E5A;
40+
remoteInfo = "ObjectMapper-Mac-Static";
41+
};
3542
6AB2A01E1AF26C36001EBB20 /* PBXContainerItemProxy */ = {
3643
isa = PBXContainerItemProxy;
3744
containerPortal = 6AB2A0081AF26C36001EBB20 /* Project object */;
@@ -162,7 +169,7 @@
162169
6AB2A0231AF26C36001EBB20 /* AlamofireObjectMapperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlamofireObjectMapperTests.swift; sourceTree = "<group>"; };
163170
6AB2A02D1AF2746D001EBB20 /* AlamofireObjectMapper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlamofireObjectMapper.swift; sourceTree = "<group>"; };
164171
6AB2A0851AF27DF1001EBB20 /* AlamofireObjectMapper.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AlamofireObjectMapper.framework; sourceTree = BUILT_PRODUCTS_DIR; };
165-
6AB2A08F1AF27DF1001EBB20 /* AlamofireObjectMapperTests OSX.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "AlamofireObjectMapperTests OSX.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
172+
6AB2A08F1AF27DF1001EBB20 /* AlamofireObjectMapperTests macOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "AlamofireObjectMapperTests macOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
166173
6AC4580C1BA34C5600054758 /* AlamofireObjectMapper.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AlamofireObjectMapper.framework; sourceTree = BUILT_PRODUCTS_DIR; };
167174
6AC692061BE3F69E004C119A /* AlamofireObjectMapper.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AlamofireObjectMapper.framework; sourceTree = BUILT_PRODUCTS_DIR; };
168175
6AC692121BE3F7F5004C119A /* AlamofireObjectMapperTests tvOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "AlamofireObjectMapperTests tvOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -251,7 +258,7 @@
251258
6AB2A0111AF26C36001EBB20 /* AlamofireObjectMapper.framework */,
252259
6AB2A01C1AF26C36001EBB20 /* AlamofireObjectMapperTests iOS.xctest */,
253260
6AB2A0851AF27DF1001EBB20 /* AlamofireObjectMapper.framework */,
254-
6AB2A08F1AF27DF1001EBB20 /* AlamofireObjectMapperTests OSX.xctest */,
261+
6AB2A08F1AF27DF1001EBB20 /* AlamofireObjectMapperTests macOS.xctest */,
255262
6AC4580C1BA34C5600054758 /* AlamofireObjectMapper.framework */,
256263
6AC692061BE3F69E004C119A /* AlamofireObjectMapper.framework */,
257264
6AC692121BE3F7F5004C119A /* AlamofireObjectMapperTests tvOS.xctest */,
@@ -318,6 +325,7 @@
318325
E89A901F1D6F5F520023C364 /* ObjectMapper-iOSTests.xctest */,
319326
E89A90211D6F5F520023C364 /* ObjectMapper-MacTests.xctest */,
320327
E89A90231D6F5F520023C364 /* ObjectMapper-tvOSTests.xctest */,
328+
6A20983C219CDEA5009AB4DF /* libObjectMapper.a */,
321329
);
322330
name = Products;
323331
sourceTree = "<group>";
@@ -395,9 +403,9 @@
395403
productReference = 6AB2A01C1AF26C36001EBB20 /* AlamofireObjectMapperTests iOS.xctest */;
396404
productType = "com.apple.product-type.bundle.unit-test";
397405
};
398-
6AB2A0841AF27DF1001EBB20 /* AlamofireObjectMapper OSX */ = {
406+
6AB2A0841AF27DF1001EBB20 /* AlamofireObjectMapper macOS */ = {
399407
isa = PBXNativeTarget;
400-
buildConfigurationList = 6AB2A0981AF27DF1001EBB20 /* Build configuration list for PBXNativeTarget "AlamofireObjectMapper OSX" */;
408+
buildConfigurationList = 6AB2A0981AF27DF1001EBB20 /* Build configuration list for PBXNativeTarget "AlamofireObjectMapper macOS" */;
401409
buildPhases = (
402410
6AB2A0801AF27DF1001EBB20 /* Sources */,
403411
6AB2A0811AF27DF1001EBB20 /* Frameworks */,
@@ -407,14 +415,14 @@
407415
);
408416
dependencies = (
409417
);
410-
name = "AlamofireObjectMapper OSX";
418+
name = "AlamofireObjectMapper macOS";
411419
productName = "AlamofireObjectMapper OSX";
412420
productReference = 6AB2A0851AF27DF1001EBB20 /* AlamofireObjectMapper.framework */;
413421
productType = "com.apple.product-type.framework";
414422
};
415-
6AB2A08E1AF27DF1001EBB20 /* AlamofireObjectMapperTests OSX */ = {
423+
6AB2A08E1AF27DF1001EBB20 /* AlamofireObjectMapperTests macOS */ = {
416424
isa = PBXNativeTarget;
417-
buildConfigurationList = 6AB2A09B1AF27DF1001EBB20 /* Build configuration list for PBXNativeTarget "AlamofireObjectMapperTests OSX" */;
425+
buildConfigurationList = 6AB2A09B1AF27DF1001EBB20 /* Build configuration list for PBXNativeTarget "AlamofireObjectMapperTests macOS" */;
418426
buildPhases = (
419427
6AB2A08B1AF27DF1001EBB20 /* Sources */,
420428
6AB2A08C1AF27DF1001EBB20 /* Frameworks */,
@@ -425,9 +433,9 @@
425433
dependencies = (
426434
6AB2A0921AF27DF1001EBB20 /* PBXTargetDependency */,
427435
);
428-
name = "AlamofireObjectMapperTests OSX";
436+
name = "AlamofireObjectMapperTests macOS";
429437
productName = "AlamofireObjectMapper OSXTests";
430-
productReference = 6AB2A08F1AF27DF1001EBB20 /* AlamofireObjectMapperTests OSX.xctest */;
438+
productReference = 6AB2A08F1AF27DF1001EBB20 /* AlamofireObjectMapperTests macOS.xctest */;
431439
productType = "com.apple.product-type.bundle.unit-test";
432440
};
433441
6AC4580B1BA34C5600054758 /* AlamofireObjectMapper watchOS */ = {
@@ -493,7 +501,7 @@
493501
CLASSPREFIX = "";
494502
LastSwiftMigration = 0700;
495503
LastSwiftUpdateCheck = 0710;
496-
LastUpgradeCheck = 0900;
504+
LastUpgradeCheck = 1010;
497505
ORGANIZATIONNAME = "Tristan Himmelman";
498506
TargetAttributes = {
499507
6AB2A0101AF26C36001EBB20 = {
@@ -545,8 +553,8 @@
545553
targets = (
546554
6AB2A0101AF26C36001EBB20 /* AlamofireObjectMapper iOS */,
547555
6AB2A01B1AF26C36001EBB20 /* AlamofireObjectMapperTests iOS */,
548-
6AB2A0841AF27DF1001EBB20 /* AlamofireObjectMapper OSX */,
549-
6AB2A08E1AF27DF1001EBB20 /* AlamofireObjectMapperTests OSX */,
556+
6AB2A0841AF27DF1001EBB20 /* AlamofireObjectMapper macOS */,
557+
6AB2A08E1AF27DF1001EBB20 /* AlamofireObjectMapperTests macOS */,
550558
6AC692051BE3F69E004C119A /* AlamofireObjectMapper tvOS */,
551559
6AC692111BE3F7F5004C119A /* AlamofireObjectMapperTests tvOS */,
552560
6AC4580B1BA34C5600054758 /* AlamofireObjectMapper watchOS */,
@@ -555,6 +563,13 @@
555563
/* End PBXProject section */
556564

557565
/* Begin PBXReferenceProxy section */
566+
6A20983C219CDEA5009AB4DF /* libObjectMapper.a */ = {
567+
isa = PBXReferenceProxy;
568+
fileType = archive.ar;
569+
path = libObjectMapper.a;
570+
remoteRef = 6A20983B219CDEA5009AB4DF /* PBXContainerItemProxy */;
571+
sourceTree = BUILT_PRODUCTS_DIR;
572+
};
558573
E89A8FFF1D6F5F480023C364 /* Alamofire.framework */ = {
559574
isa = PBXReferenceProxy;
560575
fileType = wrapper.framework;
@@ -760,7 +775,7 @@
760775
};
761776
6AB2A0921AF27DF1001EBB20 /* PBXTargetDependency */ = {
762777
isa = PBXTargetDependency;
763-
target = 6AB2A0841AF27DF1001EBB20 /* AlamofireObjectMapper OSX */;
778+
target = 6AB2A0841AF27DF1001EBB20 /* AlamofireObjectMapper macOS */;
764779
targetProxy = 6AB2A0911AF27DF1001EBB20 /* PBXContainerItemProxy */;
765780
};
766781
6AC692191BE3F7F6004C119A /* PBXTargetDependency */ = {
@@ -783,12 +798,14 @@
783798
CLANG_WARN_BOOL_CONVERSION = YES;
784799
CLANG_WARN_COMMA = YES;
785800
CLANG_WARN_CONSTANT_CONVERSION = YES;
801+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
786802
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
787803
CLANG_WARN_EMPTY_BODY = YES;
788804
CLANG_WARN_ENUM_CONVERSION = YES;
789805
CLANG_WARN_INFINITE_RECURSION = YES;
790806
CLANG_WARN_INT_CONVERSION = YES;
791807
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
808+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
792809
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
793810
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
794811
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -823,7 +840,7 @@
823840
ONLY_ACTIVE_ARCH = YES;
824841
SDKROOT = iphoneos;
825842
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
826-
SWIFT_VERSION = 4.0;
843+
SWIFT_VERSION = 4.2;
827844
TARGETED_DEVICE_FAMILY = "1,2";
828845
VERSIONING_SYSTEM = "apple-generic";
829846
VERSION_INFO_PREFIX = "";
@@ -842,12 +859,14 @@
842859
CLANG_WARN_BOOL_CONVERSION = YES;
843860
CLANG_WARN_COMMA = YES;
844861
CLANG_WARN_CONSTANT_CONVERSION = YES;
862+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
845863
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
846864
CLANG_WARN_EMPTY_BODY = YES;
847865
CLANG_WARN_ENUM_CONVERSION = YES;
848866
CLANG_WARN_INFINITE_RECURSION = YES;
849867
CLANG_WARN_INT_CONVERSION = YES;
850868
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
869+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
851870
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
852871
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
853872
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -873,7 +892,7 @@
873892
MACOSX_DEPLOYMENT_TARGET = 10.10;
874893
MTL_ENABLE_DEBUG_INFO = NO;
875894
SDKROOT = iphoneos;
876-
SWIFT_VERSION = 4.0;
895+
SWIFT_VERSION = 4.2;
877896
TARGETED_DEVICE_FAMILY = "1,2";
878897
VALIDATE_PRODUCT = YES;
879898
VERSIONING_SYSTEM = "apple-generic";
@@ -901,7 +920,7 @@
901920
PRODUCT_NAME = AlamofireObjectMapper;
902921
SKIP_INSTALL = YES;
903922
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
904-
SWIFT_VERSION = 4.0;
923+
SWIFT_VERSION = 4.2;
905924
};
906925
name = Debug;
907926
};
@@ -925,7 +944,7 @@
925944
PRODUCT_NAME = AlamofireObjectMapper;
926945
SKIP_INSTALL = YES;
927946
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
928-
SWIFT_VERSION = 4.0;
947+
SWIFT_VERSION = 4.2;
929948
};
930949
name = Release;
931950
};
@@ -946,7 +965,7 @@
946965
PRODUCT_BUNDLE_IDENTIFIER = "com.tristanhimmelman.$(PRODUCT_NAME:rfc1034identifier)";
947966
PRODUCT_NAME = "$(TARGET_NAME)";
948967
SDKROOT = iphoneos;
949-
SWIFT_VERSION = 4.0;
968+
SWIFT_VERSION = 4.2;
950969
};
951970
name = Debug;
952971
};
@@ -964,7 +983,7 @@
964983
PRODUCT_NAME = "$(TARGET_NAME)";
965984
SDKROOT = iphoneos;
966985
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
967-
SWIFT_VERSION = 4.0;
986+
SWIFT_VERSION = 4.2;
968987
};
969988
name = Release;
970989
};
@@ -991,7 +1010,7 @@
9911010
PRODUCT_NAME = AlamofireObjectMapper;
9921011
SDKROOT = macosx;
9931012
SKIP_INSTALL = YES;
994-
SWIFT_VERSION = 4.0;
1013+
SWIFT_VERSION = 4.2;
9951014
};
9961015
name = Debug;
9971016
};
@@ -1014,7 +1033,7 @@
10141033
SDKROOT = macosx;
10151034
SKIP_INSTALL = YES;
10161035
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1017-
SWIFT_VERSION = 4.0;
1036+
SWIFT_VERSION = 4.2;
10181037
};
10191038
name = Release;
10201039
};
@@ -1037,7 +1056,7 @@
10371056
PRODUCT_BUNDLE_IDENTIFIER = "com.tristanhimmelman.$(PRODUCT_NAME:rfc1034identifier)";
10381057
PRODUCT_NAME = "$(TARGET_NAME)";
10391058
SDKROOT = macosx;
1040-
SWIFT_VERSION = 4.0;
1059+
SWIFT_VERSION = 4.2;
10411060
};
10421061
name = Debug;
10431062
};
@@ -1056,7 +1075,7 @@
10561075
PRODUCT_NAME = "$(TARGET_NAME)";
10571076
SDKROOT = macosx;
10581077
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1059-
SWIFT_VERSION = 4.0;
1078+
SWIFT_VERSION = 4.2;
10601079
};
10611080
name = Release;
10621081
};
@@ -1079,7 +1098,7 @@
10791098
PRODUCT_NAME = AlamofireObjectMapper;
10801099
SDKROOT = watchos;
10811100
SKIP_INSTALL = YES;
1082-
SWIFT_VERSION = 4.0;
1101+
SWIFT_VERSION = 4.2;
10831102
TARGETED_DEVICE_FAMILY = 4;
10841103
WATCHOS_DEPLOYMENT_TARGET = 2.0;
10851104
};
@@ -1104,7 +1123,7 @@
11041123
SDKROOT = watchos;
11051124
SKIP_INSTALL = YES;
11061125
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1107-
SWIFT_VERSION = 4.0;
1126+
SWIFT_VERSION = 4.2;
11081127
TARGETED_DEVICE_FAMILY = 4;
11091128
WATCHOS_DEPLOYMENT_TARGET = 2.0;
11101129
};
@@ -1129,7 +1148,7 @@
11291148
PRODUCT_NAME = AlamofireObjectMapper;
11301149
SDKROOT = appletvos;
11311150
SKIP_INSTALL = YES;
1132-
SWIFT_VERSION = 4.0;
1151+
SWIFT_VERSION = 4.2;
11331152
TARGETED_DEVICE_FAMILY = 3;
11341153
TVOS_DEPLOYMENT_TARGET = 9.0;
11351154
};
@@ -1154,7 +1173,7 @@
11541173
SDKROOT = appletvos;
11551174
SKIP_INSTALL = YES;
11561175
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1157-
SWIFT_VERSION = 4.0;
1176+
SWIFT_VERSION = 4.2;
11581177
TARGETED_DEVICE_FAMILY = 3;
11591178
TVOS_DEPLOYMENT_TARGET = 9.0;
11601179
};
@@ -1173,7 +1192,7 @@
11731192
PRODUCT_BUNDLE_IDENTIFIER = "com.tristanhimmelman.$(PRODUCT_NAME:rfc1034identifier)";
11741193
PRODUCT_NAME = "$(TARGET_NAME)";
11751194
SDKROOT = appletvos;
1176-
SWIFT_VERSION = 4.0;
1195+
SWIFT_VERSION = 4.2;
11771196
TVOS_DEPLOYMENT_TARGET = 9.0;
11781197
};
11791198
name = Debug;
@@ -1191,7 +1210,7 @@
11911210
PRODUCT_NAME = "$(TARGET_NAME)";
11921211
SDKROOT = appletvos;
11931212
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1194-
SWIFT_VERSION = 4.0;
1213+
SWIFT_VERSION = 4.2;
11951214
TVOS_DEPLOYMENT_TARGET = 9.0;
11961215
};
11971216
name = Release;
@@ -1226,7 +1245,7 @@
12261245
defaultConfigurationIsVisible = 0;
12271246
defaultConfigurationName = Release;
12281247
};
1229-
6AB2A0981AF27DF1001EBB20 /* Build configuration list for PBXNativeTarget "AlamofireObjectMapper OSX" */ = {
1248+
6AB2A0981AF27DF1001EBB20 /* Build configuration list for PBXNativeTarget "AlamofireObjectMapper macOS" */ = {
12301249
isa = XCConfigurationList;
12311250
buildConfigurations = (
12321251
6AB2A0991AF27DF1001EBB20 /* Debug */,
@@ -1235,7 +1254,7 @@
12351254
defaultConfigurationIsVisible = 0;
12361255
defaultConfigurationName = Release;
12371256
};
1238-
6AB2A09B1AF27DF1001EBB20 /* Build configuration list for PBXNativeTarget "AlamofireObjectMapperTests OSX" */ = {
1257+
6AB2A09B1AF27DF1001EBB20 /* Build configuration list for PBXNativeTarget "AlamofireObjectMapperTests macOS" */ = {
12391258
isa = XCConfigurationList;
12401259
buildConfigurations = (
12411260
6AB2A09C1AF27DF1001EBB20 /* Debug */,

0 commit comments

Comments
 (0)