Merge pull request #835 from arangato/feature/xcode12-recommended

Apply Xcode 12 recommended settings
Quick · Oct 16, 2020 · 3258c23 · 3258c23
2 parents aab14e2 + 923ad86
commit 3258c23
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/Nimble.xcodeproj/project.pbxproj b/Nimble.xcodeproj/project.pbxproj
@@ -1208,7 +1208,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = "Jeff Hui";
 				TargetAttributes = {
 					1F1A74281940169200FFFC47 = {
@@ -1838,6 +1838,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -1908,6 +1909,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;

diff --git a/Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-iOS.xcscheme b/Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1200"
    version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-macOS.xcscheme b/Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1200"
    version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-tvOS.xcscheme b/Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Sources/Nimble/Nimble.h b/Sources/Nimble/Nimble.h
@@ -1,11 +1,11 @@
 #import <Foundation/Foundation.h>
-#import "NMBExceptionCapture.h"
-#import "NMBStringify.h"
-#import "DSL.h"
+#import <Nimble/NMBExceptionCapture.h>
+#import <Nimble/NMBStringify.h>
+#import <Nimble/DSL.h>
 
 #if TARGET_OS_OSX || TARGET_OS_IOS
-    #import "CwlMachBadInstructionHandler.h"
-    #import "CwlCatchException.h"
+    #import <Nimble/CwlMachBadInstructionHandler.h>
+    #import <Nimble/CwlCatchException.h>
 #endif
 
 FOUNDATION_EXPORT double NimbleVersionNumber;