Skip to content

Commit 0678ddb

Browse files
authored
Merge pull request #64 from SwiftyJSON/Swift4-Xcode9
Swift 4 and Xcode 9
2 parents 32ebe5c + ea756b5 commit 0678ddb

5 files changed

Lines changed: 19 additions & 5 deletions

File tree

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode8
2+
osx_image: xcode9
33
xcode_sdk: iphonesimulator10.0
44
env:
55
- PLATFORM="ios" SCHEME="AlamofireSwiftyJSON" DESTINATION="platform=iOS Simulator,name=iPhone SE,OS=10.0"

Alamofire-SwiftyJSON.xcodeproj/project.pbxproj

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@
357357
isa = PBXProject;
358358
attributes = {
359359
LastSwiftUpdateCheck = 0700;
360-
LastUpgradeCheck = 0820;
360+
LastUpgradeCheck = 0900;
361361
ORGANIZATIONNAME = SwiftJSON;
362362
TargetAttributes = {
363363
A8AFB70E19D1401D0070765E = {
@@ -572,14 +572,20 @@
572572
CLANG_CXX_LIBRARY = "libc++";
573573
CLANG_ENABLE_MODULES = YES;
574574
CLANG_ENABLE_OBJC_ARC = YES;
575+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
575576
CLANG_WARN_BOOL_CONVERSION = YES;
577+
CLANG_WARN_COMMA = YES;
576578
CLANG_WARN_CONSTANT_CONVERSION = YES;
577579
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
578580
CLANG_WARN_EMPTY_BODY = YES;
579581
CLANG_WARN_ENUM_CONVERSION = YES;
580582
CLANG_WARN_INFINITE_RECURSION = YES;
581583
CLANG_WARN_INT_CONVERSION = YES;
584+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
585+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
582586
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
587+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
588+
CLANG_WARN_STRICT_PROTOTYPES = YES;
583589
CLANG_WARN_SUSPICIOUS_MOVE = YES;
584590
CLANG_WARN_UNREACHABLE_CODE = YES;
585591
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -622,14 +628,20 @@
622628
CLANG_CXX_LIBRARY = "libc++";
623629
CLANG_ENABLE_MODULES = YES;
624630
CLANG_ENABLE_OBJC_ARC = YES;
631+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
625632
CLANG_WARN_BOOL_CONVERSION = YES;
633+
CLANG_WARN_COMMA = YES;
626634
CLANG_WARN_CONSTANT_CONVERSION = YES;
627635
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
628636
CLANG_WARN_EMPTY_BODY = YES;
629637
CLANG_WARN_ENUM_CONVERSION = YES;
630638
CLANG_WARN_INFINITE_RECURSION = YES;
631639
CLANG_WARN_INT_CONVERSION = YES;
640+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
641+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
632642
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
643+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
644+
CLANG_WARN_STRICT_PROTOTYPES = YES;
633645
CLANG_WARN_SUSPICIOUS_MOVE = YES;
634646
CLANG_WARN_UNREACHABLE_CODE = YES;
635647
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

Alamofire-SwiftyJSON.xcodeproj/xcshareddata/xcschemes/AlamofireSwiftyJSON.xcscheme

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -40,6 +40,7 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43+
language = ""
4344
shouldUseLaunchSchemeArgsEnv = "YES">
4445
<Testables>
4546
<TestableReference
@@ -69,6 +70,7 @@
6970
buildConfiguration = "Debug"
7071
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7172
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
73+
language = ""
7274
launchStyle = "0"
7375
useCustomWorkingDirectory = "NO"
7476
ignoresPersistentStateOnLaunch = "NO"

0 commit comments

Comments
 (0)