Merge branch 'master' into xcode10

erikdoe · Oct 11, 2019 · f1873ab · f1873ab
2 parents daf7948 + bc9056f
commit f1873ab
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Source/OCMock.xcodeproj/xcshareddata/xcschemes/OCMock iOS.xcscheme b/Source/OCMock.xcodeproj/xcshareddata/xcschemes/OCMock iOS.xcscheme
@@ -40,8 +40,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      codeCoverageEnabled = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"

diff --git a/Source/OCMock/OCMock.h b/Source/OCMock/OCMock.h
@@ -108,6 +108,7 @@
     _Pragma("clang diagnostic push") \
     _Pragma("clang diagnostic ignored \"-Wunused-value\"") \
     _Pragma("clang diagnostic ignored \"-Wunused-getter-return-value\"") \
+    _Pragma("clang diagnostic ignored \"-Wstrict-selector-match\"") \
     macro \
     _Pragma("clang diagnostic pop") \
 })