Skip to content

Commit e051129

Browse files
committed
Update project settings
1 parent 1563468 commit e051129

7 files changed

Lines changed: 29 additions & 29 deletions

File tree

Example/Example.xcodeproj/project.pbxproj

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,19 +124,19 @@
124124
isa = PBXProject;
125125
attributes = {
126126
LastSwiftUpdateCheck = 0700;
127-
LastUpgradeCheck = 0930;
127+
LastUpgradeCheck = 1020;
128128
ORGANIZATIONNAME = swiftyjson;
129129
TargetAttributes = {
130130
A82A1C1819D926B8009A653D = {
131131
CreatedOnToolsVersion = 6.0.1;
132-
LastSwiftMigration = 0930;
132+
LastSwiftMigration = 1020;
133133
ProvisioningStyle = Manual;
134134
};
135135
};
136136
};
137137
buildConfigurationList = A82A1C1419D926B8009A653D /* Build configuration list for PBXProject "Example" */;
138138
compatibilityVersion = "Xcode 3.2";
139-
developmentRegion = English;
139+
developmentRegion = en;
140140
hasScannedForEncodings = 0;
141141
knownRegions = (
142142
en,
@@ -313,8 +313,7 @@
313313
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
314314
PRODUCT_BUNDLE_IDENTIFIER = "com.swiftyjson.$(PRODUCT_NAME:rfc1034identifier)";
315315
PRODUCT_NAME = "$(TARGET_NAME)";
316-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
317-
SWIFT_VERSION = 4.0;
316+
SWIFT_VERSION = 5.0;
318317
};
319318
name = Debug;
320319
};
@@ -329,8 +328,7 @@
329328
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
330329
PRODUCT_BUNDLE_IDENTIFIER = "com.swiftyjson.$(PRODUCT_NAME:rfc1034identifier)";
331330
PRODUCT_NAME = "$(TARGET_NAME)";
332-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
333-
SWIFT_VERSION = 4.0;
331+
SWIFT_VERSION = 5.0;
334332
};
335333
name = Release;
336334
};

Example/Example/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
2828

2929
var window: UIWindow?
3030

31-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
31+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
3232

3333
let navigationController = self.window?.rootViewController as! UINavigationController
3434
let viewController = navigationController.topViewController as! ViewController

SwiftyJSON.xcodeproj/project.pbxproj

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@
457457
isa = PBXProject;
458458
attributes = {
459459
LastSwiftUpdateCheck = 0710;
460-
LastUpgradeCheck = 0930;
460+
LastUpgradeCheck = 1020;
461461
TargetAttributes = {
462462
2E4FEFDA19575BE100351305 = {
463463
CreatedOnToolsVersion = 6.0;
@@ -499,11 +499,11 @@
499499
};
500500
buildConfigurationList = 2E4FEFD519575BE100351305 /* Build configuration list for PBXProject "SwiftyJSON" */;
501501
compatibilityVersion = "Xcode 3.2";
502-
developmentRegion = English;
502+
developmentRegion = en;
503503
hasScannedForEncodings = 0;
504504
knownRegions = (
505-
English,
506505
en,
506+
Base,
507507
);
508508
mainGroup = 2E4FEFD119575BE100351305;
509509
productRefGroup = 2E4FEFDC19575BE100351305 /* Products */;
@@ -723,6 +723,7 @@
723723
isa = XCBuildConfiguration;
724724
buildSettings = {
725725
ALWAYS_SEARCH_USER_PATHS = NO;
726+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
726727
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
727728
CLANG_CXX_LIBRARY = "libc++";
728729
CLANG_ENABLE_MODULES = YES;
@@ -783,6 +784,7 @@
783784
isa = XCBuildConfiguration;
784785
buildSettings = {
785786
ALWAYS_SEARCH_USER_PATHS = NO;
787+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
786788
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
787789
CLANG_CXX_LIBRARY = "libc++";
788790
CLANG_ENABLE_MODULES = YES;
@@ -854,7 +856,7 @@
854856
SKIP_INSTALL = YES;
855857
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
856858
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
857-
SWIFT_VERSION = 4.0;
859+
SWIFT_VERSION = 5.0;
858860
};
859861
name = Debug;
860862
};
@@ -878,7 +880,7 @@
878880
PRODUCT_NAME = SwiftyJSON;
879881
SKIP_INSTALL = YES;
880882
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
881-
SWIFT_VERSION = 4.0;
883+
SWIFT_VERSION = 5.0;
882884
};
883885
name = Release;
884886
};
@@ -900,7 +902,7 @@
900902
PRODUCT_NAME = "$(TARGET_NAME)";
901903
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
902904
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
903-
SWIFT_VERSION = 4.0;
905+
SWIFT_VERSION = 5.0;
904906
};
905907
name = Debug;
906908
};
@@ -917,7 +919,7 @@
917919
PRODUCT_BUNDLE_IDENTIFIER = "com.swiftyjson.${PRODUCT_NAME:rfc1034identifier}";
918920
PRODUCT_NAME = "$(TARGET_NAME)";
919921
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
920-
SWIFT_VERSION = 4.0;
922+
SWIFT_VERSION = 5.0;
921923
};
922924
name = Release;
923925
};
@@ -942,7 +944,7 @@
942944
SDKROOT = appletvos;
943945
SKIP_INSTALL = YES;
944946
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
945-
SWIFT_VERSION = 4.2;
947+
SWIFT_VERSION = 5.0;
946948
TARGETED_DEVICE_FAMILY = 3;
947949
TVOS_DEPLOYMENT_TARGET = 9.0;
948950
};
@@ -968,7 +970,7 @@
968970
PRODUCT_NAME = SwiftyJSON;
969971
SDKROOT = appletvos;
970972
SKIP_INSTALL = YES;
971-
SWIFT_VERSION = 4.2;
973+
SWIFT_VERSION = 5.0;
972974
TARGETED_DEVICE_FAMILY = 3;
973975
TVOS_DEPLOYMENT_TARGET = 9.0;
974976
};
@@ -1001,7 +1003,7 @@
10011003
SDKROOT = macosx;
10021004
SKIP_INSTALL = YES;
10031005
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1004-
SWIFT_VERSION = 4.2;
1006+
SWIFT_VERSION = 5.0;
10051007
};
10061008
name = Debug;
10071009
};
@@ -1028,7 +1030,7 @@
10281030
PRODUCT_NAME = "$(PROJECT_NAME)";
10291031
SDKROOT = macosx;
10301032
SKIP_INSTALL = YES;
1031-
SWIFT_VERSION = 4.2;
1033+
SWIFT_VERSION = 5.0;
10321034
};
10331035
name = Release;
10341036
};
@@ -1051,7 +1053,7 @@
10511053
PRODUCT_NAME = "$(TARGET_NAME)";
10521054
SDKROOT = macosx;
10531055
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1054-
SWIFT_VERSION = 4.2;
1056+
SWIFT_VERSION = 5.0;
10551057
};
10561058
name = Debug;
10571059
};
@@ -1070,7 +1072,7 @@
10701072
PRODUCT_BUNDLE_IDENTIFIER = "com.swiftyjson.$(PRODUCT_NAME:rfc1034identifier)";
10711073
PRODUCT_NAME = "$(TARGET_NAME)";
10721074
SDKROOT = macosx;
1073-
SWIFT_VERSION = 4.2;
1075+
SWIFT_VERSION = 5.0;
10741076
};
10751077
name = Release;
10761078
};
@@ -1104,7 +1106,7 @@
11041106
PRODUCT_NAME = "$(TARGET_NAME)";
11051107
SDKROOT = appletvos;
11061108
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1107-
SWIFT_VERSION = 4.2;
1109+
SWIFT_VERSION = 5.0;
11081110
TVOS_DEPLOYMENT_TARGET = 9.0;
11091111
};
11101112
name = Debug;
@@ -1123,7 +1125,7 @@
11231125
PRODUCT_BUNDLE_IDENTIFIER = "com.tangplin.SwiftyJSON-tvOS-Tests";
11241126
PRODUCT_NAME = "$(TARGET_NAME)";
11251127
SDKROOT = appletvos;
1126-
SWIFT_VERSION = 4.2;
1128+
SWIFT_VERSION = 5.0;
11271129
TVOS_DEPLOYMENT_TARGET = 9.0;
11281130
};
11291131
name = Release;
@@ -1150,7 +1152,7 @@
11501152
SKIP_INSTALL = YES;
11511153
SUPPORTED_PLATFORMS = "watchsimulator watchos";
11521154
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1153-
SWIFT_VERSION = 4.2;
1155+
SWIFT_VERSION = 5.0;
11541156
TARGETED_DEVICE_FAMILY = 4;
11551157
WATCHOS_DEPLOYMENT_TARGET = 3.0;
11561158
};
@@ -1177,7 +1179,7 @@
11771179
SDKROOT = watchos;
11781180
SKIP_INSTALL = YES;
11791181
SUPPORTED_PLATFORMS = "watchsimulator watchos";
1180-
SWIFT_VERSION = 4.2;
1182+
SWIFT_VERSION = 5.0;
11811183
TARGETED_DEVICE_FAMILY = 4;
11821184
WATCHOS_DEPLOYMENT_TARGET = 3.0;
11831185
};

SwiftyJSON.xcodeproj/xcshareddata/xcschemes/SwiftyJSON iOS.xcscheme

Lines changed: 1 addition & 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 = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

SwiftyJSON.xcodeproj/xcshareddata/xcschemes/SwiftyJSON macOS.xcscheme

Lines changed: 1 addition & 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 = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

SwiftyJSON.xcodeproj/xcshareddata/xcschemes/SwiftyJSON tvOS.xcscheme

Lines changed: 1 addition & 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 = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

SwiftyJSON.xcodeproj/xcshareddata/xcschemes/SwiftyJSON watchOS.xcscheme

Lines changed: 1 addition & 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 = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)