Skip to content

Commit 28797dd

Browse files
committed
Xcode9 build
1 parent dabe833 commit 28797dd

File tree

2 files changed

+29
-8
lines changed

2 files changed

+29
-8
lines changed

StudyplusSDK.xcodeproj/project.pbxproj

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -318,16 +318,17 @@
318318
isa = PBXProject;
319319
attributes = {
320320
LastSwiftUpdateCheck = 0820;
321-
LastUpgradeCheck = 0830;
321+
LastUpgradeCheck = 0900;
322322
ORGANIZATIONNAME = studyplus;
323323
TargetAttributes = {
324324
183FDA661E7510920085589F = {
325325
CreatedOnToolsVersion = 8.2.1;
326-
LastSwiftMigration = 0820;
326+
LastSwiftMigration = 0900;
327327
ProvisioningStyle = Automatic;
328328
};
329329
183FDA6F1E7510920085589F = {
330330
CreatedOnToolsVersion = 8.2.1;
331+
LastSwiftMigration = 0900;
331332
ProvisioningStyle = Automatic;
332333
};
333334
183FDA841E7510F00085589F = {
@@ -538,15 +539,21 @@
538539
CLANG_CXX_LIBRARY = "libc++";
539540
CLANG_ENABLE_MODULES = YES;
540541
CLANG_ENABLE_OBJC_ARC = YES;
542+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
541543
CLANG_WARN_BOOL_CONVERSION = YES;
544+
CLANG_WARN_COMMA = YES;
542545
CLANG_WARN_CONSTANT_CONVERSION = YES;
543546
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
544547
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
545548
CLANG_WARN_EMPTY_BODY = YES;
546549
CLANG_WARN_ENUM_CONVERSION = YES;
547550
CLANG_WARN_INFINITE_RECURSION = YES;
548551
CLANG_WARN_INT_CONVERSION = YES;
552+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
553+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
549554
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
555+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
556+
CLANG_WARN_STRICT_PROTOTYPES = YES;
550557
CLANG_WARN_SUSPICIOUS_MOVE = YES;
551558
CLANG_WARN_UNREACHABLE_CODE = YES;
552559
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -577,6 +584,7 @@
577584
SDKROOT = iphoneos;
578585
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
579586
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
587+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
580588
TARGETED_DEVICE_FAMILY = "1,2";
581589
VERSIONING_SYSTEM = "apple-generic";
582590
VERSION_INFO_PREFIX = "";
@@ -592,15 +600,21 @@
592600
CLANG_CXX_LIBRARY = "libc++";
593601
CLANG_ENABLE_MODULES = YES;
594602
CLANG_ENABLE_OBJC_ARC = YES;
603+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
595604
CLANG_WARN_BOOL_CONVERSION = YES;
605+
CLANG_WARN_COMMA = YES;
596606
CLANG_WARN_CONSTANT_CONVERSION = YES;
597607
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
598608
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
599609
CLANG_WARN_EMPTY_BODY = YES;
600610
CLANG_WARN_ENUM_CONVERSION = YES;
601611
CLANG_WARN_INFINITE_RECURSION = YES;
602612
CLANG_WARN_INT_CONVERSION = YES;
613+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
614+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
603615
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
616+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
617+
CLANG_WARN_STRICT_PROTOTYPES = YES;
604618
CLANG_WARN_SUSPICIOUS_MOVE = YES;
605619
CLANG_WARN_UNREACHABLE_CODE = YES;
606620
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -623,6 +637,7 @@
623637
OTHER_SWIFT_FLAGS = "-D RELEASE";
624638
SDKROOT = iphoneos;
625639
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
640+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
626641
TARGETED_DEVICE_FAMILY = "1,2";
627642
VALIDATE_PRODUCT = YES;
628643
VERSIONING_SYSTEM = "apple-generic";
@@ -635,7 +650,7 @@
635650
buildSettings = {
636651
CLANG_ENABLE_MODULES = YES;
637652
CODE_SIGN_IDENTITY = "";
638-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
653+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
639654
DEFINES_MODULE = YES;
640655
DEVELOPMENT_TEAM = "";
641656
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -653,7 +668,8 @@
653668
PRODUCT_NAME = "$(TARGET_NAME)";
654669
SKIP_INSTALL = YES;
655670
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
656-
SWIFT_VERSION = 3.0;
671+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
672+
SWIFT_VERSION = 4.0;
657673
};
658674
name = Debug;
659675
};
@@ -678,7 +694,8 @@
678694
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.StudyplusSDK;
679695
PRODUCT_NAME = "$(TARGET_NAME)";
680696
SKIP_INSTALL = YES;
681-
SWIFT_VERSION = 3.0;
697+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
698+
SWIFT_VERSION = 4.0;
682699
};
683700
name = Release;
684701
};
@@ -690,7 +707,8 @@
690707
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
691708
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.StudyplusSDKTests;
692709
PRODUCT_NAME = "$(TARGET_NAME)";
693-
SWIFT_VERSION = 3.0;
710+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
711+
SWIFT_VERSION = 4.0;
694712
};
695713
name = Debug;
696714
};
@@ -702,7 +720,8 @@
702720
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
703721
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.StudyplusSDKTests;
704722
PRODUCT_NAME = "$(TARGET_NAME)";
705-
SWIFT_VERSION = 3.0;
723+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
724+
SWIFT_VERSION = 4.0;
706725
};
707726
name = Release;
708727
};

StudyplusSDK.xcodeproj/xcshareddata/xcschemes/StudyplusSDK.xcscheme

Lines changed: 3 additions & 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 = "0830"
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)