From 30e1276f063f45d4605d6dd3d52e0adcc051cdbf Mon Sep 17 00:00:00 2001
From: Martin Jonasson <grapefrukt@grapefrukt.com>
Date: Thu, 5 Nov 2015 12:35:27 +0100
Subject: [PATCH] Several changes to the XCode project template to fix warnings

Adds flags for testability, only to build active architecture, and bakes the app package name into the project file. All this to fix the warnings generated by XCode.
This also drops the flags for architecture completely as there is only one valid variation for tvOS and not setting it gives the default.
---
 templates/tvos/PROJ.xcodeproj/project.pbxproj | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/templates/tvos/PROJ.xcodeproj/project.pbxproj b/templates/tvos/PROJ.xcodeproj/project.pbxproj
index bf8762d52..c1ac1f3c5 100644
--- a/templates/tvos/PROJ.xcodeproj/project.pbxproj
+++ b/templates/tvos/PROJ.xcodeproj/project.pbxproj
@@ -242,7 +242,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = ::CURRENT_ARCHS::;
 				::if (OBJC_ARC)::
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -250,6 +249,7 @@
 				::end::
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "::KEY_STORE_IDENTITY::";
 				COPY_PHASE_STRIP = NO;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -262,10 +262,10 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = ::DEPLOYMENT::;
+				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = appletvos;
 				TARGETED_DEVICE_FAMILY = "::TARGET_DEVICES::";
 				::THUMB_SUPPORT::
-				VALID_ARCHS = "::VALID_ARCHS::";
 			};
 			name = Debug;
 		};
@@ -273,7 +273,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = ::CURRENT_ARCHS::;
 				::if (OBJC_ARC)::
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -293,7 +292,6 @@
 				SDKROOT = appletvos;
 				TARGETED_DEVICE_FAMILY = "::TARGET_DEVICES::";
 				::THUMB_SUPPORT::
-				VALID_ARCHS = "::VALID_ARCHS::";
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -346,6 +344,7 @@
 					::foreach IOS_LINKER_FLAGS:: "::__current__::",
 					::end::
 				);
+				PRODUCT_BUNDLE_IDENTIFIER = "::APP_PACKAGE::";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
@@ -394,6 +393,7 @@
 					::foreach IOS_LINKER_FLAGS:: "::__current__::",
 					::end::
 				);
+				PRODUCT_BUNDLE_IDENTIFIER = "::APP_PACKAGE::";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
@@ -408,6 +408,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				::end::
 				COPY_PHASE_STRIP = NO;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;