Skip to content

Commit 17b2044

Browse files
wongzigiiwongzigii
authored
Merge pull request #50 from SwiftyJSON/alamofire4
Alamofire 4.0.0 + Swift 3.0
2 parents edee048 + 3a3d2b0 commit 17b2044

11 files changed

Lines changed: 299 additions & 93 deletions

File tree

‎.travis.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
language: objective-c
2+
osx_image: xcode8.2
3+
xcode_sdk: iphonesimulator10.0
4+
script:
5+
- set -o pipefail && xcodebuild -project Alamofire-SwiftyJSON.xcodeproj -scheme "AlamofireSwiftyJSON" -destination "id=22FA2149-1241-469C-BF6D-462D3837DB72" build-for-testing test | xcpretty

‎Alamofire‎

Submodule Alamofire updated 109 files

‎Alamofire-SwiftyJSON.podspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ Pod::Spec.new do |s|
88

99
s.requires_arc = true
1010
s.osx.deployment_target = "10.9"
11-
s.ios.deployment_target = "8.0"
11+
s.ios.deployment_target = "9.0"
1212
s.source = { :git => "https://github.com/SwiftyJSON/Alamofire-SwiftyJSON.git", :tag => s.version }
1313
s.source_files = "Source/*.swift"
14-
s.dependency 'Alamofire', '1.3'
15-
s.dependency 'SwiftyJSON', '2.2.0'
14+
s.dependency 'Alamofire', '~> 4.0'
15+
s.dependency 'SwiftyJSON', '~> 3.0'
1616
end

‎Alamofire-SwiftyJSON.xcodeproj/project.pbxproj‎

Lines changed: 163 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,75 @@
1818
/* End PBXBuildFile section */
1919

2020
/* Begin PBXContainerItemProxy section */
21-
A8A2DBB21A2328F500AF9EFC /* PBXContainerItemProxy */ = {
21+
4BC5E9F91BB7E15600A393DD /* PBXContainerItemProxy */ = {
22+
isa = PBXContainerItemProxy;
23+
containerPortal = A8AFB75419D14A5C0070765E /* Alamofire.xcodeproj */;
24+
proxyType = 2;
25+
remoteGlobalIDString = 4DD67C0B1A5C55C900ED2280;
26+
remoteInfo = "Alamofire OSX";
27+
};
28+
4BC5E9FB1BB7E15600A393DD /* PBXContainerItemProxy */ = {
29+
isa = PBXContainerItemProxy;
30+
containerPortal = A8AFB75419D14A5C0070765E /* Alamofire.xcodeproj */;
31+
proxyType = 2;
32+
remoteGlobalIDString = E4202FE01B667AA100C997FB;
33+
remoteInfo = "Alamofire watchOS";
34+
};
35+
4BC5E9FD1BB7E15600A393DD /* PBXContainerItemProxy */ = {
36+
isa = PBXContainerItemProxy;
37+
containerPortal = A8AFB75419D14A5C0070765E /* Alamofire.xcodeproj */;
38+
proxyType = 2;
39+
remoteGlobalIDString = F829C6B21A7A94F100A2CD59;
40+
remoteInfo = "Alamofire OSX Tests";
41+
};
42+
4BC5EA031BB7E15600A393DD /* PBXContainerItemProxy */ = {
43+
isa = PBXContainerItemProxy;
44+
containerPortal = A8AFB75D19D14A670070765E /* SwiftyJSON.xcodeproj */;
45+
proxyType = 2;
46+
remoteGlobalIDString = 9C7DFC5B1A9102BD005AA3F7;
47+
remoteInfo = "SwiftyJSON OSX";
48+
};
49+
4BC5EA051BB7E15600A393DD /* PBXContainerItemProxy */ = {
50+
isa = PBXContainerItemProxy;
51+
containerPortal = A8AFB75D19D14A670070765E /* SwiftyJSON.xcodeproj */;
52+
proxyType = 2;
53+
remoteGlobalIDString = 9C7DFC651A9102BD005AA3F7;
54+
remoteInfo = "SwiftyJSON OSX Tests";
55+
};
56+
4BC5EA071BB7E15600A393DD /* PBXContainerItemProxy */ = {
2257
isa = PBXContainerItemProxy;
2358
containerPortal = A8AFB75D19D14A670070765E /* SwiftyJSON.xcodeproj */;
2459
proxyType = 2;
25-
remoteGlobalIDString = 4EC1C1C91A0C1A2D0026ED0B;
26-
remoteInfo = SwiftyJSONOSX;
60+
remoteGlobalIDString = E4D7CCE81B9465A700EE7221;
61+
remoteInfo = "SwiftyJSON watchOS";
62+
};
63+
A81D16431E59E90500C62C5F /* PBXContainerItemProxy */ = {
64+
isa = PBXContainerItemProxy;
65+
containerPortal = A8AFB75419D14A5C0070765E /* Alamofire.xcodeproj */;
66+
proxyType = 2;
67+
remoteGlobalIDString = 4CF626EF1BA7CB3E0011A099;
68+
remoteInfo = "Alamofire tvOS";
2769
};
28-
A8A2DBB41A2328F500AF9EFC /* PBXContainerItemProxy */ = {
70+
A81D16451E59E90500C62C5F /* PBXContainerItemProxy */ = {
71+
isa = PBXContainerItemProxy;
72+
containerPortal = A8AFB75419D14A5C0070765E /* Alamofire.xcodeproj */;
73+
proxyType = 2;
74+
remoteGlobalIDString = 4CF626F81BA7CB3E0011A099;
75+
remoteInfo = "Alamofire tvOS Tests";
76+
};
77+
A81D164D1E59E90500C62C5F /* PBXContainerItemProxy */ = {
2978
isa = PBXContainerItemProxy;
3079
containerPortal = A8AFB75D19D14A670070765E /* SwiftyJSON.xcodeproj */;
3180
proxyType = 2;
32-
remoteGlobalIDString = 4EC1C1D31A0C1A2D0026ED0B;
33-
remoteInfo = SwiftyJSONOSXTests;
81+
remoteGlobalIDString = 7236B4F61BAC14150020529B;
82+
remoteInfo = "SwiftyJSON tvOS";
83+
};
84+
A81D164F1E59E90500C62C5F /* PBXContainerItemProxy */ = {
85+
isa = PBXContainerItemProxy;
86+
containerPortal = A8AFB75D19D14A670070765E /* SwiftyJSON.xcodeproj */;
87+
proxyType = 2;
88+
remoteGlobalIDString = A8580F741BCF5C5B00DA927B;
89+
remoteInfo = "SwiftyJSON tvOS Tests";
3490
};
3591
A8A2DBB61A23290100AF9EFC /* PBXContainerItemProxy */ = {
3692
isa = PBXContainerItemProxy;
@@ -112,7 +168,7 @@
112168
};
113169
A8A2DBC21A2329CE00AF9EFC /* Copy Frameworks */ = {
114170
isa = PBXCopyFilesBuildPhase;
115-
buildActionMask = 8;
171+
buildActionMask = 12;
116172
dstPath = "";
117173
dstSubfolderSpec = 10;
118174
files = (
@@ -121,7 +177,7 @@
121177
A8A2DBC51A2329E700AF9EFC /* AlamofireSwiftyJSON.framework in Copy Frameworks */,
122178
);
123179
name = "Copy Frameworks";
124-
runOnlyForDeploymentPostprocessing = 1;
180+
runOnlyForDeploymentPostprocessing = 0;
125181
};
126182
/* End PBXCopyFilesBuildPhase section */
127183

@@ -214,7 +270,12 @@
214270
isa = PBXGroup;
215271
children = (
216272
A8AFB75A19D14A5C0070765E /* Alamofire.framework */,
217-
A8AFB75C19D14A5C0070765E /* AlamofireTests.xctest */,
273+
A8AFB75C19D14A5C0070765E /* Alamofire iOS Tests.xctest */,
274+
4BC5E9FA1BB7E15600A393DD /* Alamofire.framework */,
275+
4BC5E9FE1BB7E15600A393DD /* Alamofire macOS Tests.xctest */,
276+
A81D16441E59E90500C62C5F /* Alamofire.framework */,
277+
A81D16461E59E90500C62C5F /* Alamofire tvOS Tests.xctest */,
278+
4BC5E9FC1BB7E15600A393DD /* Alamofire.framework */,
218279
);
219280
name = Products;
220281
sourceTree = "<group>";
@@ -223,9 +284,12 @@
223284
isa = PBXGroup;
224285
children = (
225286
A8AFB76519D14A670070765E /* SwiftyJSON.framework */,
226-
A8AFB76719D14A670070765E /* SwiftyJSONTests.xctest */,
227-
A8A2DBB31A2328F500AF9EFC /* SwiftyJSON.framework */,
228-
A8A2DBB51A2328F500AF9EFC /* SwiftyJSONOSXTests.xctest */,
287+
A8AFB76719D14A670070765E /* SwiftyJSON iOS Tests.xctest */,
288+
4BC5EA041BB7E15600A393DD /* SwiftyJSON.framework */,
289+
4BC5EA061BB7E15600A393DD /* SwiftyJSON OSX Tests.xctest */,
290+
4BC5EA081BB7E15600A393DD /* SwiftyJSON.framework */,
291+
A81D164E1E59E90500C62C5F /* SwiftyJSON.framework */,
292+
A81D16501E59E90500C62C5F /* SwiftyJSON tvOS Tests.xctest */,
229293
);
230294
name = Products;
231295
sourceTree = "<group>";
@@ -292,14 +356,17 @@
292356
A8AFB70619D1401D0070765E /* Project object */ = {
293357
isa = PBXProject;
294358
attributes = {
295-
LastUpgradeCheck = 0600;
359+
LastSwiftUpdateCheck = 0700;
360+
LastUpgradeCheck = 0820;
296361
ORGANIZATIONNAME = SwiftJSON;
297362
TargetAttributes = {
298363
A8AFB70E19D1401D0070765E = {
299364
CreatedOnToolsVersion = 6.0.1;
365+
LastSwiftMigration = 0820;
300366
};
301367
A8AFB71919D1401D0070765E = {
302368
CreatedOnToolsVersion = 6.0.1;
369+
LastSwiftMigration = 0820;
303370
};
304371
};
305372
};
@@ -332,18 +399,74 @@
332399
/* End PBXProject section */
333400

334401
/* Begin PBXReferenceProxy section */
335-
A8A2DBB31A2328F500AF9EFC /* SwiftyJSON.framework */ = {
402+
4BC5E9FA1BB7E15600A393DD /* Alamofire.framework */ = {
403+
isa = PBXReferenceProxy;
404+
fileType = wrapper.framework;
405+
path = Alamofire.framework;
406+
remoteRef = 4BC5E9F91BB7E15600A393DD /* PBXContainerItemProxy */;
407+
sourceTree = BUILT_PRODUCTS_DIR;
408+
};
409+
4BC5E9FC1BB7E15600A393DD /* Alamofire.framework */ = {
410+
isa = PBXReferenceProxy;
411+
fileType = wrapper.framework;
412+
path = Alamofire.framework;
413+
remoteRef = 4BC5E9FB1BB7E15600A393DD /* PBXContainerItemProxy */;
414+
sourceTree = BUILT_PRODUCTS_DIR;
415+
};
416+
4BC5E9FE1BB7E15600A393DD /* Alamofire macOS Tests.xctest */ = {
417+
isa = PBXReferenceProxy;
418+
fileType = wrapper.cfbundle;
419+
path = "Alamofire macOS Tests.xctest";
420+
remoteRef = 4BC5E9FD1BB7E15600A393DD /* PBXContainerItemProxy */;
421+
sourceTree = BUILT_PRODUCTS_DIR;
422+
};
423+
4BC5EA041BB7E15600A393DD /* SwiftyJSON.framework */ = {
424+
isa = PBXReferenceProxy;
425+
fileType = wrapper.framework;
426+
path = SwiftyJSON.framework;
427+
remoteRef = 4BC5EA031BB7E15600A393DD /* PBXContainerItemProxy */;
428+
sourceTree = BUILT_PRODUCTS_DIR;
429+
};
430+
4BC5EA061BB7E15600A393DD /* SwiftyJSON OSX Tests.xctest */ = {
431+
isa = PBXReferenceProxy;
432+
fileType = wrapper.cfbundle;
433+
path = "SwiftyJSON OSX Tests.xctest";
434+
remoteRef = 4BC5EA051BB7E15600A393DD /* PBXContainerItemProxy */;
435+
sourceTree = BUILT_PRODUCTS_DIR;
436+
};
437+
4BC5EA081BB7E15600A393DD /* SwiftyJSON.framework */ = {
336438
isa = PBXReferenceProxy;
337439
fileType = wrapper.framework;
338440
path = SwiftyJSON.framework;
339-
remoteRef = A8A2DBB21A2328F500AF9EFC /* PBXContainerItemProxy */;
441+
remoteRef = 4BC5EA071BB7E15600A393DD /* PBXContainerItemProxy */;
442+
sourceTree = BUILT_PRODUCTS_DIR;
443+
};
444+
A81D16441E59E90500C62C5F /* Alamofire.framework */ = {
445+
isa = PBXReferenceProxy;
446+
fileType = wrapper.framework;
447+
path = Alamofire.framework;
448+
remoteRef = A81D16431E59E90500C62C5F /* PBXContainerItemProxy */;
340449
sourceTree = BUILT_PRODUCTS_DIR;
341450
};
342-
A8A2DBB51A2328F500AF9EFC /* SwiftyJSONOSXTests.xctest */ = {
451+
A81D16461E59E90500C62C5F /* Alamofire tvOS Tests.xctest */ = {
343452
isa = PBXReferenceProxy;
344453
fileType = wrapper.cfbundle;
345-
path = SwiftyJSONOSXTests.xctest;
346-
remoteRef = A8A2DBB41A2328F500AF9EFC /* PBXContainerItemProxy */;
454+
path = "Alamofire tvOS Tests.xctest";
455+
remoteRef = A81D16451E59E90500C62C5F /* PBXContainerItemProxy */;
456+
sourceTree = BUILT_PRODUCTS_DIR;
457+
};
458+
A81D164E1E59E90500C62C5F /* SwiftyJSON.framework */ = {
459+
isa = PBXReferenceProxy;
460+
fileType = wrapper.framework;
461+
path = SwiftyJSON.framework;
462+
remoteRef = A81D164D1E59E90500C62C5F /* PBXContainerItemProxy */;
463+
sourceTree = BUILT_PRODUCTS_DIR;
464+
};
465+
A81D16501E59E90500C62C5F /* SwiftyJSON tvOS Tests.xctest */ = {
466+
isa = PBXReferenceProxy;
467+
fileType = wrapper.cfbundle;
468+
path = "SwiftyJSON tvOS Tests.xctest";
469+
remoteRef = A81D164F1E59E90500C62C5F /* PBXContainerItemProxy */;
347470
sourceTree = BUILT_PRODUCTS_DIR;
348471
};
349472
A8AFB75A19D14A5C0070765E /* Alamofire.framework */ = {
@@ -353,10 +476,10 @@
353476
remoteRef = A8AFB75919D14A5C0070765E /* PBXContainerItemProxy */;
354477
sourceTree = BUILT_PRODUCTS_DIR;
355478
};
356-
A8AFB75C19D14A5C0070765E /* AlamofireTests.xctest */ = {
479+
A8AFB75C19D14A5C0070765E /* Alamofire iOS Tests.xctest */ = {
357480
isa = PBXReferenceProxy;
358481
fileType = wrapper.cfbundle;
359-
path = AlamofireTests.xctest;
482+
path = "Alamofire iOS Tests.xctest";
360483
remoteRef = A8AFB75B19D14A5C0070765E /* PBXContainerItemProxy */;
361484
sourceTree = BUILT_PRODUCTS_DIR;
362485
};
@@ -367,10 +490,10 @@
367490
remoteRef = A8AFB76419D14A670070765E /* PBXContainerItemProxy */;
368491
sourceTree = BUILT_PRODUCTS_DIR;
369492
};
370-
A8AFB76719D14A670070765E /* SwiftyJSONTests.xctest */ = {
493+
A8AFB76719D14A670070765E /* SwiftyJSON iOS Tests.xctest */ = {
371494
isa = PBXReferenceProxy;
372495
fileType = wrapper.cfbundle;
373-
path = SwiftyJSONTests.xctest;
496+
path = "SwiftyJSON iOS Tests.xctest";
374497
remoteRef = A8AFB76619D14A670070765E /* PBXContainerItemProxy */;
375498
sourceTree = BUILT_PRODUCTS_DIR;
376499
};
@@ -454,16 +577,20 @@
454577
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
455578
CLANG_WARN_EMPTY_BODY = YES;
456579
CLANG_WARN_ENUM_CONVERSION = YES;
580+
CLANG_WARN_INFINITE_RECURSION = YES;
457581
CLANG_WARN_INT_CONVERSION = YES;
458582
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
583+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
459584
CLANG_WARN_UNREACHABLE_CODE = YES;
460585
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
461586
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
462587
COPY_PHASE_STRIP = NO;
463588
CURRENT_PROJECT_VERSION = 1;
464589
ENABLE_STRICT_OBJC_MSGSEND = YES;
590+
ENABLE_TESTABILITY = YES;
465591
GCC_C_LANGUAGE_STANDARD = gnu99;
466592
GCC_DYNAMIC_NO_PIC = NO;
593+
GCC_NO_COMMON_BLOCKS = YES;
467594
GCC_OPTIMIZATION_LEVEL = 0;
468595
GCC_PREPROCESSOR_DEFINITIONS = (
469596
"DEBUG=1",
@@ -500,8 +627,10 @@
500627
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
501628
CLANG_WARN_EMPTY_BODY = YES;
502629
CLANG_WARN_ENUM_CONVERSION = YES;
630+
CLANG_WARN_INFINITE_RECURSION = YES;
503631
CLANG_WARN_INT_CONVERSION = YES;
504632
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
633+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
505634
CLANG_WARN_UNREACHABLE_CODE = YES;
506635
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
507636
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -510,6 +639,7 @@
510639
ENABLE_NS_ASSERTIONS = NO;
511640
ENABLE_STRICT_OBJC_MSGSEND = YES;
512641
GCC_C_LANGUAGE_STANDARD = gnu99;
642+
GCC_NO_COMMON_BLOCKS = YES;
513643
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
514644
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
515645
GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -519,6 +649,7 @@
519649
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
520650
MTL_ENABLE_DEBUG_INFO = NO;
521651
SDKROOT = iphoneos;
652+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
522653
TARGETED_DEVICE_FAMILY = "1,2";
523654
VALIDATE_PRODUCT = YES;
524655
VERSIONING_SYSTEM = "apple-generic";
@@ -529,60 +660,62 @@
529660
A8AFB72319D1401D0070765E /* Debug */ = {
530661
isa = XCBuildConfiguration;
531662
buildSettings = {
663+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
532664
DEFINES_MODULE = YES;
533665
DYLIB_COMPATIBILITY_VERSION = 1;
534666
DYLIB_CURRENT_VERSION = 1;
535667
DYLIB_INSTALL_NAME_BASE = "@rpath";
536668
INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
537669
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
538670
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
671+
PRODUCT_BUNDLE_IDENTIFIER = "com.swiftjson.$(PRODUCT_NAME:rfc1034identifier)";
539672
PRODUCT_NAME = "$(TARGET_NAME)";
540673
SKIP_INSTALL = YES;
674+
SWIFT_VERSION = 3.0;
541675
};
542676
name = Debug;
543677
};
544678
A8AFB72419D1401D0070765E /* Release */ = {
545679
isa = XCBuildConfiguration;
546680
buildSettings = {
681+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
547682
DEFINES_MODULE = YES;
548683
DYLIB_COMPATIBILITY_VERSION = 1;
549684
DYLIB_CURRENT_VERSION = 1;
550685
DYLIB_INSTALL_NAME_BASE = "@rpath";
551686
INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
552687
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
553688
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
689+
PRODUCT_BUNDLE_IDENTIFIER = "com.swiftjson.$(PRODUCT_NAME:rfc1034identifier)";
554690
PRODUCT_NAME = "$(TARGET_NAME)";
555691
SKIP_INSTALL = YES;
692+
SWIFT_VERSION = 3.0;
556693
};
557694
name = Release;
558695
};
559696
A8AFB72619D1401D0070765E /* Debug */ = {
560697
isa = XCBuildConfiguration;
561698
buildSettings = {
562-
FRAMEWORK_SEARCH_PATHS = (
563-
"$(SDKROOT)/Developer/Library/Frameworks",
564-
"$(inherited)",
565-
);
566699
GCC_PREPROCESSOR_DEFINITIONS = (
567700
"DEBUG=1",
568701
"$(inherited)",
569702
);
570703
INFOPLIST_FILE = Tests/Info.plist;
571704
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
705+
PRODUCT_BUNDLE_IDENTIFIER = "com.swiftjson.$(PRODUCT_NAME:rfc1034identifier)";
572706
PRODUCT_NAME = "$(TARGET_NAME)";
707+
SWIFT_VERSION = 3.0;
573708
};
574709
name = Debug;
575710
};
576711
A8AFB72719D1401D0070765E /* Release */ = {
577712
isa = XCBuildConfiguration;
578713
buildSettings = {
579-
FRAMEWORK_SEARCH_PATHS = (
580-
"$(SDKROOT)/Developer/Library/Frameworks",
581-
"$(inherited)",
582-
);
583714
INFOPLIST_FILE = Tests/Info.plist;
584715
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
716+
PRODUCT_BUNDLE_IDENTIFIER = "com.swiftjson.$(PRODUCT_NAME:rfc1034identifier)";
585717
PRODUCT_NAME = "$(TARGET_NAME)";
718+
SWIFT_VERSION = 3.0;
586719
};
587720
name = Release;
588721
};

0 commit comments

Comments
 (0)