[Author: thomasvl]

XCConfig Cleanup
- Removed all the 2.x iPhone configs.
- Marked all the version specific configs as going away with time.
- Updated the xcconfig readme for the model Apple now wants.
- Removed all the version specific configs from the iPhone project file.

R=dmaclach
DELTA=2086  (81 added, 2003 deleted, 2 changed)

34 files changed, 115 insertions, 420 deletions

diff --git a/XcodeConfig/Project/DebugiPhone20.xcconfig b/XcodeConfig/Project/DebugiPhone20.xcconfig
deleted file mode 100644
index c459154..0000000
--- a/XcodeConfig/Project/DebugiPhone20.xcconfig
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-//  DebugiPhone20.xcconfig
-//
-//  Xcode configuration file for building a Debug configuration of a project
-//  for iPhone OS 2.0.
-//
-//  Copyright 2008 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.
-
-// Pull in the general settings
-#include "../subconfig/General.xcconfig"
-
-// iPhone settings
-#include "../subconfig/iPhone20.xcconfig"
-
-// Debug settings
-#include "../subconfig/Debug.xcconfig"
-
-// Merge settings
-#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/Project/DebugiPhone21.xcconfig b/XcodeConfig/Project/DebugiPhone21.xcconfig
deleted file mode 100644
index f64ed64..0000000
--- a/XcodeConfig/Project/DebugiPhone21.xcconfig
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-//  DebugiPhone21.xcconfig
-//
-//  Xcode configuration file for building a Debug configuration of a project
-//  for iPhone OS 2.1.
-//
-//  Copyright 2008 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.
-
-// Pull in the general settings
-#include "../subconfig/General.xcconfig"
-
-// iPhone settings
-#include "../subconfig/iPhone21.xcconfig"
-
-// Debug settings
-#include "../subconfig/Debug.xcconfig"
-
-// Merge settings
-#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/Project/DebugiPhone22.xcconfig b/XcodeConfig/Project/DebugiPhone22.xcconfig
deleted file mode 100644
index 7565fc2..0000000
--- a/XcodeConfig/Project/DebugiPhone22.xcconfig
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-//  DebugiPhone22.xcconfig
-//
-//  Xcode configuration file for building a Debug configuration of a project
-//  for iPhone OS 2.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.
-
-// Pull in the general settings
-#include "../subconfig/General.xcconfig"
-
-// iPhone settings.
-#include "../subconfig/iPhone22.xcconfig"
-
-// Debug settings
-#include "../subconfig/Debug.xcconfig"
-
-// Merge settings
-#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/Project/DebugiPhone221.xcconfig b/XcodeConfig/Project/DebugiPhone221.xcconfig
deleted file mode 100644
index bda69d9..0000000
--- a/XcodeConfig/Project/DebugiPhone221.xcconfig
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-//  DebugiPhone221.xcconfig
-//
-//  Xcode configuration file for building a Debug configuration of a project
-//  for iPhone OS 2.2.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.
-
-// Pull in the general settings
-#include "../subconfig/General.xcconfig"
-
-// iPhone settings.
-#include "../subconfig/iPhone221.xcconfig"
-
-// Debug settings
-#include "../subconfig/Debug.xcconfig"
-
-// Merge settings
-#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/Project/DebugiPhone30.xcconfig b/XcodeConfig/Project/DebugiPhone30.xcconfig
index 7341fc4..9f4d015 100644
--- a/XcodeConfig/Project/DebugiPhone30.xcconfig
+++ b/XcodeConfig/Project/DebugiPhone30.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
@@ -24,6 +24,10 @@
 //  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"
 
diff --git a/XcodeConfig/Project/DebugiPhone31.xcconfig b/XcodeConfig/Project/DebugiPhone31.xcconfig
index c94c809..99a1f9d 100644
--- a/XcodeConfig/Project/DebugiPhone31.xcconfig
+++ b/XcodeConfig/Project/DebugiPhone31.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
@@ -24,6 +24,10 @@
 //  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"
 
diff --git a/XcodeConfig/Project/DebugiPhone312.xcconfig b/XcodeConfig/Project/DebugiPhone312.xcconfig
index aae9255..04e4db5 100644
--- a/XcodeConfig/Project/DebugiPhone312.xcconfig
+++ b/XcodeConfig/Project/DebugiPhone312.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
@@ -24,6 +24,10 @@
 //  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"
 
diff --git a/XcodeConfig/Project/DebugiPhone313.xcconfig b/XcodeConfig/Project/DebugiPhone313.xcconfig
index 6244f29..aa41387 100644
--- a/XcodeConfig/Project/DebugiPhone313.xcconfig
+++ b/XcodeConfig/Project/DebugiPhone313.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
@@ -24,6 +24,10 @@
 //  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"
 
diff --git a/XcodeConfig/Project/DebugiPhone32.xcconfig b/XcodeConfig/Project/DebugiPhone32.xcconfig
index 84f81f9..7fea13e 100644
--- a/XcodeConfig/Project/DebugiPhone32.xcconfig
+++ b/XcodeConfig/Project/DebugiPhone32.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
@@ -24,6 +24,10 @@
 //  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"
 
diff --git a/XcodeConfig/Project/DebugiPhone40.xcconfig b/XcodeConfig/Project/DebugiPhone40.xcconfig
index 5db1ae8..bad8987 100644
--- a/XcodeConfig/Project/DebugiPhone40.xcconfig
+++ b/XcodeConfig/Project/DebugiPhone40.xcconfig
@@ -24,6 +24,10 @@
 //  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"
 
diff --git a/XcodeConfig/Project/DebugiPhone41.xcconfig b/XcodeConfig/Project/DebugiPhone41.xcconfig
index 8541e4f..ee0eb92 100644
--- a/XcodeConfig/Project/DebugiPhone41.xcconfig
+++ b/XcodeConfig/Project/DebugiPhone41.xcconfig
@@ -24,6 +24,10 @@
 //  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"
 
diff --git a/XcodeConfig/Project/ReleaseiPhone20.xcconfig b/XcodeConfig/Project/ReleaseiPhone20.xcconfig
deleted file mode 100644
index 324254b..0000000
--- a/XcodeConfig/Project/ReleaseiPhone20.xcconfig
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-//  ReleaseiPhone20.xcconfig
-//
-//  Xcode configuration file for building a Release configuration of a project
-//  for iPhone OS 2.0.
-//
-//  Copyright 2008 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.
-
-// Pull in the general settings
-#include "../subconfig/General.xcconfig"
-
-// iPhone settings.
-#include "../subconfig/iPhone20.xcconfig"
-
-// Release settings
-#include "../subconfig/Release.xcconfig"
-
-// Merge settings
-#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/Project/ReleaseiPhone21.xcconfig b/XcodeConfig/Project/ReleaseiPhone21.xcconfig
deleted file mode 100644
index 66b9a1c..0000000
--- a/XcodeConfig/Project/ReleaseiPhone21.xcconfig
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-//  ReleaseiPhone21.xcconfig
-//
-//  Xcode configuration file for building a Release configuration of a project
-//  for iPhone OS 2.1.
-//
-//  Copyright 2008 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.
-
-// Pull in the general settings
-#include "../subconfig/General.xcconfig"
-
-// iPhone settings.
-#include "../subconfig/iPhone21.xcconfig"
-
-// Release settings
-#include "../subconfig/Release.xcconfig"
-
-// Merge settings
-#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/Project/ReleaseiPhone22.xcconfig b/XcodeConfig/Project/ReleaseiPhone22.xcconfig
deleted file mode 100644
index 3a73269..0000000
--- a/XcodeConfig/Project/ReleaseiPhone22.xcconfig
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-//  ReleaseiPhone22.xcconfig
-//
-//  Xcode configuration file for building a Release configuration of a project
-//  for iPhone OS 2.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.
-
-// Pull in the general settings
-#include "../subconfig/General.xcconfig"
-
-// iPhone settings.
-#include "../subconfig/iPhone22.xcconfig"
-
-// Release settings
-#include "../subconfig/Release.xcconfig"
-
-// Merge settings
-#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/Project/ReleaseiPhone221.xcconfig b/XcodeConfig/Project/ReleaseiPhone221.xcconfig
deleted file mode 100644
index d00ee69..0000000
--- a/XcodeConfig/Project/ReleaseiPhone221.xcconfig
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-//  ReleaseiPhone221.xcconfig
-//
-//  Xcode configuration file for building a Release configuration of a project
-//  for iPhone OS 2.2.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.
-
-// Pull in the general settings
-#include "../subconfig/General.xcconfig"
-
-// iPhone settings.
-#include "../subconfig/iPhone221.xcconfig"
-
-// Release settings
-#include "../subconfig/Release.xcconfig"
-
-// Merge settings
-#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/Project/ReleaseiPhone30.xcconfig b/XcodeConfig/Project/ReleaseiPhone30.xcconfig
index abba742..63bdf4c 100644
--- a/XcodeConfig/Project/ReleaseiPhone30.xcconfig
+++ b/XcodeConfig/Project/ReleaseiPhone30.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
@@ -24,6 +24,10 @@
 //  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"
 
diff --git a/XcodeConfig/Project/ReleaseiPhone31.xcconfig b/XcodeConfig/Project/ReleaseiPhone31.xcconfig
index b6e2d25..8a5a19c 100644
--- a/XcodeConfig/Project/ReleaseiPhone31.xcconfig
+++ b/XcodeConfig/Project/ReleaseiPhone31.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
@@ -24,6 +24,10 @@
 //  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"
 
diff --git a/XcodeConfig/Project/ReleaseiPhone312.xcconfig b/XcodeConfig/Project/ReleaseiPhone312.xcconfig
index 6ad382c..65c42b1 100644
--- a/XcodeConfig/Project/ReleaseiPhone312.xcconfig
+++ b/XcodeConfig/Project/ReleaseiPhone312.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
@@ -24,6 +24,10 @@
 //  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"
 
diff --git a/XcodeConfig/Project/ReleaseiPhone313.xcconfig b/XcodeConfig/Project/ReleaseiPhone313.xcconfig
index 5fa4530..65de50a 100644
--- a/XcodeConfig/Project/ReleaseiPhone313.xcconfig
+++ b/XcodeConfig/Project/ReleaseiPhone313.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
@@ -24,6 +24,10 @@
 //  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"
 
diff --git a/XcodeConfig/Project/ReleaseiPhone32.xcconfig b/XcodeConfig/Project/ReleaseiPhone32.xcconfig
index 26edfee..411a9a2 100644
--- a/XcodeConfig/Project/ReleaseiPhone32.xcconfig
+++ b/XcodeConfig/Project/ReleaseiPhone32.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
@@ -24,6 +24,10 @@
 //  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"
 
diff --git a/XcodeConfig/Project/ReleaseiPhone40.xcconfig b/XcodeConfig/Project/ReleaseiPhone40.xcconfig
index 7da0aa3..2887fbb 100644
--- a/XcodeConfig/Project/ReleaseiPhone40.xcconfig
+++ b/XcodeConfig/Project/ReleaseiPhone40.xcconfig
@@ -24,6 +24,10 @@
 //  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"
 
diff --git a/XcodeConfig/Project/ReleaseiPhone41.xcconfig b/XcodeConfig/Project/ReleaseiPhone41.xcconfig
index 7ed3698..f3965b5 100644
--- a/XcodeConfig/Project/ReleaseiPhone41.xcconfig
+++ b/XcodeConfig/Project/ReleaseiPhone41.xcconfig
@@ -24,6 +24,10 @@
 //  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"
 
diff --git a/XcodeConfig/subconfig/iPhone20.xcconfig b/XcodeConfig/subconfig/iPhone20.xcconfig
deleted file mode 100644
index 0b742b0..0000000
--- a/XcodeConfig/subconfig/iPhone20.xcconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-//  iPhone20.xcconfig
-//
-//  Xcode configuration file for building a Debug target on iPhone OS 2.0
-//
-//  Copyright 2008 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.
-
-// Set default SDK.
-SDKROOT = iphoneos2.0
-
diff --git a/XcodeConfig/subconfig/iPhone21.xcconfig b/XcodeConfig/subconfig/iPhone21.xcconfig
deleted file mode 100644
index 44619d3..0000000
--- a/XcodeConfig/subconfig/iPhone21.xcconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-//  iPhone21.xcconfig
-//
-//  Xcode configuration file for building a Debug target on iPhone OS 2.1
-//
-//  Copyright 2008 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.
-
-// Set default SDK.
-SDKROOT = iphoneos2.1
-
diff --git a/XcodeConfig/subconfig/iPhone22.xcconfig b/XcodeConfig/subconfig/iPhone22.xcconfig
deleted file mode 100644
index ee8b707..0000000
--- a/XcodeConfig/subconfig/iPhone22.xcconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-//  iPhone22.xcconfig
-//
-//  Xcode configuration file for building a Debug target on iPhone OS 2.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.
-
-// Set default SDK.
-SDKROOT = iphoneos2.2
-
diff --git a/XcodeConfig/subconfig/iPhone221.xcconfig b/XcodeConfig/subconfig/iPhone221.xcconfig
deleted file mode 100644
index 5f6f53b..0000000
--- a/XcodeConfig/subconfig/iPhone221.xcconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-//  iPhone221.xcconfig
-//
-//  Xcode configuration file for building a Debug target on iPhone OS 2.2.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.
-
-// Set default SDK.
-SDKROOT = iphoneos2.2.1
-
diff --git a/XcodeConfig/subconfig/iPhone30.xcconfig b/XcodeConfig/subconfig/iPhone30.xcconfig
index c50daca..c9d9226 100644
--- a/XcodeConfig/subconfig/iPhone30.xcconfig
+++ b/XcodeConfig/subconfig/iPhone30.xcconfig
@@ -8,14 +8,17 @@
 //  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 file will be going away, please migrate off it.  Instead Apple wants
+// you to use the "current" SDK, and set your min supported iOS version.
+
 // Set default SDK.
 SDKROOT = iphoneos3.0
diff --git a/XcodeConfig/subconfig/iPhone31.xcconfig b/XcodeConfig/subconfig/iPhone31.xcconfig
index 6b3781b..ab36c10 100644
--- a/XcodeConfig/subconfig/iPhone31.xcconfig
+++ b/XcodeConfig/subconfig/iPhone31.xcconfig
@@ -8,15 +8,17 @@
 //  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 file will be going away, please migrate off it.  Instead Apple wants
+// you to use the "current" SDK, and set your min supported iOS version.
+
 // Set default SDK.
 SDKROOT = iphoneos3.1
-
diff --git a/XcodeConfig/subconfig/iPhone312.xcconfig b/XcodeConfig/subconfig/iPhone312.xcconfig
index ff778f3..d0464e5 100644
--- a/XcodeConfig/subconfig/iPhone312.xcconfig
+++ b/XcodeConfig/subconfig/iPhone312.xcconfig
@@ -8,15 +8,17 @@
 //  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 file will be going away, please migrate off it.  Instead Apple wants
+// you to use the "current" SDK, and set your min supported iOS version.
+
 // Set default SDK.
 SDKROOT = iphoneos3.1.2
-
diff --git a/XcodeConfig/subconfig/iPhone313.xcconfig b/XcodeConfig/subconfig/iPhone313.xcconfig
index 5b34dce..3f95341 100644
--- a/XcodeConfig/subconfig/iPhone313.xcconfig
+++ b/XcodeConfig/subconfig/iPhone313.xcconfig
@@ -8,14 +8,17 @@
 //  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 file will be going away, please migrate off it.  Instead Apple wants
+// you to use the "current" SDK, and set your min supported iOS version.
+
 // Set default SDK.
 SDKROOT = iphoneos3.1.3
diff --git a/XcodeConfig/subconfig/iPhone32.xcconfig b/XcodeConfig/subconfig/iPhone32.xcconfig
index d50c2d0..5fc9bcd 100644
--- a/XcodeConfig/subconfig/iPhone32.xcconfig
+++ b/XcodeConfig/subconfig/iPhone32.xcconfig
@@ -8,14 +8,17 @@
 //  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 file will be going away, please migrate off it.  Instead Apple wants
+// you to use the "current" SDK, and set your min supported iOS version.
+
 // Set default SDK.
 SDKROOT = iphoneos3.2
diff --git a/XcodeConfig/subconfig/iPhone40.xcconfig b/XcodeConfig/subconfig/iPhone40.xcconfig
index 5eeb0b4..d6154e1 100644
--- a/XcodeConfig/subconfig/iPhone40.xcconfig
+++ b/XcodeConfig/subconfig/iPhone40.xcconfig
@@ -17,5 +17,8 @@
 //  License for the specific language governing permissions and limitations under
 //  the License.
 
+// This file will be going away, please migrate off it.  Instead Apple wants
+// you to use the "current" SDK, and set your min supported iOS version.
+
 // Set default SDK.
 SDKROOT = iphoneos4.0
diff --git a/XcodeConfig/subconfig/iPhone41.xcconfig b/XcodeConfig/subconfig/iPhone41.xcconfig
index 1edddc3..332bcf8 100644
--- a/XcodeConfig/subconfig/iPhone41.xcconfig
+++ b/XcodeConfig/subconfig/iPhone41.xcconfig
@@ -17,5 +17,8 @@
 //  License for the specific language governing permissions and limitations under
 //  the License.
 
+// This file will be going away, please migrate off it.  Instead Apple wants
+// you to use the "current" SDK, and set your min supported iOS version.
+
 // Set default SDK.
 SDKROOT = iphoneos4.1
diff --git a/XcodeConfig/xcconfigs-readme.txt b/XcodeConfig/xcconfigs-readme.txt
index 87a6dd7..f0fc4c1 100644
--- a/XcodeConfig/xcconfigs-readme.txt
+++ b/XcodeConfig/xcconfigs-readme.txt
@@ -5,8 +5,12 @@ The main goal of using these is as follow:
 
 Edit your Project level build settings by removing as much as possible, and
 then set the per Configuration settings to one of the project xcode config
-files w/in the Project subfolder here.  This will batch setup the project to
-build Debug/Release with a specific SDK.
+files w/in the Project subfolder here.  Apple now recommends always building
+with the "current" SDK and started being more aggressive at removing older
+SDKs with each Xcode releases.  So set you SDK version and min supported OS
+version in your project.  The configs will then set everything based off
+those choices.
+
 
 If you are building a Shared Library, Loadable Bundle (Framework) or UnitTest
 you will need to apply a further Xcode Config file at the target level.  You do
@@ -35,7 +39,7 @@ Many of the build settings are more than just yes/no flags and take
 a list of values that you may want to change at different levels.
 Xcode doesn't allow you to "inherit" settings with includes so you always
 end up overriding settings accidentally. To avoid this, we instead
-allow you to define settings at different levels 
+allow you to define settings at different levels
 (GENERAL, PLATFORM (iPhone/Mac), CONFIGURATION (Release/Debug).
 We do this by setting a GTM version of the setting (so for OTHER_CFLAGS it's
 GTM_XXX_OTHER_CFLAGS where xxx is GENERAL, PLATFORM or CONFIGURATION depending
@@ -49,5 +53,5 @@ xcconfig files, we have split the warnings up into three categories, which in
 general you can think of as easy, moderate and extreme. If you run into a lot
 of warnings when you compile, look at changing the GTM_GENERAL_WARNING_CFLAGS
 setting to only include lower levels (eg GTM_GENERAL_WARNING_CFLAGS1) and see
-if that makes it easier on you. Look inside General.xcconfig and search for 
+if that makes it easier on you. Look inside General.xcconfig and search for
 GTM_GENERAL_WARNING_CFLAGS1 for more info.