Skip to content

Commit 8c0a2e7

Browse files
authored
Merge pull request #12 from yahoojapan/swift4
Swift4 support
2 parents 717181c + 1f901c9 commit 8c0a2e7

File tree

2 files changed

+28
-8
lines changed

2 files changed

+28
-8
lines changed

SwiftyXMLParser.xcodeproj/project.pbxproj

+25-7
Original file line numberDiff line numberDiff line change
@@ -187,16 +187,16 @@
187187
isa = PBXProject;
188188
attributes = {
189189
LastSwiftUpdateCheck = 0720;
190-
LastUpgradeCheck = 0800;
190+
LastUpgradeCheck = 0900;
191191
ORGANIZATIONNAME = "Yahoo! Japan";
192192
TargetAttributes = {
193193
2B6D92321C7F0587000D2D06 = {
194194
CreatedOnToolsVersion = 7.2.1;
195-
LastSwiftMigration = 0800;
195+
LastSwiftMigration = 0900;
196196
};
197197
2B6D923C1C7F0587000D2D06 = {
198198
CreatedOnToolsVersion = 7.2.1;
199-
LastSwiftMigration = 0800;
199+
LastSwiftMigration = 0900;
200200
};
201201
};
202202
};
@@ -282,14 +282,20 @@
282282
CLANG_CXX_LIBRARY = "libc++";
283283
CLANG_ENABLE_MODULES = YES;
284284
CLANG_ENABLE_OBJC_ARC = YES;
285+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
285286
CLANG_WARN_BOOL_CONVERSION = YES;
287+
CLANG_WARN_COMMA = YES;
286288
CLANG_WARN_CONSTANT_CONVERSION = YES;
287289
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
288290
CLANG_WARN_EMPTY_BODY = YES;
289291
CLANG_WARN_ENUM_CONVERSION = YES;
290292
CLANG_WARN_INFINITE_RECURSION = YES;
291293
CLANG_WARN_INT_CONVERSION = YES;
294+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
295+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
292296
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
297+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
298+
CLANG_WARN_STRICT_PROTOTYPES = YES;
293299
CLANG_WARN_SUSPICIOUS_MOVE = YES;
294300
CLANG_WARN_UNREACHABLE_CODE = YES;
295301
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -318,6 +324,7 @@
318324
ONLY_ACTIVE_ARCH = YES;
319325
SDKROOT = iphoneos;
320326
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
327+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
321328
TARGETED_DEVICE_FAMILY = "1,2";
322329
VERSIONING_SYSTEM = "apple-generic";
323330
VERSION_INFO_PREFIX = "";
@@ -332,14 +339,20 @@
332339
CLANG_CXX_LIBRARY = "libc++";
333340
CLANG_ENABLE_MODULES = YES;
334341
CLANG_ENABLE_OBJC_ARC = YES;
342+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
335343
CLANG_WARN_BOOL_CONVERSION = YES;
344+
CLANG_WARN_COMMA = YES;
336345
CLANG_WARN_CONSTANT_CONVERSION = YES;
337346
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
338347
CLANG_WARN_EMPTY_BODY = YES;
339348
CLANG_WARN_ENUM_CONVERSION = YES;
340349
CLANG_WARN_INFINITE_RECURSION = YES;
341350
CLANG_WARN_INT_CONVERSION = YES;
351+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
352+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
342353
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
354+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
355+
CLANG_WARN_STRICT_PROTOTYPES = YES;
343356
CLANG_WARN_SUSPICIOUS_MOVE = YES;
344357
CLANG_WARN_UNREACHABLE_CODE = YES;
345358
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -361,6 +374,7 @@
361374
MTL_ENABLE_DEBUG_INFO = NO;
362375
SDKROOT = iphoneos;
363376
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
377+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
364378
TARGETED_DEVICE_FAMILY = "1,2";
365379
VALIDATE_PRODUCT = YES;
366380
VERSIONING_SYSTEM = "apple-generic";
@@ -384,7 +398,8 @@
384398
PRODUCT_NAME = "$(TARGET_NAME)";
385399
SKIP_INSTALL = YES;
386400
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
387-
SWIFT_VERSION = 3.0;
401+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
402+
SWIFT_VERSION = 4.0;
388403
};
389404
name = Debug;
390405
};
@@ -403,7 +418,8 @@
403418
PRODUCT_BUNDLE_IDENTIFIER = jp.co.yahoo.shopping.SwiftyXMLParser;
404419
PRODUCT_NAME = "$(TARGET_NAME)";
405420
SKIP_INSTALL = YES;
406-
SWIFT_VERSION = 3.0;
421+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
422+
SWIFT_VERSION = 4.0;
407423
};
408424
name = Release;
409425
};
@@ -414,7 +430,8 @@
414430
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
415431
PRODUCT_BUNDLE_IDENTIFIER = jp.co.yahoo.shopping.SwiftyXMLParserTests;
416432
PRODUCT_NAME = "$(TARGET_NAME)";
417-
SWIFT_VERSION = 3.0;
433+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
434+
SWIFT_VERSION = 4.0;
418435
};
419436
name = Debug;
420437
};
@@ -425,7 +442,8 @@
425442
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
426443
PRODUCT_BUNDLE_IDENTIFIER = jp.co.yahoo.shopping.SwiftyXMLParserTests;
427444
PRODUCT_NAME = "$(TARGET_NAME)";
428-
SWIFT_VERSION = 3.0;
445+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
446+
SWIFT_VERSION = 4.0;
429447
};
430448
name = Release;
431449
};

SwiftyXMLParser.xcodeproj/xcshareddata/xcschemes/SwiftyXMLParser.xcscheme

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0800"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
<TestableReference
@@ -55,6 +56,7 @@
5556
buildConfiguration = "Debug"
5657
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5758
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59+
language = ""
5860
launchStyle = "0"
5961
useCustomWorkingDirectory = "NO"
6062
ignoresPersistentStateOnLaunch = "NO"

0 commit comments

Comments
 (0)