First cut at pruning things/updating things.

Remove a bunch of code that Google stopped using/maintaining rather than trying
to update it it. Some would be hard to update, some actually has system provided
replacements; others are patterns that just don't seem as common now.

Prune out the code related to macOS <= 10.5, start pruning some of the really
old iOS support also.

Get the projects mostly limping again with modern Xcodes so tests can be run.

If someone ends up on this commit via history for something they still find
as useful, feel free to do a pull request to bring the snippet of code back to
life and update it for current SDKs.

15 files changed, 2 insertions, 579 deletions

diff --git a/XcodeConfig/Project/DebugiPhone30.xcconfig b/XcodeConfig/Project/DebugiPhone30.xcconfig
deleted file mode 100644
index 9f4d015..0000000
--- a/XcodeConfig/Project/DebugiPhone30.xcconfig
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-//  DebugiPhone30.xcconfig
-//
-//  Xcode configuration file for building a Debug configuration of a project
-//  for iPhone OS 3.0.
-//
-//  Copyright 2009 Google Inc.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-//  use this file except in compliance with the License.  You may obtain a copy
-//  of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-//  License for the specific language governing permissions and limitations under
-//  the License.
-
-//
-//  This is a _Configuration_ Xcode config file for use in the "Based on" popup
-//  of the project configuration editor. Do _not_ use this as the config base
-//  and individual Xcode target, there are other configuration files for that
-//  purpose.
-
-// This file will be going away, please migrate off it.  Instead Apple wants
-// you to use the "current" SDK, use DebugiOS.xcconfig and set your min
-// supported iOS version in your project file.
-
-// Pull in the general settings
-#include "../subconfig/General.xcconfig"
-
-// iPhone settings.
-#include "../subconfig/iPhone30.xcconfig"
-
-// Debug settings
-#include "../subconfig/Debug.xcconfig"
-
-// Merge settings
-#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/Project/DebugiPhone31.xcconfig b/XcodeConfig/Project/DebugiPhone31.xcconfig
deleted file mode 100644
index 99a1f9d..0000000
--- a/XcodeConfig/Project/DebugiPhone31.xcconfig
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-//  DebugiPhone31.xcconfig
-//
-//  Xcode configuration file for building a Debug configuration of a project
-//  for iPhone OS 3.1.
-//
-//  Copyright 2009 Google Inc.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-//  use this file except in compliance with the License.  You may obtain a copy
-//  of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-//  License for the specific language governing permissions and limitations under
-//  the License.
-
-//
-//  This is a _Configuration_ Xcode config file for use in the "Based on" popup
-//  of the project configuration editor. Do _not_ use this as the config base
-//  and individual Xcode target, there are other configuration files for that
-//  purpose.
-
-// This file will be going away, please migrate off it.  Instead Apple wants
-// you to use the "current" SDK, use DebugiOS.xcconfig and set your min
-// supported iOS version in your project file.
-
-// Pull in the general settings
-#include "../subconfig/General.xcconfig"
-
-// iPhone settings.
-#include "../subconfig/iPhone31.xcconfig"
-
-// Debug settings
-#include "../subconfig/Debug.xcconfig"
-
-// Merge settings
-#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/Project/DebugiPhone312.xcconfig b/XcodeConfig/Project/DebugiPhone312.xcconfig
deleted file mode 100644
index 04e4db5..0000000
--- a/XcodeConfig/Project/DebugiPhone312.xcconfig
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-//  DebugiPhone312.xcconfig
-//
-//  Xcode configuration file for building a Debug configuration of a project
-//  for iPhone OS 3.1.2.
-//
-//  Copyright 2009 Google Inc.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-//  use this file except in compliance with the License.  You may obtain a copy
-//  of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-//  License for the specific language governing permissions and limitations under
-//  the License.
-
-//
-//  This is a _Configuration_ Xcode config file for use in the "Based on" popup
-//  of the project configuration editor. Do _not_ use this as the config base
-//  and individual Xcode target, there are other configuration files for that
-//  purpose.
-
-// This file will be going away, please migrate off it.  Instead Apple wants
-// you to use the "current" SDK, use DebugiOS.xcconfig and set your min
-// supported iOS version in your project file.
-
-// Pull in the general settings
-#include "../subconfig/General.xcconfig"
-
-// iPhone settings.
-#include "../subconfig/iPhone312.xcconfig"
-
-// Debug settings
-#include "../subconfig/Debug.xcconfig"
-
-// Merge settings
-#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/Project/DebugiPhone313.xcconfig b/XcodeConfig/Project/DebugiPhone313.xcconfig
deleted file mode 100644
index aa41387..0000000
--- a/XcodeConfig/Project/DebugiPhone313.xcconfig
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-//  DebugiPhone313.xcconfig
-//
-//  Xcode configuration file for building a Debug configuration of a project
-//  for iPhone OS 3.1.3.
-//
-//  Copyright 2010 Google Inc.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-//  use this file except in compliance with the License.  You may obtain a copy
-//  of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-//  License for the specific language governing permissions and limitations under
-//  the License.
-
-//
-//  This is a _Configuration_ Xcode config file for use in the "Based on" popup
-//  of the project configuration editor. Do _not_ use this as the config base
-//  and individual Xcode target, there are other configuration files for that
-//  purpose.
-
-// This file will be going away, please migrate off it.  Instead Apple wants
-// you to use the "current" SDK, use DebugiOS.xcconfig and set your min
-// supported iOS version in your project file.
-
-// Pull in the general settings
-#include "../subconfig/General.xcconfig"
-
-// iPhone settings.
-#include "../subconfig/iPhone313.xcconfig"
-
-// Debug settings
-#include "../subconfig/Debug.xcconfig"
-
-// Merge settings
-#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/Project/DebugiPhone32.xcconfig b/XcodeConfig/Project/DebugiPhone32.xcconfig
deleted file mode 100644
index 7fea13e..0000000
--- a/XcodeConfig/Project/DebugiPhone32.xcconfig
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-//  DebugiPhone32.xcconfig
-//
-//  Xcode configuration file for building a Debug configuration of a project
-//  for iPhone OS 3.2.
-//
-//  Copyright 2010 Google Inc.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-//  use this file except in compliance with the License.  You may obtain a copy
-//  of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-//  License for the specific language governing permissions and limitations under
-//  the License.
-
-//
-//  This is a _Configuration_ Xcode config file for use in the "Based on" popup
-//  of the project configuration editor. Do _not_ use this as the config base
-//  and individual Xcode target, there are other configuration files for that
-//  purpose.
-
-// This file will be going away, please migrate off it.  Instead Apple wants
-// you to use the "current" SDK, use DebugiOS.xcconfig and set your min
-// supported iOS version in your project file.
-
-// Pull in the general settings
-#include "../subconfig/General.xcconfig"
-
-// iPhone settings.
-#include "../subconfig/iPhone32.xcconfig"
-
-// Debug settings
-#include "../subconfig/Debug.xcconfig"
-
-// Merge settings
-#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/Project/DebugiPhone40.xcconfig b/XcodeConfig/Project/DebugiPhone40.xcconfig
deleted file mode 100644
index bad8987..0000000
--- a/XcodeConfig/Project/DebugiPhone40.xcconfig
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-//  DebugiPhone40.xcconfig
-//
-//  Xcode configuration file for building a Debug configuration of a project
-//  for iOS 4.0.
-//
-//  Copyright 2010 Google Inc.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-//  use this file except in compliance with the License.  You may obtain a copy
-//  of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-//  License for the specific language governing permissions and limitations under
-//  the License.
-
-//
-//  This is a _Configuration_ Xcode config file for use in the "Based on" popup
-//  of the project configuration editor. Do _not_ use this as the config base
-//  and individual Xcode target, there are other configuration files for that
-//  purpose.
-
-// This file will be going away, please migrate off it.  Instead Apple wants
-// you to use the "current" SDK, use DebugiOS.xcconfig and set your min
-// supported iOS version in your project file.
-
-// Pull in the general settings
-#include "../subconfig/General.xcconfig"
-
-// iPhone settings.
-#include "../subconfig/iPhone40.xcconfig"
-
-// Debug settings
-#include "../subconfig/Debug.xcconfig"
-
-// Merge settings
-#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/Project/DebugiPhone41.xcconfig b/XcodeConfig/Project/DebugiPhone41.xcconfig
deleted file mode 100644
index ee0eb92..0000000
--- a/XcodeConfig/Project/DebugiPhone41.xcconfig
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-//  DebugiPhone41.xcconfig
-//
-//  Xcode configuration file for building a Debug configuration of a project
-//  for iOS 4.1.
-//
-//  Copyright 2010 Google Inc.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-//  use this file except in compliance with the License.  You may obtain a copy
-//  of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-//  License for the specific language governing permissions and limitations under
-//  the License.
-
-//
-//  This is a _Configuration_ Xcode config file for use in the "Based on" popup
-//  of the project configuration editor. Do _not_ use this as the config base
-//  and individual Xcode target, there are other configuration files for that
-//  purpose.
-
-// This file will be going away, please migrate off it.  Instead Apple wants
-// you to use the "current" SDK, use DebugiOS.xcconfig and set your min
-// supported iOS version in your project file.
-
-// Pull in the general settings
-#include "../subconfig/General.xcconfig"
-
-// iPhone settings.
-#include "../subconfig/iPhone41.xcconfig"
-
-// Debug settings
-#include "../subconfig/Debug.xcconfig"
-
-// Merge settings
-#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/Project/ReleaseiPhone30.xcconfig b/XcodeConfig/Project/ReleaseiPhone30.xcconfig
deleted file mode 100644
index 63bdf4c..0000000
--- a/XcodeConfig/Project/ReleaseiPhone30.xcconfig
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-//  ReleaseiPhone30.xcconfig
-//
-//  Xcode configuration file for building a Release configuration of a project
-//  for iPhone OS 3.0.
-//
-//  Copyright 2009 Google Inc.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-//  use this file except in compliance with the License.  You may obtain a copy
-//  of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-//  License for the specific language governing permissions and limitations under
-//  the License.
-
-//
-//  This is a _Configuration_ Xcode config file for use in the "Based on" popup
-//  of the project configuration editor. Do _not_ use this as the config base
-//  and individual Xcode target, there are other configuration files for that
-//  purpose.
-
-// This file will be going away, please migrate off it.  Instead Apple wants
-// you to use the "current" SDK, use ReleaseiOS.xcconfig and set your min
-// supported iOS version in your project file.
-
-// Pull in the general settings
-#include "../subconfig/General.xcconfig"
-
-// iPhone settings.
-#include "../subconfig/iPhone30.xcconfig"
-
-// Release settings
-#include "../subconfig/Release.xcconfig"
-
-// Merge settings
-#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/Project/ReleaseiPhone31.xcconfig b/XcodeConfig/Project/ReleaseiPhone31.xcconfig
deleted file mode 100644
index 8a5a19c..0000000
--- a/XcodeConfig/Project/ReleaseiPhone31.xcconfig
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-//  ReleaseiPhone31.xcconfig
-//
-//  Xcode configuration file for building a Release configuration of a project
-//  for iPhone OS 3.1.
-//
-//  Copyright 2009 Google Inc.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-//  use this file except in compliance with the License.  You may obtain a copy
-//  of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-//  License for the specific language governing permissions and limitations under
-//  the License.
-
-//
-//  This is a _Configuration_ Xcode config file for use in the "Based on" popup
-//  of the project configuration editor. Do _not_ use this as the config base
-//  and individual Xcode target, there are other configuration files for that
-//  purpose.
-
-// This file will be going away, please migrate off it.  Instead Apple wants
-// you to use the "current" SDK, use ReleaseiOS.xcconfig and set your min
-// supported iOS version in your project file.
-
-// Pull in the general settings
-#include "../subconfig/General.xcconfig"
-
-// iPhone settings.
-#include "../subconfig/iPhone31.xcconfig"
-
-// Release settings
-#include "../subconfig/Release.xcconfig"
-
-// Merge settings
-#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/Project/ReleaseiPhone312.xcconfig b/XcodeConfig/Project/ReleaseiPhone312.xcconfig
deleted file mode 100644
index 65c42b1..0000000
--- a/XcodeConfig/Project/ReleaseiPhone312.xcconfig
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-//  ReleaseiPhone312.xcconfig
-//
-//  Xcode configuration file for building a Release configuration of a project
-//  for iPhone OS 3.1.2.
-//
-//  Copyright 2009 Google Inc.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-//  use this file except in compliance with the License.  You may obtain a copy
-//  of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-//  License for the specific language governing permissions and limitations under
-//  the License.
-
-//
-//  This is a _Configuration_ Xcode config file for use in the "Based on" popup
-//  of the project configuration editor. Do _not_ use this as the config base
-//  and individual Xcode target, there are other configuration files for that
-//  purpose.
-
-// This file will be going away, please migrate off it.  Instead Apple wants
-// you to use the "current" SDK, use ReleaseiOS.xcconfig and set your min
-// supported iOS version in your project file.
-
-// Pull in the general settings
-#include "../subconfig/General.xcconfig"
-
-// iPhone settings.
-#include "../subconfig/iPhone312.xcconfig"
-
-// Release settings
-#include "../subconfig/Release.xcconfig"
-
-// Merge settings
-#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/Project/ReleaseiPhone313.xcconfig b/XcodeConfig/Project/ReleaseiPhone313.xcconfig
deleted file mode 100644
index 65de50a..0000000
--- a/XcodeConfig/Project/ReleaseiPhone313.xcconfig
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-//  ReleaseiPhone313.xcconfig
-//
-//  Xcode configuration file for building a Release configuration of a project
-//  for iPhone OS 3.1.3.
-//
-//  Copyright 2010 Google Inc.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-//  use this file except in compliance with the License.  You may obtain a copy
-//  of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-//  License for the specific language governing permissions and limitations under
-//  the License.
-
-//
-//  This is a _Configuration_ Xcode config file for use in the "Based on" popup
-//  of the project configuration editor. Do _not_ use this as the config base
-//  and individual Xcode target, there are other configuration files for that
-//  purpose.
-
-// This file will be going away, please migrate off it.  Instead Apple wants
-// you to use the "current" SDK, use ReleaseiOS.xcconfig and set your min
-// supported iOS version in your project file.
-
-// Pull in the general settings
-#include "../subconfig/General.xcconfig"
-
-// iPhone settings.
-#include "../subconfig/iPhone313.xcconfig"
-
-// Release settings
-#include "../subconfig/Release.xcconfig"
-
-// Merge settings
-#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/Project/ReleaseiPhone32.xcconfig b/XcodeConfig/Project/ReleaseiPhone32.xcconfig
deleted file mode 100644
index 411a9a2..0000000
--- a/XcodeConfig/Project/ReleaseiPhone32.xcconfig
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-//  ReleaseiPhone32.xcconfig
-//
-//  Xcode configuration file for building a Release configuration of a project
-//  for iPhone OS 3.2.
-//
-//  Copyright 2010 Google Inc.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-//  use this file except in compliance with the License.  You may obtain a copy
-//  of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-//  License for the specific language governing permissions and limitations under
-//  the License.
-
-//
-//  This is a _Configuration_ Xcode config file for use in the "Based on" popup
-//  of the project configuration editor. Do _not_ use this as the config base
-//  and individual Xcode target, there are other configuration files for that
-//  purpose.
-
-// This file will be going away, please migrate off it.  Instead Apple wants
-// you to use the "current" SDK, use ReleaseiOS.xcconfig and set your min
-// supported iOS version in your project file.
-
-// Pull in the general settings
-#include "../subconfig/General.xcconfig"
-
-// iPhone settings.
-#include "../subconfig/iPhone32.xcconfig"
-
-// Release settings
-#include "../subconfig/Release.xcconfig"
-
-// Merge settings
-#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/Project/ReleaseiPhone40.xcconfig b/XcodeConfig/Project/ReleaseiPhone40.xcconfig
deleted file mode 100644
index 2887fbb..0000000
--- a/XcodeConfig/Project/ReleaseiPhone40.xcconfig
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-//  ReleaseiPhone40.xcconfig
-//
-//  Xcode configuration file for building a Release configuration of a project
-//  for iOS 4.0.
-//
-//  Copyright 2010 Google Inc.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-//  use this file except in compliance with the License.  You may obtain a copy
-//  of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-//  License for the specific language governing permissions and limitations under
-//  the License.
-
-//
-//  This is a _Configuration_ Xcode config file for use in the "Based on" popup
-//  of the project configuration editor. Do _not_ use this as the config base
-//  and individual Xcode target, there are other configuration files for that
-//  purpose.
-
-// This file will be going away, please migrate off it.  Instead Apple wants
-// you to use the "current" SDK, use ReleaseiOS.xcconfig and set your min
-// supported iOS version in your project file.
-
-// Pull in the general settings
-#include "../subconfig/General.xcconfig"
-
-// iPhone settings.
-#include "../subconfig/iPhone40.xcconfig"
-
-// Release settings
-#include "../subconfig/Release.xcconfig"
-
-// Merge settings
-#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/Project/ReleaseiPhone41.xcconfig b/XcodeConfig/Project/ReleaseiPhone41.xcconfig
deleted file mode 100644
index f3965b5..0000000
--- a/XcodeConfig/Project/ReleaseiPhone41.xcconfig
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-//  ReleaseiPhone41.xcconfig
-//
-//  Xcode configuration file for building a Release configuration of a project
-//  for iOS 4.1.
-//
-//  Copyright 2010 Google Inc.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-//  use this file except in compliance with the License.  You may obtain a copy
-//  of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-//  License for the specific language governing permissions and limitations under
-//  the License.
-
-//
-//  This is a _Configuration_ Xcode config file for use in the "Based on" popup
-//  of the project configuration editor. Do _not_ use this as the config base
-//  and individual Xcode target, there are other configuration files for that
-//  purpose.
-
-// This file will be going away, please migrate off it.  Instead Apple wants
-// you to use the "current" SDK, use ReleaseiOS.xcconfig and set your min
-// supported iOS version in your project file.
-
-// Pull in the general settings
-#include "../subconfig/General.xcconfig"
-
-// iPhone settings.
-#include "../subconfig/iPhone41.xcconfig"
-
-// Release settings
-#include "../subconfig/Release.xcconfig"
-
-// Merge settings
-#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/subconfig/Unittest.xcconfig b/XcodeConfig/subconfig/Unittest.xcconfig
index 96121ee..596c8db 100644
--- a/XcodeConfig/subconfig/Unittest.xcconfig
+++ b/XcodeConfig/subconfig/Unittest.xcconfig
@@ -9,9 +9,9 @@
 //  Licensed under the Apache License, Version 2.0 (the "License"); you may not
 //  use this file except in compliance with the License.  You may obtain a copy
 //  of the License at
-// 
+//
 //  http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 //  Unless required by applicable law or agreed to in writing, software
 //  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 //  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
@@ -28,6 +28,3 @@ GCC_C_LANGUAGE_STANDARD = gnu99
 // Deploment postprocessing is what triggers Xcode to strip, we don't strip
 // unittests
 DEPLOYMENT_POSTPROCESSING = NO
-
-// Most common unittests will be objective-c
-WRAPPER_EXTENSION = octest