Skip to content

Commit c7fdf7a

Browse files
authored
Merge pull request #39 from yahoojapan/feature/swift5
support swift5
2 parents 9f64c4a + 062a634 commit c7fdf7a

File tree

3 files changed

+20
-14
lines changed

3 files changed

+20
-14
lines changed

SwiftyXMLParser.xcodeproj/project.pbxproj

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@
189189
isa = PBXProject;
190190
attributes = {
191191
LastSwiftUpdateCheck = 0720;
192-
LastUpgradeCheck = 0900;
192+
LastUpgradeCheck = 1020;
193193
ORGANIZATIONNAME = "Yahoo! Japan";
194194
TargetAttributes = {
195195
2B6D92321C7F0587000D2D06 = {
@@ -198,16 +198,17 @@
198198
};
199199
2B6D923C1C7F0587000D2D06 = {
200200
CreatedOnToolsVersion = 7.2.1;
201-
LastSwiftMigration = 0900;
201+
LastSwiftMigration = 1020;
202202
};
203203
};
204204
};
205205
buildConfigurationList = 2B6D922D1C7F0587000D2D06 /* Build configuration list for PBXProject "SwiftyXMLParser" */;
206206
compatibilityVersion = "Xcode 3.2";
207-
developmentRegion = English;
207+
developmentRegion = en;
208208
hasScannedForEncodings = 0;
209209
knownRegions = (
210210
en,
211+
Base,
211212
);
212213
mainGroup = 2B6D92291C7F0587000D2D06;
213214
productRefGroup = 2B6D92341C7F0587000D2D06 /* Products */;
@@ -281,6 +282,7 @@
281282
baseConfigurationReference = 81B640ED1FC77E6400BE1AB5 /* Config.xcconfig */;
282283
buildSettings = {
283284
ALWAYS_SEARCH_USER_PATHS = NO;
285+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
284286
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
285287
CLANG_CXX_LIBRARY = "libc++";
286288
CLANG_ENABLE_MODULES = YES;
@@ -289,12 +291,14 @@
289291
CLANG_WARN_BOOL_CONVERSION = YES;
290292
CLANG_WARN_COMMA = YES;
291293
CLANG_WARN_CONSTANT_CONVERSION = YES;
294+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
292295
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
293296
CLANG_WARN_EMPTY_BODY = YES;
294297
CLANG_WARN_ENUM_CONVERSION = YES;
295298
CLANG_WARN_INFINITE_RECURSION = YES;
296299
CLANG_WARN_INT_CONVERSION = YES;
297300
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
301+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
298302
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
299303
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
300304
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -323,8 +327,10 @@
323327
GCC_WARN_UNUSED_FUNCTION = YES;
324328
GCC_WARN_UNUSED_VARIABLE = YES;
325329
MTL_ENABLE_DEBUG_INFO = YES;
330+
ONLY_ACTIVE_ARCH = YES;
326331
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
327332
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
333+
SWIFT_VERSION = 5.0;
328334
VERSIONING_SYSTEM = "apple-generic";
329335
VERSION_INFO_PREFIX = "";
330336
};
@@ -335,6 +341,7 @@
335341
baseConfigurationReference = 81B640ED1FC77E6400BE1AB5 /* Config.xcconfig */;
336342
buildSettings = {
337343
ALWAYS_SEARCH_USER_PATHS = NO;
344+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
338345
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
339346
CLANG_CXX_LIBRARY = "libc++";
340347
CLANG_ENABLE_MODULES = YES;
@@ -343,12 +350,14 @@
343350
CLANG_WARN_BOOL_CONVERSION = YES;
344351
CLANG_WARN_COMMA = YES;
345352
CLANG_WARN_CONSTANT_CONVERSION = YES;
353+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
346354
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
347355
CLANG_WARN_EMPTY_BODY = YES;
348356
CLANG_WARN_ENUM_CONVERSION = YES;
349357
CLANG_WARN_INFINITE_RECURSION = YES;
350358
CLANG_WARN_INT_CONVERSION = YES;
351359
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
360+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
352361
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
353362
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
354363
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -373,6 +382,7 @@
373382
MTL_ENABLE_DEBUG_INFO = NO;
374383
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
375384
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
385+
SWIFT_VERSION = 5.0;
376386
VALIDATE_PRODUCT = YES;
377387
VERSIONING_SYSTEM = "apple-generic";
378388
VERSION_INFO_PREFIX = "";
@@ -396,7 +406,7 @@
396406
SKIP_INSTALL = YES;
397407
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
398408
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
399-
SWIFT_VERSION = 4.2;
409+
SWIFT_VERSION = 5.0;
400410
};
401411
name = Debug;
402412
};
@@ -416,7 +426,7 @@
416426
PRODUCT_NAME = "$(TARGET_NAME)";
417427
SKIP_INSTALL = YES;
418428
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
419-
SWIFT_VERSION = 4.2;
429+
SWIFT_VERSION = 5.0;
420430
};
421431
name = Release;
422432
};
@@ -427,8 +437,7 @@
427437
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks @executable_path/../Frameworks @loader_path/../Frameworks";
428438
PRODUCT_BUNDLE_IDENTIFIER = jp.co.yahoo.shopping.SwiftyXMLParserTests;
429439
PRODUCT_NAME = "$(TARGET_NAME)";
430-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
431-
SWIFT_VERSION = 4.2;
440+
SWIFT_VERSION = 5.0;
432441
};
433442
name = Debug;
434443
};
@@ -439,8 +448,7 @@
439448
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks @executable_path/../Frameworks @loader_path/../Frameworks";
440449
PRODUCT_BUNDLE_IDENTIFIER = jp.co.yahoo.shopping.SwiftyXMLParserTests;
441450
PRODUCT_NAME = "$(TARGET_NAME)";
442-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
443-
SWIFT_VERSION = 4.2;
451+
SWIFT_VERSION = 5.0;
444452
};
445453
name = Release;
446454
};

SwiftyXMLParser.xcodeproj/xcshareddata/xcschemes/SwiftyXMLParser.xcscheme

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
<TestableReference
@@ -56,7 +55,6 @@
5655
buildConfiguration = "Debug"
5756
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5857
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59-
language = ""
6058
launchStyle = "0"
6159
useCustomWorkingDirectory = "NO"
6260
ignoresPersistentStateOnLaunch = "NO"

iOS Sample/iOS Sample.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@
454454
);
455455
PRODUCT_BUNDLE_IDENTIFIER = "jp.co.yahoo.SwiftyXMLParser.iOS-Sample";
456456
PRODUCT_NAME = "$(TARGET_NAME)";
457-
SWIFT_VERSION = 4.2;
457+
SWIFT_VERSION = 5.0;
458458
TARGETED_DEVICE_FAMILY = "1,2";
459459
};
460460
name = Debug;
@@ -471,7 +471,7 @@
471471
);
472472
PRODUCT_BUNDLE_IDENTIFIER = "jp.co.yahoo.SwiftyXMLParser.iOS-Sample";
473473
PRODUCT_NAME = "$(TARGET_NAME)";
474-
SWIFT_VERSION = 4.2;
474+
SWIFT_VERSION = 5.0;
475475
TARGETED_DEVICE_FAMILY = "1,2";
476476
};
477477
name = Release;

0 commit comments

Comments
 (0)