Skip to content

Commit de4dcd5

Browse files
usatieusatie
authored
Merge pull request #4 from yenom/xcode11-config
Upgrade to Xcode11 config
2 parents c6526b6 + 80c6af0 commit de4dcd5

File tree

2 files changed

+67
-18
lines changed

2 files changed

+67
-18
lines changed

‎Mew.xcodeproj/project.pbxproj

Lines changed: 57 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@
335335
isa = PBXProject;
336336
attributes = {
337337
LastSwiftUpdateCheck = 0940;
338-
LastUpgradeCheck = 9999;
338+
LastUpgradeCheck = 1100;
339339
ORGANIZATIONNAME = Mercari;
340340
TargetAttributes = {
341341
D2568DEB214BCA3B00FCA44A = {
@@ -354,10 +354,9 @@
354354
};
355355
buildConfigurationList = OBJ_2 /* Build configuration list for PBXProject "Mew" */;
356356
compatibilityVersion = "Xcode 3.2";
357-
developmentRegion = English;
357+
developmentRegion = en;
358358
hasScannedForEncodings = 0;
359359
knownRegions = (
360-
English,
361360
en,
362361
Base,
363362
);
@@ -533,7 +532,6 @@
533532
PRODUCT_BUNDLE_IDENTIFIER = com.mercari.ios.MewTestsApp;
534533
PRODUCT_NAME = "$(TARGET_NAME)";
535534
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
536-
SWIFT_VERSION = 5.0;
537535
TARGETED_DEVICE_FAMILY = "1,2";
538536
};
539537
name = Debug;
@@ -589,7 +587,6 @@
589587
MTL_ENABLE_DEBUG_INFO = NO;
590588
PRODUCT_BUNDLE_IDENTIFIER = com.mercari.ios.MewTestsApp;
591589
PRODUCT_NAME = "$(TARGET_NAME)";
592-
SWIFT_VERSION = 5.0;
593590
TARGETED_DEVICE_FAMILY = "1,2";
594591
VALIDATE_PRODUCT = YES;
595592
};
@@ -615,7 +612,6 @@
615612
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
616613
SKIP_INSTALL = YES;
617614
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
618-
SWIFT_VERSION = 5.0;
619615
TARGET_NAME = Mew;
620616
};
621617
name = Debug;
@@ -639,21 +635,47 @@
639635
PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)";
640636
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
641637
SKIP_INSTALL = YES;
642-
SWIFT_VERSION = 5.0;
643638
TARGET_NAME = Mew;
644639
};
645640
name = Release;
646641
};
647642
OBJ_3 /* Debug */ = {
648643
isa = XCBuildConfiguration;
649644
buildSettings = {
645+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
650646
CLANG_ENABLE_OBJC_ARC = YES;
647+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
648+
CLANG_WARN_BOOL_CONVERSION = YES;
649+
CLANG_WARN_COMMA = YES;
650+
CLANG_WARN_CONSTANT_CONVERSION = YES;
651+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
652+
CLANG_WARN_EMPTY_BODY = YES;
653+
CLANG_WARN_ENUM_CONVERSION = YES;
654+
CLANG_WARN_INFINITE_RECURSION = YES;
655+
CLANG_WARN_INT_CONVERSION = YES;
656+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
657+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
658+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
659+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
660+
CLANG_WARN_STRICT_PROTOTYPES = YES;
661+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
662+
CLANG_WARN_UNREACHABLE_CODE = YES;
663+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
651664
COMBINE_HIDPI_IMAGES = YES;
652665
COPY_PHASE_STRIP = NO;
653666
DEBUG_INFORMATION_FORMAT = dwarf;
654667
DYLIB_INSTALL_NAME_BASE = "@rpath";
655668
ENABLE_NS_ASSERTIONS = YES;
669+
ENABLE_STRICT_OBJC_MSGSEND = YES;
670+
ENABLE_TESTABILITY = YES;
671+
GCC_NO_COMMON_BLOCKS = YES;
656672
GCC_OPTIMIZATION_LEVEL = 0;
673+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
674+
GCC_WARN_ABOUT_RETURN_TYPE = YES;
675+
GCC_WARN_UNDECLARED_SELECTOR = YES;
676+
GCC_WARN_UNINITIALIZED_AUTOS = YES;
677+
GCC_WARN_UNUSED_FUNCTION = YES;
678+
GCC_WARN_UNUSED_VARIABLE = YES;
657679
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
658680
MACOSX_DEPLOYMENT_TARGET = 10.10;
659681
ONLY_ACTIVE_ARCH = YES;
@@ -663,7 +685,7 @@
663685
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
664686
SWIFT_ACTIVE_COMPILATION_CONDITIONS = SWIFT_PACKAGE;
665687
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
666-
SWIFT_VERSION = 4.2;
688+
SWIFT_VERSION = 5.0;
667689
USE_HEADERMAP = NO;
668690
};
669691
name = Debug;
@@ -672,7 +694,6 @@
672694
isa = XCBuildConfiguration;
673695
buildSettings = {
674696
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
675-
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
676697
FRAMEWORK_SEARCH_PATHS = (
677698
"$(inherited)",
678699
"$(PLATFORM_DIR)/Developer/Library/Frameworks",
@@ -682,7 +703,6 @@
682703
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @loader_path/../Frameworks @loader_path/Frameworks";
683704
OTHER_LDFLAGS = "$(inherited)";
684705
OTHER_SWIFT_FLAGS = "$(inherited)";
685-
SWIFT_VERSION = 5.0;
686706
TARGET_NAME = MewTests;
687707
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MewTestsApp.app/MewTestsApp";
688708
};
@@ -692,7 +712,6 @@
692712
isa = XCBuildConfiguration;
693713
buildSettings = {
694714
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
695-
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
696715
FRAMEWORK_SEARCH_PATHS = (
697716
"$(inherited)",
698717
"$(PLATFORM_DIR)/Developer/Library/Frameworks",
@@ -702,7 +721,6 @@
702721
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @loader_path/../Frameworks @loader_path/Frameworks";
703722
OTHER_LDFLAGS = "$(inherited)";
704723
OTHER_SWIFT_FLAGS = "$(inherited)";
705-
SWIFT_VERSION = 5.0;
706724
TARGET_NAME = MewTests;
707725
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MewTestsApp.app/MewTestsApp";
708726
};
@@ -711,12 +729,38 @@
711729
OBJ_4 /* Release */ = {
712730
isa = XCBuildConfiguration;
713731
buildSettings = {
732+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
714733
CLANG_ENABLE_OBJC_ARC = YES;
734+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
735+
CLANG_WARN_BOOL_CONVERSION = YES;
736+
CLANG_WARN_COMMA = YES;
737+
CLANG_WARN_CONSTANT_CONVERSION = YES;
738+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
739+
CLANG_WARN_EMPTY_BODY = YES;
740+
CLANG_WARN_ENUM_CONVERSION = YES;
741+
CLANG_WARN_INFINITE_RECURSION = YES;
742+
CLANG_WARN_INT_CONVERSION = YES;
743+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
744+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
745+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
746+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
747+
CLANG_WARN_STRICT_PROTOTYPES = YES;
748+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
749+
CLANG_WARN_UNREACHABLE_CODE = YES;
750+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
715751
COMBINE_HIDPI_IMAGES = YES;
716752
COPY_PHASE_STRIP = YES;
717753
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
718754
DYLIB_INSTALL_NAME_BASE = "@rpath";
755+
ENABLE_STRICT_OBJC_MSGSEND = YES;
756+
GCC_NO_COMMON_BLOCKS = YES;
719757
GCC_OPTIMIZATION_LEVEL = s;
758+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
759+
GCC_WARN_ABOUT_RETURN_TYPE = YES;
760+
GCC_WARN_UNDECLARED_SELECTOR = YES;
761+
GCC_WARN_UNINITIALIZED_AUTOS = YES;
762+
GCC_WARN_UNUSED_FUNCTION = YES;
763+
GCC_WARN_UNUSED_VARIABLE = YES;
720764
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
721765
MACOSX_DEPLOYMENT_TARGET = 10.10;
722766
OTHER_SWIFT_FLAGS = "-DXcode";
@@ -725,7 +769,7 @@
725769
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
726770
SWIFT_ACTIVE_COMPILATION_CONDITIONS = SWIFT_PACKAGE;
727771
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
728-
SWIFT_VERSION = 4.2;
772+
SWIFT_VERSION = 5.0;
729773
USE_HEADERMAP = NO;
730774
};
731775
name = Release;

‎Mew.xcodeproj/xcshareddata/xcschemes/Mew.xcscheme

Lines changed: 10 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 = "9999"
3+
LastUpgradeVersion = "1100"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -39,8 +39,6 @@
3939
</BuildableReference>
4040
</TestableReference>
4141
</Testables>
42-
<AdditionalOptions>
43-
</AdditionalOptions>
4442
</TestAction>
4543
<LaunchAction
4644
buildConfiguration = "Debug"
@@ -61,15 +59,22 @@
6159
ReferencedContainer = "container:Mew.xcodeproj">
6260
</BuildableReference>
6361
</MacroExpansion>
64-
<AdditionalOptions>
65-
</AdditionalOptions>
6662
</LaunchAction>
6763
<ProfileAction
6864
buildConfiguration = "Release"
6965
shouldUseLaunchSchemeArgsEnv = "YES"
7066
savedToolIdentifier = ""
7167
useCustomWorkingDirectory = "NO"
7268
debugDocumentVersioning = "YES">
69+
<MacroExpansion>
70+
<BuildableReference
71+
BuildableIdentifier = "primary"
72+
BlueprintIdentifier = "Mew::Mew"
73+
BuildableName = "Mew.framework"
74+
BlueprintName = "Mew"
75+
ReferencedContainer = "container:Mew.xcodeproj">
76+
</BuildableReference>
77+
</MacroExpansion>
7378
</ProfileAction>
7479
<AnalyzeAction
7580
buildConfiguration = "Debug">

0 commit comments

Comments
 (0)