Skip to content

Commit f936cbb

Browse files
wongzigiiwongzigii
committed
Update Project settings to recommend settings
1 parent 77af21c commit f936cbb

4 files changed

Lines changed: 98 additions & 15 deletions

File tree

‎Alamofire-SwiftyJSON.xcodeproj/project.pbxproj‎

Lines changed: 88 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,34 @@
6060
remoteGlobalIDString = E4D7CCE81B9465A700EE7221;
6161
remoteInfo = "SwiftyJSON watchOS";
6262
};
63+
A81D16431E59E90500C62C5F /* PBXContainerItemProxy */ = {
64+
isa = PBXContainerItemProxy;
65+
containerPortal = A8AFB75419D14A5C0070765E /* Alamofire.xcodeproj */;
66+
proxyType = 2;
67+
remoteGlobalIDString = 4CF626EF1BA7CB3E0011A099;
68+
remoteInfo = "Alamofire tvOS";
69+
};
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 */ = {
78+
isa = PBXContainerItemProxy;
79+
containerPortal = A8AFB75D19D14A670070765E /* SwiftyJSON.xcodeproj */;
80+
proxyType = 2;
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";
90+
};
6391
A8A2DBB61A23290100AF9EFC /* PBXContainerItemProxy */ = {
6492
isa = PBXContainerItemProxy;
6593
containerPortal = A8AFB75419D14A5C0070765E /* Alamofire.xcodeproj */;
@@ -242,10 +270,12 @@
242270
isa = PBXGroup;
243271
children = (
244272
A8AFB75A19D14A5C0070765E /* Alamofire.framework */,
273+
A8AFB75C19D14A5C0070765E /* Alamofire iOS Tests.xctest */,
245274
4BC5E9FA1BB7E15600A393DD /* Alamofire.framework */,
275+
4BC5E9FE1BB7E15600A393DD /* Alamofire macOS Tests.xctest */,
276+
A81D16441E59E90500C62C5F /* Alamofire.framework */,
277+
A81D16461E59E90500C62C5F /* Alamofire tvOS Tests.xctest */,
246278
4BC5E9FC1BB7E15600A393DD /* Alamofire.framework */,
247-
A8AFB75C19D14A5C0070765E /* AlamofireTests.xctest */,
248-
4BC5E9FE1BB7E15600A393DD /* Alamofire OSX Tests.xctest */,
249279
);
250280
name = Products;
251281
sourceTree = "<group>";
@@ -254,10 +284,12 @@
254284
isa = PBXGroup;
255285
children = (
256286
A8AFB76519D14A670070765E /* SwiftyJSON.framework */,
257-
A8AFB76719D14A670070765E /* SwiftyJSONTests.xctest */,
287+
A8AFB76719D14A670070765E /* SwiftyJSON iOS Tests.xctest */,
258288
4BC5EA041BB7E15600A393DD /* SwiftyJSON.framework */,
259289
4BC5EA061BB7E15600A393DD /* SwiftyJSON OSX Tests.xctest */,
260290
4BC5EA081BB7E15600A393DD /* SwiftyJSON.framework */,
291+
A81D164E1E59E90500C62C5F /* SwiftyJSON.framework */,
292+
A81D16501E59E90500C62C5F /* SwiftyJSON tvOS Tests.xctest */,
261293
);
262294
name = Products;
263295
sourceTree = "<group>";
@@ -325,14 +357,16 @@
325357
isa = PBXProject;
326358
attributes = {
327359
LastSwiftUpdateCheck = 0700;
328-
LastUpgradeCheck = 0600;
360+
LastUpgradeCheck = 0820;
329361
ORGANIZATIONNAME = SwiftJSON;
330362
TargetAttributes = {
331363
A8AFB70E19D1401D0070765E = {
332364
CreatedOnToolsVersion = 6.0.1;
365+
LastSwiftMigration = 0820;
333366
};
334367
A8AFB71919D1401D0070765E = {
335368
CreatedOnToolsVersion = 6.0.1;
369+
LastSwiftMigration = 0820;
336370
};
337371
};
338372
};
@@ -379,10 +413,10 @@
379413
remoteRef = 4BC5E9FB1BB7E15600A393DD /* PBXContainerItemProxy */;
380414
sourceTree = BUILT_PRODUCTS_DIR;
381415
};
382-
4BC5E9FE1BB7E15600A393DD /* Alamofire OSX Tests.xctest */ = {
416+
4BC5E9FE1BB7E15600A393DD /* Alamofire macOS Tests.xctest */ = {
383417
isa = PBXReferenceProxy;
384418
fileType = wrapper.cfbundle;
385-
path = "Alamofire OSX Tests.xctest";
419+
path = "Alamofire macOS Tests.xctest";
386420
remoteRef = 4BC5E9FD1BB7E15600A393DD /* PBXContainerItemProxy */;
387421
sourceTree = BUILT_PRODUCTS_DIR;
388422
};
@@ -407,14 +441,42 @@
407441
remoteRef = 4BC5EA071BB7E15600A393DD /* PBXContainerItemProxy */;
408442
sourceTree = BUILT_PRODUCTS_DIR;
409443
};
444+
A81D16441E59E90500C62C5F /* Alamofire.framework */ = {
445+
isa = PBXReferenceProxy;
446+
fileType = wrapper.framework;
447+
path = Alamofire.framework;
448+
remoteRef = A81D16431E59E90500C62C5F /* PBXContainerItemProxy */;
449+
sourceTree = BUILT_PRODUCTS_DIR;
450+
};
451+
A81D16461E59E90500C62C5F /* Alamofire tvOS Tests.xctest */ = {
452+
isa = PBXReferenceProxy;
453+
fileType = wrapper.cfbundle;
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 */;
470+
sourceTree = BUILT_PRODUCTS_DIR;
471+
};
410472
A8AFB75A19D14A5C0070765E /* Alamofire.framework */ = {
411473
isa = PBXReferenceProxy;
412474
fileType = wrapper.framework;
413475
path = Alamofire.framework;
414476
remoteRef = A8AFB75919D14A5C0070765E /* PBXContainerItemProxy */;
415477
sourceTree = BUILT_PRODUCTS_DIR;
416478
};
417-
A8AFB75C19D14A5C0070765E /* AlamofireTests.xctest */ = {
479+
A8AFB75C19D14A5C0070765E /* Alamofire iOS Tests.xctest */ = {
418480
isa = PBXReferenceProxy;
419481
fileType = wrapper.cfbundle;
420482
path = "Alamofire iOS Tests.xctest";
@@ -428,7 +490,7 @@
428490
remoteRef = A8AFB76419D14A670070765E /* PBXContainerItemProxy */;
429491
sourceTree = BUILT_PRODUCTS_DIR;
430492
};
431-
A8AFB76719D14A670070765E /* SwiftyJSONTests.xctest */ = {
493+
A8AFB76719D14A670070765E /* SwiftyJSON iOS Tests.xctest */ = {
432494
isa = PBXReferenceProxy;
433495
fileType = wrapper.cfbundle;
434496
path = "SwiftyJSON iOS Tests.xctest";
@@ -515,16 +577,20 @@
515577
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
516578
CLANG_WARN_EMPTY_BODY = YES;
517579
CLANG_WARN_ENUM_CONVERSION = YES;
580+
CLANG_WARN_INFINITE_RECURSION = YES;
518581
CLANG_WARN_INT_CONVERSION = YES;
519582
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
583+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
520584
CLANG_WARN_UNREACHABLE_CODE = YES;
521585
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
522586
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
523587
COPY_PHASE_STRIP = NO;
524588
CURRENT_PROJECT_VERSION = 1;
525589
ENABLE_STRICT_OBJC_MSGSEND = YES;
590+
ENABLE_TESTABILITY = YES;
526591
GCC_C_LANGUAGE_STANDARD = gnu99;
527592
GCC_DYNAMIC_NO_PIC = NO;
593+
GCC_NO_COMMON_BLOCKS = YES;
528594
GCC_OPTIMIZATION_LEVEL = 0;
529595
GCC_PREPROCESSOR_DEFINITIONS = (
530596
"DEBUG=1",
@@ -561,8 +627,10 @@
561627
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
562628
CLANG_WARN_EMPTY_BODY = YES;
563629
CLANG_WARN_ENUM_CONVERSION = YES;
630+
CLANG_WARN_INFINITE_RECURSION = YES;
564631
CLANG_WARN_INT_CONVERSION = YES;
565632
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
633+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
566634
CLANG_WARN_UNREACHABLE_CODE = YES;
567635
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
568636
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -571,6 +639,7 @@
571639
ENABLE_NS_ASSERTIONS = NO;
572640
ENABLE_STRICT_OBJC_MSGSEND = YES;
573641
GCC_C_LANGUAGE_STANDARD = gnu99;
642+
GCC_NO_COMMON_BLOCKS = YES;
574643
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
575644
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
576645
GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -580,6 +649,7 @@
580649
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
581650
MTL_ENABLE_DEBUG_INFO = NO;
582651
SDKROOT = iphoneos;
652+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
583653
TARGETED_DEVICE_FAMILY = "1,2";
584654
VALIDATE_PRODUCT = YES;
585655
VERSIONING_SYSTEM = "apple-generic";
@@ -590,30 +660,36 @@
590660
A8AFB72319D1401D0070765E /* Debug */ = {
591661
isa = XCBuildConfiguration;
592662
buildSettings = {
663+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
593664
DEFINES_MODULE = YES;
594665
DYLIB_COMPATIBILITY_VERSION = 1;
595666
DYLIB_CURRENT_VERSION = 1;
596667
DYLIB_INSTALL_NAME_BASE = "@rpath";
597668
INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
598669
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
599670
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
671+
PRODUCT_BUNDLE_IDENTIFIER = "com.swiftjson.$(PRODUCT_NAME:rfc1034identifier)";
600672
PRODUCT_NAME = "$(TARGET_NAME)";
601673
SKIP_INSTALL = YES;
674+
SWIFT_VERSION = 3.0;
602675
};
603676
name = Debug;
604677
};
605678
A8AFB72419D1401D0070765E /* Release */ = {
606679
isa = XCBuildConfiguration;
607680
buildSettings = {
681+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
608682
DEFINES_MODULE = YES;
609683
DYLIB_COMPATIBILITY_VERSION = 1;
610684
DYLIB_CURRENT_VERSION = 1;
611685
DYLIB_INSTALL_NAME_BASE = "@rpath";
612686
INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
613687
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
614688
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
689+
PRODUCT_BUNDLE_IDENTIFIER = "com.swiftjson.$(PRODUCT_NAME:rfc1034identifier)";
615690
PRODUCT_NAME = "$(TARGET_NAME)";
616691
SKIP_INSTALL = YES;
692+
SWIFT_VERSION = 3.0;
617693
};
618694
name = Release;
619695
};
@@ -630,7 +706,9 @@
630706
);
631707
INFOPLIST_FILE = Tests/Info.plist;
632708
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
709+
PRODUCT_BUNDLE_IDENTIFIER = "com.swiftjson.$(PRODUCT_NAME:rfc1034identifier)";
633710
PRODUCT_NAME = "$(TARGET_NAME)";
711+
SWIFT_VERSION = 3.0;
634712
};
635713
name = Debug;
636714
};
@@ -643,7 +721,9 @@
643721
);
644722
INFOPLIST_FILE = Tests/Info.plist;
645723
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
724+
PRODUCT_BUNDLE_IDENTIFIER = "com.swiftjson.$(PRODUCT_NAME:rfc1034identifier)";
646725
PRODUCT_NAME = "$(TARGET_NAME)";
726+
SWIFT_VERSION = 3.0;
647727
};
648728
name = Release;
649729
};

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

Lines changed: 8 additions & 5 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 = "0630"
3+
LastUpgradeVersion = "0820"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -37,10 +37,10 @@
3737
</BuildActionEntries>
3838
</BuildAction>
3939
<TestAction
40+
buildConfiguration = "Debug"
4041
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4142
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
42-
shouldUseLaunchSchemeArgsEnv = "YES"
43-
buildConfiguration = "Debug">
43+
shouldUseLaunchSchemeArgsEnv = "YES">
4444
<Testables>
4545
<TestableReference
4646
skipped = "NO">
@@ -62,15 +62,18 @@
6262
ReferencedContainer = "container:Alamofire-SwiftyJSON.xcodeproj">
6363
</BuildableReference>
6464
</MacroExpansion>
65+
<AdditionalOptions>
66+
</AdditionalOptions>
6567
</TestAction>
6668
<LaunchAction
69+
buildConfiguration = "Debug"
6770
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
6871
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
6972
launchStyle = "0"
7073
useCustomWorkingDirectory = "NO"
71-
buildConfiguration = "Debug"
7274
ignoresPersistentStateOnLaunch = "NO"
7375
debugDocumentVersioning = "YES"
76+
debugServiceExtension = "internal"
7477
allowLocationSimulation = "YES">
7578
<MacroExpansion>
7679
<BuildableReference
@@ -85,10 +88,10 @@
8588
</AdditionalOptions>
8689
</LaunchAction>
8790
<ProfileAction
91+
buildConfiguration = "Release"
8892
shouldUseLaunchSchemeArgsEnv = "YES"
8993
savedToolIdentifier = ""
9094
useCustomWorkingDirectory = "NO"
91-
buildConfiguration = "Release"
9295
debugDocumentVersioning = "YES">
9396
<MacroExpansion>
9497
<BuildableReference

‎Source/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>$(EXECUTABLE_NAME)</string>
99
<key>CFBundleIdentifier</key>
10-
<string>com.swiftjson.$(PRODUCT_NAME:rfc1034identifier)</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>

‎Tests/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>$(EXECUTABLE_NAME)</string>
99
<key>CFBundleIdentifier</key>
10-
<string>com.swiftjson.$(PRODUCT_NAME:rfc1034identifier)</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>

0 commit comments

Comments
 (0)