Merge pull request #151 from Vkt0r/xcode-9.3-fix

Fix an issue building the project using Xcode 9.3
ashfurrow · Apr 2, 2018 · b30d72f · b30d72f
2 parents 1683507 + b548d8e
commit b30d72f
Show file tree

Hide file tree

Showing 55 changed files with 776 additions and 786 deletions.
diff --git a/Bootstrap/Bootstrap.xcodeproj/project.pbxproj b/Bootstrap/Bootstrap.xcodeproj/project.pbxproj
@@ -190,7 +190,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0900;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = "Ash Furrow";
 				TargetAttributes = {
 					5EFDC7471F8698B4001453EC = {
@@ -371,13 +371,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -428,13 +430,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

diff --git a/Bootstrap/Bootstrap.xcodeproj/xcshareddata/xcschemes/Bootstrap.xcscheme b/Bootstrap/Bootstrap.xcodeproj/xcshareddata/xcschemes/Bootstrap.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -56,7 +55,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/Bootstrap/Bootstrap.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Bootstrap/Bootstrap.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Bootstrap/Podfile.lock b/Bootstrap/Podfile.lock
@@ -2,16 +2,16 @@ PODS:
   - Forgeries (1.0.0):
     - Forgeries/Core (= 1.0.0)
   - Forgeries/Core (1.0.0)
-  - iOSSnapshotTestCase (2.1.6):
-    - iOSSnapshotTestCase/SwiftSupport (= 2.1.6)
-  - iOSSnapshotTestCase/Core (2.1.6)
-  - iOSSnapshotTestCase/SwiftSupport (2.1.6):
+  - iOSSnapshotTestCase (3.0.0):
+    - iOSSnapshotTestCase/SwiftSupport (= 3.0.0)
+  - iOSSnapshotTestCase/Core (3.0.0)
+  - iOSSnapshotTestCase/SwiftSupport (3.0.0):
     - iOSSnapshotTestCase/Core
-  - Nimble (7.0.2)
-  - Nimble-Snapshots (6.3.0):
-    - Nimble-Snapshots/Core (= 6.3.0)
-  - Nimble-Snapshots/Core (6.3.0):
-    - iOSSnapshotTestCase (~> 2.0)
+  - Nimble (7.0.3)
+  - Nimble-Snapshots (6.4.1):
+    - Nimble-Snapshots/Core (= 6.4.1)
+  - Nimble-Snapshots/Core (6.4.1):
+    - iOSSnapshotTestCase (~> 3.0)
     - Nimble (~> 7.0)
   - Quick (1.2.0)
 
@@ -28,11 +28,11 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Forgeries: 64ced144ea8341d89a7eec9d1d7986f0f1366250
-  iOSSnapshotTestCase: 2521fad04d227097d92a13e1b2670b43e224fca5
-  Nimble: bfe1f814edabba69ff145cb1283e04ed636a67f2
-  Nimble-Snapshots: 6aba6290a774ac81ff893ba40e58a3e95b990d2f
+  iOSSnapshotTestCase: 23984ffe05289728d646cbb6a7a10b4fb1c93440
+  Nimble: 7f5a9c447a33002645a071bddafbfb24ea70e0ac
+  Nimble-Snapshots: 8cf19a97e968db8edb667810ae39b86659e9a8f9
   Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
 
 PODFILE CHECKSUM: a21fa9cbc4320cb85daebb9489495aa1a63dcf64
 
-COCOAPODS: 1.4.0.rc.1
+COCOAPODS: 1.3.1
diff --git a/Bootstrap/Pods/Local Podspecs/Nimble-Snapshots.podspec.json b/Bootstrap/Pods/Local Podspecs/Nimble-Snapshots.podspec.json
diff --git a/Bootstrap/Pods/Manifest.lock b/Bootstrap/Pods/Manifest.lock
diff --git a/...CwlCatchException/CwlCatchException.swift → ...CwlCatchException/CwlCatchException.swift b/...CwlCatchException/CwlCatchException.swift → ...CwlCatchException/CwlCatchException.swift
diff --git a/...CatchExceptionSupport/CwlCatchException.m → ...CatchExceptionSupport/CwlCatchException.m b/...CatchExceptionSupport/CwlCatchException.m → ...CatchExceptionSupport/CwlCatchException.m
diff --git a/...eptionSupport/include/CwlCatchException.h → ...eptionSupport/include/CwlCatchException.h b/...eptionSupport/include/CwlCatchException.h → ...eptionSupport/include/CwlCatchException.h
diff --git a/...ionHandler/CwlMachBadInstructionHandler.m → ...ionHandler/CwlMachBadInstructionHandler.m b/...ionHandler/CwlMachBadInstructionHandler.m → ...ionHandler/CwlMachBadInstructionHandler.m
diff --git a/...er/include/CwlMachBadInstructionHandler.h → ...er/include/CwlMachBadInstructionHandler.h b/...er/include/CwlMachBadInstructionHandler.h → ...er/include/CwlMachBadInstructionHandler.h
diff --git a/...achBadInstructionHandler/mach_excServer.c → ...achBadInstructionHandler/mach_excServer.c b/...achBadInstructionHandler/mach_excServer.c → ...achBadInstructionHandler/mach_excServer.c
diff --git a/...achBadInstructionHandler/mach_excServer.h → ...achBadInstructionHandler/mach_excServer.h b/...achBadInstructionHandler/mach_excServer.h → ...achBadInstructionHandler/mach_excServer.h
diff --git a/...nTesting/CwlBadInstructionException.swift → ...nTesting/CwlBadInstructionException.swift b/...nTesting/CwlBadInstructionException.swift → ...nTesting/CwlBadInstructionException.swift
diff --git a/...itionTesting/CwlCatchBadInstruction.swift → ...itionTesting/CwlCatchBadInstruction.swift b/...itionTesting/CwlCatchBadInstruction.swift → ...itionTesting/CwlCatchBadInstruction.swift
diff --git a/...nditionTesting/CwlDarwinDefinitions.swift → ...nditionTesting/CwlDarwinDefinitions.swift b/...nditionTesting/CwlDarwinDefinitions.swift → ...nditionTesting/CwlDarwinDefinitions.swift
diff --git a/...tionTesting/Mach/CwlPreconditionTesting.h → ...tionTesting/Mach/CwlPreconditionTesting.h b/...tionTesting/Mach/CwlPreconditionTesting.h → ...tionTesting/Mach/CwlPreconditionTesting.h
diff --git a/Bootstrap/Pods/Nimble/Sources/Nimble/Matchers/BeLessThanOrEqual.swift b/Bootstrap/Pods/Nimble/Sources/Nimble/Matchers/BeLessThanOrEqual.swift
diff --git a/Bootstrap/Pods/Nimble/Sources/Nimble/Matchers/MatcherProtocols.swift b/Bootstrap/Pods/Nimble/Sources/Nimble/Matchers/MatcherProtocols.swift