Fixed for iOS test controller proxy and Xcode 9, fixed crashed issue when controller went into the background

7 files changed, 31 insertions, 5 deletions

diff --git a/cpp/test/ios/controller/C++ Test Controller.xcodeproj/project.pbxproj b/cpp/test/ios/controller/C++ Test Controller.xcodeproj/project.pbxproj
index 481c1fe7d80..dee30b7a42a 100644
--- a/cpp/test/ios/controller/C++ Test Controller.xcodeproj/project.pbxproj
+++ b/cpp/test/ios/controller/C++ Test Controller.xcodeproj/project.pbxproj
@@ -338,7 +338,7 @@
 		14905C491DF98FD8002AE61B /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0820;
+				LastUpgradeCheck = 0920;
 				ORGANIZATIONNAME = "ZeroC, Inc.";
 				TargetAttributes = {
 					1440D86B1E0186FF00CF7ED3 = {
@@ -655,7 +655,9 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
@@ -663,7 +665,11 @@
 				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_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -699,7 +705,9 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
@@ -707,7 +715,11 @@
 				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_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
diff --git a/cpp/test/ios/controller/C++ Test Controller.xcodeproj/xcshareddata/xcschemes/C++11 Test Controller.xcscheme b/cpp/test/ios/controller/C++ Test Controller.xcodeproj/xcshareddata/xcschemes/C++11 Test Controller.xcscheme
index ac70bec4ac2..1101825833f 100644
--- a/cpp/test/ios/controller/C++ Test Controller.xcodeproj/xcshareddata/xcschemes/C++11 Test Controller.xcscheme
+++ b/cpp/test/ios/controller/C++ Test Controller.xcodeproj/xcshareddata/xcschemes/C++11 Test Controller.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0920"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -45,6 +46,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/cpp/test/ios/controller/C++ Test Controller.xcodeproj/xcshareddata/xcschemes/C++98 Test Controller.xcscheme b/cpp/test/ios/controller/C++ Test Controller.xcodeproj/xcshareddata/xcschemes/C++98 Test Controller.xcscheme
index 8f0e6376bcb..d15adf6c6c3 100644
--- a/cpp/test/ios/controller/C++ Test Controller.xcodeproj/xcshareddata/xcschemes/C++98 Test Controller.xcscheme
+++ b/cpp/test/ios/controller/C++ Test Controller.xcodeproj/xcshareddata/xcschemes/C++98 Test Controller.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0920"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -45,6 +46,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/cpp/test/ios/controller/C++ Test Controller.xcodeproj/xcshareddata/xcschemes/Cpp11ControllerBundle.xcscheme b/cpp/test/ios/controller/C++ Test Controller.xcodeproj/xcshareddata/xcschemes/Cpp11ControllerBundle.xcscheme
index bf9787c8d80..7b44b7a8ad5 100644
--- a/cpp/test/ios/controller/C++ Test Controller.xcodeproj/xcshareddata/xcschemes/Cpp11ControllerBundle.xcscheme
+++ b/cpp/test/ios/controller/C++ Test Controller.xcodeproj/xcshareddata/xcschemes/Cpp11ControllerBundle.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0920"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -36,6 +37,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/cpp/test/ios/controller/C++ Test Controller.xcodeproj/xcshareddata/xcschemes/Cpp98ControllerBundle.xcscheme b/cpp/test/ios/controller/C++ Test Controller.xcodeproj/xcshareddata/xcschemes/Cpp98ControllerBundle.xcscheme
index 19c78a9a608..b27640be4fd 100644
--- a/cpp/test/ios/controller/C++ Test Controller.xcodeproj/xcshareddata/xcschemes/Cpp98ControllerBundle.xcscheme
+++ b/cpp/test/ios/controller/C++ Test Controller.xcodeproj/xcshareddata/xcschemes/Cpp98ControllerBundle.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0920"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -36,6 +37,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/cpp/test/ios/controller/Classes/Assets.xcassets/AppIcon.appiconset/Contents.json b/cpp/test/ios/controller/Classes/Assets.xcassets/AppIcon.appiconset/Contents.json
index d4e114a8919..86a429b461b 100644
--- a/cpp/test/ios/controller/Classes/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/cpp/test/ios/controller/Classes/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -101,6 +101,12 @@
       "idiom" : "ipad",
       "filename" : "test_suite-Small-83,5@2x-1.png",
       "scale" : "2x"
+    },
+    {
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "test_suite-AppStore.png",
+      "scale" : "1x"
     }
   ],
   "info" : {
diff --git a/cpp/test/ios/controller/Classes/Assets.xcassets/AppIcon.appiconset/test_suite-AppStore.png b/cpp/test/ios/controller/Classes/Assets.xcassets/AppIcon.appiconset/test_suite-AppStore.png
new file mode 100644
index 00000000000..978407a98c4
--- /dev/null
+++ b/cpp/test/ios/controller/Classes/Assets.xcassets/AppIcon.appiconset/test_suite-AppStore.png